ARM: dts: dra7-evm: remove vout1 pinmux

MLO now does the pinmuxing, and we need to remove pinmuxing from the
.dts files. This patch removes pinmuxing for vout1.

DRA7 EVM and DRA72 EVM share some LCD .dts files, and pinmuxing was
defined in a shared file, so we need to add pinmuxing to DRA72 specific
.dts files.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Jyri Sarha <jsarha@ti.com>

diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
index f00db0cb668b9a8074947515c2b7aac46f95f709..7abc938b33524b25f5efce7ea34313e23f0a6de1 100644 (file)
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -413,40 +413,6 @@
                >;
        };
 
-       vout1_pins: pinmux_vout1_pins {
-               pinctrl-single,pins = <
-                       0x1C8   (PIN_OUTPUT | MUX_MODE0)        /* vout1_clk */
-                       0x1CC   (PIN_OUTPUT | MUX_MODE0)        /* vout1_de */
-                       0x1D0   (PIN_OUTPUT | MUX_MODE0)        /* vout1_fld */
-                       0x1D4   (PIN_OUTPUT | MUX_MODE0)        /* vout1_hsync */
-                       0x1D8   (PIN_OUTPUT | MUX_MODE0)        /* vout1_vsync */
-                       0x1DC   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d0 */
-                       0x1E0   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d1 */
-                       0x1E4   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d2 */
-                       0x1E8   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d3 */
-                       0x1EC   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d4 */
-                       0x1F0   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d5 */
-                       0x1F4   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d6 */
-                       0x1F8   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d7 */
-                       0x1FC   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d8 */
-                       0x200   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d9 */
-                       0x204   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d10 */
-                       0x208   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d11 */
-                       0x20C   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d12 */
-                       0x210   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d13 */
-                       0x214   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d14 */
-                       0x218   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d15 */
-                       0x21C   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d16 */
-                       0x220   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d17 */
-                       0x224   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d18 */
-                       0x228   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d19 */
-                       0x22C   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d20 */
-                       0x230   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d21 */
-                       0x234   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d22 */
-                       0x238   (PIN_OUTPUT | MUX_MODE0)        /* vout1_d23 */
-               >;
-       };
-
        hpd_pin: pinmux_hpd_pin {
                pinctrl-single,pins = <
                        0x3b8   (PIN_INPUT_PULLDOWN | MUX_MODE14)       /* gpio7_12 */

diff --git a/arch/arm/boot/dts/dra72-evm-lcd10.dts b/arch/arm/boot/dts/dra72-evm-lcd10.dts
index ca891fb258a55510441cdfa44030cefcde81ce51..7fa531cd65e459f0b94ac7d2d9ed1dd907010602 100644 (file)
--- a/arch/arm/boot/dts/dra72-evm-lcd10.dts
+++ b/arch/arm/boot/dts/dra72-evm-lcd10.dts
@@ -8,3 +8,8 @@
 
 #include "dra72-evm.dts"
 #include "dra7xx-evm-lcd10.dtsi"
+
+&dss {
+       pinctrl-names = "default";
+       pinctrl-0 = <&vout1_pins>;
+};

diff --git a/arch/arm/boot/dts/dra72-evm-lcd7.dts b/arch/arm/boot/dts/dra72-evm-lcd7.dts
index 4ebfafdad3c09f4fae89d93f8a6d5aa2b3f2acba..6a8dba862a8d87cf5e288d6deaee3cab14aec1d8 100644 (file)
--- a/arch/arm/boot/dts/dra72-evm-lcd7.dts
+++ b/arch/arm/boot/dts/dra72-evm-lcd7.dts
@@ -8,3 +8,8 @@
 
 #include "dra72-evm.dts"
 #include "dra7xx-evm-lcd7.dtsi"
+
+&dss {
+       pinctrl-names = "default";
+       pinctrl-0 = <&vout1_pins>;
+};

diff --git a/arch/arm/boot/dts/dra7xx-evm-lcd10.dtsi b/arch/arm/boot/dts/dra7xx-evm-lcd10.dtsi
index 1580a2c31473cad62ff86f2f3c5e056db43f5155..59c297dfb1f5d774d45b87e2c00137161eed6d3f 100644 (file)
--- a/arch/arm/boot/dts/dra7xx-evm-lcd10.dtsi
+++ b/arch/arm/boot/dts/dra7xx-evm-lcd10.dtsi
@@ -29,9 +29,6 @@
 };
 
 &dss {
-       pinctrl-names = "default";
-       pinctrl-0 = <&vout1_pins>;
-
        ports {
                #address-cells = <1>;
                #size-cells = <0>;