Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 296695
b: refs/heads/master
c: 0f5c4b9
h: refs/heads/master
i:
  296693: ec99ed8
  296691: c25b98b
  296687: c25c0a2
v: v3
  • Loading branch information
Jean-Christophe PLAGNIOL-VILLARD committed Mar 15, 2012
1 parent 0b730a7 commit 7ccd325
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d1494a340807c9b77aa44bc8d8166353df4cf1c3
refs/heads/master: 0f5c4b996a740c3849d657b11b390bba07374415
7 changes: 7 additions & 0 deletions trunk/arch/arm/boot/dts/at91sam9g20.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 5 additions & 0 deletions trunk/arch/arm/boot/dts/usb_a9g20.dts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@
phy-mode = "rmii";
status = "okay";
};

usb1: gadget@fffa4000 {
atmel,vbus-gpio = <&pioC 5 0>;
status = "okay";
};
};

nand0: nand@40000000 {
Expand Down

0 comments on commit 7ccd325

Please sign in to comment.