summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/at91sam9g25ek.dts
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2012-05-13 07:53:34 +0900
committerKukjin Kim <kgene.kim@samsung.com>2012-05-13 07:53:34 +0900
commit163ec0369be4c26e68385f6cec88d0ee38c8d8e5 (patch)
treef3e441866f8bc1b0548e7d8eddd9548b6aedef5e /arch/arm/boot/dts/at91sam9g25ek.dts
parent199642bfe107c411f25fbfc16c9fd49cfef9785d (diff)
parent99dbdd98f271899e023d52b3f4c2bf67cdd7eb56 (diff)
downloadblackbird-op-linux-163ec0369be4c26e68385f6cec88d0ee38c8d8e5.tar.gz
blackbird-op-linux-163ec0369be4c26e68385f6cec88d0ee38c8d8e5.zip
Merge branch 'next/cleanup-plat-s3c24xx' into next/cleanup-plat-s3c24xx-s5p
Diffstat (limited to 'arch/arm/boot/dts/at91sam9g25ek.dts')
-rw-r--r--arch/arm/boot/dts/at91sam9g25ek.dts4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/at91sam9g25ek.dts b/arch/arm/boot/dts/at91sam9g25ek.dts
index ac0dc0031dda..7829a4d0cb22 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
>;
};
OpenPOWER on IntegriCloud