Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[uclinux-h8/linux.git] / arch / arm / boot / dts / stm32429i-eval.dts

diff --git a/arch/arm/boot/dts/stm32429i-eval.dts b/arch/arm/boot/dts/stm32429i-eval.dts
index 6964fc9..6bfc595 100644 (file)
--- a/arch/arm/boot/dts/stm32429i-eval.dts
+++ b/arch/arm/boot/dts/stm32429i-eval.dts
@@ -58,18 +58,68 @@
        };
 
        memory {
-               reg = <0xc0000000 0x2000000>;
+               reg = <0x00000000 0x2000000>;
        };
 
        aliases {
                serial0 = &usart1;
        };
+
+       leds {
+               compatible = "gpio-leds";
+               green {
+                       gpios = <&gpiog 6 1>;
+                       linux,default-trigger = "heartbeat";
+               };
+               orange {
+                       gpios = <&gpiog 7 1>;
+               };
+               red {
+                       gpios = <&gpiog 10 1>;
+               };
+               blue {
+                       gpios = <&gpiog 12 1>;
+               };
+       };
+
+       usbotg_hs_phy: usbphy {
+               #phy-cells = <0>;
+               compatible = "usb-nop-xceiv";
+               clocks = <&rcc 0 30>;
+               clock-names = "main_clk";
+       };
 };
 
 &clk_hse {
        clock-frequency = <25000000>;
 };
 
+&ethernet0 {
+       status = "okay";
+       pinctrl-0       = <&ethernet0_mii>;
+       pinctrl-names   = "default";
+       phy-mode        = "mii-id";
+       mdio0 {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               compatible = "snps,dwmac-mdio";
+               phy1: ethernet-phy@1 {
+                       reg = <1>;
+               };
+       };
+};
+
 &usart1 {
+       pinctrl-0 = <&usart1_pins_a>;
+       pinctrl-names = "default";
+       status = "okay";
+};
+
+&usbotg_hs {
+       dr_mode = "host";
+       phys = <&usbotg_hs_phy>;
+       phy-names = "usb2-phy";
+       pinctrl-0 = <&usbotg_hs_pins_a>;
+       pinctrl-names = "default";
        status = "okay";
 };