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/at91sam9g25ek.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/at91sam9g25ek.dts')
| -rw-r--r-- | arch/arm/boot/dts/at91sam9g25ek.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/at91sam9g25ek.dts b/arch/arm/boot/dts/at91sam9g25ek.dts index ac0dc0031dd..7829a4d0cb2 100644 --- a/arch/arm/boot/dts/at91sam9g25ek.dts +++ b/arch/arm/boot/dts/at91sam9g25ek.dts @@ -37,8 +37,8 @@ usb0: ohci@00600000 { status = "okay"; num-ports = <2>; - atmel,vbus-gpio = <&pioD 19 0 - &pioD 20 0 + atmel,vbus-gpio = <&pioD 19 1 + &pioD 20 1 >; }; |