Merge tag 'regmap-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[deliverable/linux.git] / arch / arm / boot / dts / at91sam9m10g45ek.dts

diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts
index 89c50d108d440674219e668110d9d333ab8c1d3b..a4b00e5c61c09faca05f8e5b9e2604394982cba8 100644 (file)
--- a/arch/arm/boot/dts/at91sam9m10g45ek.dts
+++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts
@@ -59,6 +59,10 @@
                                status = "okay";
                        };
 
+                       watchdog@fffffd40 {
+                               status = "okay";
+                       };
+
                        mmc0: mmc@fff80000 {
                                pinctrl-0 = <
                                        &pinctrl_board_mmc0
@@ -112,6 +116,11 @@
                                        reg = <0>;
                                };
                        };
+
+                       usb2: gadget@fff78000 {
+                               atmel,vbus-gpio = <&pioB 19 GPIO_ACTIVE_HIGH>;
+                               status = "okay";
+                       };
                };
 
                nand0: nand@40000000 {