diff options
author | Olof Johansson <olof@lixom.net> | 2012-04-05 10:43:06 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-04-05 10:43:06 -0700 |
commit | 8078342664aac3a9801a110c9a36132f592f4f37 (patch) | |
tree | 962f0435412483942236ff94650000ec0c73107a /arch/arm/boot/dts/at91sam9m10g45ek.dts | |
parent | 98f0ec0dd4e0c96fcc7bc6dae08007820b1134a8 (diff) | |
parent | dcce6ce802c271cd7c21f4730f301150577b2826 (diff) |
Merge branch 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
* 'at91-fixes' of git://github.com/at91linux/linux-at91:
ARM: at91: dt: remove unit-address part for memory nodes
ARM: at91: fix check of valid GPIO for SPI and USB
USB: ehci-atmel: add needed of.h header file
ARM: at91/NAND DT bindings: add comments
ARM: at91/at91sam9x5.dtsi: fix NAND ale/cle in DT file
USB: ohci-at91: trivial return code name change
USB: ohci-at91: change maximum number of ports
USB: ohci-at91: rework and fix initialization
ARM: at91/dts: USB host vbus is active low
ARM: at91/USB host: specify and handle properly vbus_pin_active_low
USB: ohci-at91: fix vbus_pin_active_low handling
ARM: at91/at91sam9x5: add clkdev entries for DMA controllers
Diffstat (limited to 'arch/arm/boot/dts/at91sam9m10g45ek.dts')
-rw-r--r-- | arch/arm/boot/dts/at91sam9m10g45ek.dts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts index c4c8ae4123d..a3633bd1311 100644 --- a/arch/arm/boot/dts/at91sam9m10g45ek.dts +++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts @@ -17,7 +17,7 @@ bootargs = "mem=64M console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=jffs2"; }; - memory@70000000 { + memory { reg = <0x70000000 0x4000000>; }; @@ -73,8 +73,8 @@ usb0: ohci@00700000 { status = "okay"; num-ports = <2>; - atmel,vbus-gpio = <&pioD 1 0 - &pioD 3 0>; + atmel,vbus-gpio = <&pioD 1 1 + &pioD 3 1>; }; usb1: ehci@00800000 { |