Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git

[cascardo/linux.git] / arch / arm / boot / dts / omap3-lilly-a83x.dtsi

diff --git a/arch/arm/boot/dts/omap3-lilly-a83x.dtsi b/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
index cc1dce6..d973088 100644 (file)
--- a/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
+++ b/arch/arm/boot/dts/omap3-lilly-a83x.dtsi
@@ -176,9 +176,6 @@
 
 &omap3_pmx_core2 {
        pinctrl-names = "default";
-       pinctrl-0 = <
-                       &hsusb1_2_pins
-       >;
 
        hsusb1_2_pins: pinmux_hsusb1_2_pins {
                pinctrl-single,pins = <
@@ -357,6 +354,10 @@
        power = <50>;
 };
 
+&mcbsp2 {
+       status = "okay";
+};
+
 &gpmc {
        ranges = <0 0 0x30000000 0x1000000>,
                <7 0 0x15000000 0x01000000>;