diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-16 13:07:59 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-16 13:07:59 +0000 |
| commit | 4acf18232f80c29906356f0f35b2d5f800b5953d (patch) | |
| tree | 158de45bede17ecc679b772d022288c7f5a56b74 /arch/arm/boot | |
| parent | 2a9f23d82a79d2785429aba43b02683abf103c0b (diff) | |
| parent | 0f5c4b996a740c3849d657b11b390bba07374415 (diff) | |
Merge branch 'at91-3.4-cleanup2-DT2+USB' of git://github.com/at91linux/linux-at91 into next/dt
* 'at91-3.4-cleanup2-DT2+USB' of git://github.com/at91linux/linux-at91:
ARM: at91: sam9g20 udc add dt support
USB: at91: Device udc add dt support
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/at91sam9g20.dtsi | 7 | ||||
| -rw-r--r-- | arch/arm/boot/dts/usb_a9g20.dts | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/at91sam9g20.dtsi b/arch/arm/boot/dts/at91sam9g20.dtsi index f091d679bd4c..92f36627e7f8 100644 --- a/arch/arm/boot/dts/at91sam9g20.dtsi +++ b/arch/arm/boot/dts/at91sam9g20.dtsi @@ -191,6 +191,13 @@ interrupts = <21 4>; status = "disabled"; }; + + usb1: gadget@fffa4000 { + compatible = "atmel,at91rm9200-udc"; + reg = <0xfffa4000 0x4000>; + interrupts = <10 4>; + status = "disabled"; + }; }; nand0: nand@40000000 { diff --git a/arch/arm/boot/dts/usb_a9g20.dts b/arch/arm/boot/dts/usb_a9g20.dts index 748d4c2f889f..3b3c4e0fa79f 100644 --- a/arch/arm/boot/dts/usb_a9g20.dts +++ b/arch/arm/boot/dts/usb_a9g20.dts @@ -41,6 +41,11 @@ phy-mode = "rmii"; status = "okay"; }; + + usb1: gadget@fffa4000 { + atmel,vbus-gpio = <&pioC 5 0>; + status = "okay"; + }; }; nand0: nand@40000000 { |