Merge remote-tracking branches 'asoc/fix/email', 'asoc/fix/fsl-ssi', 'asoc/fix/pm...

[cascardo/linux.git] / arch / arm / boot / dts / at91sam9n12ek.dts

diff --git a/arch/arm/boot/dts/at91sam9n12ek.dts b/arch/arm/boot/dts/at91sam9n12ek.dts
index 9575c0d..6e067c8 100644 (file)
--- a/arch/arm/boot/dts/at91sam9n12ek.dts
+++ b/arch/arm/boot/dts/at91sam9n12ek.dts
@@ -108,6 +108,13 @@
                                                        <AT91_PIOB 10 AT91_PERIPH_B AT91_PINCTRL_NONE>;
                                        };
                                };
+
+                               usb1 {
+                                       pinctrl_usb1_vbus_sense: usb1_vbus_sense {
+                                               atmel,pins =
+                                                       <AT91_PIOB 16 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>;  /* PB16 gpio usb vbus sense, no pull up and deglitch */
+                                       };
+                               };
                        };
 
                        spi0: spi@f0000000 {
@@ -120,9 +127,20 @@
                                };
                        };
 
+                       usb1: gadget@f803c000 {
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&pinctrl_usb1_vbus_sense>;
+                               atmel,vbus-gpio = <&pioB 16 GPIO_ACTIVE_HIGH>;
+                               status = "okay";
+                       };
+
                        watchdog@fffffe40 {
                                status = "okay";
                        };
+
+                       rtc@fffffeb0 {
+                               status = "okay";
+                       };
                };
 
                nand0: nand@40000000 {