Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / at91-sam9x60ek.dts

diff --git a/arch/arm/boot/dts/at91-sam9x60ek.dts b/arch/arm/boot/dts/at91-sam9x60ek.dts
index eae28b8..73b6b1f 100644 (file)
--- a/arch/arm/boot/dts/at91-sam9x60ek.dts
+++ b/arch/arm/boot/dts/at91-sam9x60ek.dts
@@ -569,11 +569,14 @@
                        atmel,pins = <AT91_PIOB 16 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
                };
        };
-}; /* pinctrl */
 
-&pmc {
-       atmel,osc-bypass;
-};
+       usb1 {
+               pinctrl_usb_default: usb_default {
+                       atmel,pins = <AT91_PIOD 15 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
+                                     AT91_PIOD 16 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
+               };
+       };
+}; /* pinctrl */
 
 &pwm0 {
        pinctrl-names = "default";
@@ -684,6 +687,8 @@
        atmel,vbus-gpio = <0
                           &pioD 15 GPIO_ACTIVE_HIGH
                           &pioD 16 GPIO_ACTIVE_HIGH>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usb_default>;
        status = "okay";
 };