ARM: dts: omap4-panda-common: Move audio related pinmux to respective nodes

Attach the pinctrl nodes to their respective device node:
mcbsp1, mcpdm and twl6040.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi
index 88c6a05cab415f3cb04cdec0fb2bc3c504ec8d7f..9067d4c0148df32beb864e897c7baa7224a54f9a 100644 (file)
--- a/arch/arm/boot/dts/omap4-panda-common.dtsi
+++ b/arch/arm/boot/dts/omap4-panda-common.dtsi
@@ -109,9 +109,6 @@
 &omap4_pmx_core {
        pinctrl-names = "default";
        pinctrl-0 = <
-                       &twl6040_pins
-                       &mcpdm_pins
-                       &mcbsp1_pins
                        &dss_dpi_pins
                        &tfp410_pins
                        &dss_hdmi_pins
@@ -300,6 +297,10 @@
        twl6040: twl@4b {
                compatible = "ti,twl6040";
                reg = <0x4b>;
+
+               pinctrl-names = "default";
+               pinctrl-0 = <&twl6040_pins>;
+
                /* IRQ# = 119 */
                interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>; /* IRQ_SYS_2N cascaded to gic */
                interrupt-parent = <&gic>;
@@ -380,6 +381,12 @@
        device-handle = <&elpida_ECB240ABACN>;
 };
 
+&mcbsp1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&mcbsp1_pins>;
+       status = "okay";
+};
+
 &mcbsp2 {
        status = "disabled";
 };
@@ -392,6 +399,12 @@
        status = "disabled";
 };
 
+&mcpdm {
+       pinctrl-names = "default";
+       pinctrl-0 = <&mcpdm_pins>;
+       status = "okay";
+};
+
 &twl_usb_comparator {
        usb-supply = <&vusb>;
 };