ARM: dts: tx6: move LCD related pinctrl properties to 'display' node

diff --git a/arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts b/arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts
index 1604a57f0b56bf02010cc4f65f3665b8e181281d..d78197b8bf987d8f274128f060e92205ab3ca2ef 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts
+++ b/arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts
@@ -46,6 +46,8 @@
 
        mxcfb0: fb@2 {
                compatible = "fsl,mxc_sdc_fb";
 
        mxcfb0: fb@2 {
                compatible = "fsl,mxc_sdc_fb";

+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_disp0_2>;

                disp_dev = "lcd";
                interface_pix_fmt = "RGB24";
                mode_str = "";
                disp_dev = "lcd";
                interface_pix_fmt = "RGB24";
                mode_str = "";


@@ -80,8 +82,6 @@
                ipu_id = <0>;
                disp_id = <0>;
                default_ifmt = "RGB24";
                ipu_id = <0>;
                disp_id = <0>;
                default_ifmt = "RGB24";

-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_disp0_2>;

                status = "okay";
        };
 };
                status = "okay";
        };
 };

diff --git a/arch/arm/boot/dts/imx6dl-tx6s-8034.dts b/arch/arm/boot/dts/imx6dl-tx6s-8034.dts
index 7120549641c2ff77f552fd9b843d502c303dbc49..6b597ea08bdf37e10e34d7d1484650fefd414549 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-tx6s-8034.dts
+++ b/arch/arm/boot/dts/imx6dl-tx6s-8034.dts
@@ -46,6 +46,8 @@
 
        mxcfb0: fb@2 {
                compatible = "fsl,mxc_sdc_fb";
 
        mxcfb0: fb@2 {
                compatible = "fsl,mxc_sdc_fb";

+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_disp0_2>;

                disp_dev = "lcd";
                interface_pix_fmt = "RGB24";
                mode_str = "";
                disp_dev = "lcd";
                interface_pix_fmt = "RGB24";
                mode_str = "";


@@ -174,8 +176,6 @@
                ipu_id = <0>;
                disp_id = <0>;
                default_ifmt = "RGB24";
                ipu_id = <0>;
                disp_id = <0>;
                default_ifmt = "RGB24";

-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_disp0_2>;

                status = "okay";
        };
 };
                status = "okay";
        };
 };

diff --git a/arch/arm/boot/dts/imx6dl-tx6s-8035.dts b/arch/arm/boot/dts/imx6dl-tx6s-8035.dts
index aefcbba31e454066b9546e3031e0fb0adb424a56..6e9f105ab46d7df00d0854a2e0890635b1b6168c 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-tx6s-8035.dts
+++ b/arch/arm/boot/dts/imx6dl-tx6s-8035.dts
@@ -46,6 +46,8 @@
 
        mxcfb0: fb@2 {
                compatible = "fsl,mxc_sdc_fb";
 
        mxcfb0: fb@2 {
                compatible = "fsl,mxc_sdc_fb";

+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_disp0_2>;

                disp_dev = "lcd";
                interface_pix_fmt = "RGB24";
                mode_str = "";
                disp_dev = "lcd";
                interface_pix_fmt = "RGB24";
                mode_str = "";


@@ -174,8 +176,6 @@
                ipu_id = <0>;
                disp_id = <0>;
                default_ifmt = "RGB24";
                ipu_id = <0>;
                disp_id = <0>;
                default_ifmt = "RGB24";

-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_disp0_2>;

                status = "okay";
        };
 };
                status = "okay";
        };
 };

diff --git a/arch/arm/boot/dts/imx6dl-tx6u-8033.dts b/arch/arm/boot/dts/imx6dl-tx6u-8033.dts
index 550f9acc5bcd56b35baca22d82caadc4bc1ae581..0ccf09ad0d3fd3ee6ab3e203fe88beeaacd294bc 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-tx6u-8033.dts
+++ b/arch/arm/boot/dts/imx6dl-tx6u-8033.dts
@@ -46,6 +46,8 @@
 
        mxcfb0: fb@2 {
                compatible = "fsl,mxc_sdc_fb";
 
        mxcfb0: fb@2 {
                compatible = "fsl,mxc_sdc_fb";

+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_disp0_2>;

                disp_dev = "lcd";
                interface_pix_fmt = "RGB24";
                mode_str = "";
                disp_dev = "lcd";
                interface_pix_fmt = "RGB24";
                mode_str = "";


@@ -174,8 +176,6 @@
                ipu_id = <0>;
                disp_id = <0>;
                default_ifmt = "RGB24";
                ipu_id = <0>;
                disp_id = <0>;
                default_ifmt = "RGB24";

-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_disp0_2>;

                status = "okay";
        };
 };
                status = "okay";
        };
 };

diff --git a/arch/arm/boot/dts/imx6dl-tx6u-80xx.dts b/arch/arm/boot/dts/imx6dl-tx6u-80xx.dts
index 6dbbe6857879270f1a68d378d5dc71503b8eef60..807e86075085470db3119e1ca391971131d13bc3 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-tx6u-80xx.dts
+++ b/arch/arm/boot/dts/imx6dl-tx6u-80xx.dts
@@ -46,6 +46,8 @@
 
        mxcfb0: fb@2 {
                compatible = "fsl,mxc_sdc_fb";
 
        mxcfb0: fb@2 {
                compatible = "fsl,mxc_sdc_fb";

+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_disp0_2>;

                disp_dev = "lcd";
                interface_pix_fmt = "RGB24";
                mode_str = "";
                disp_dev = "lcd";
                interface_pix_fmt = "RGB24";
                mode_str = "";


@@ -174,8 +176,6 @@
                ipu_id = <0>;
                disp_id = <0>;
                default_ifmt = "RGB24";
                ipu_id = <0>;
                disp_id = <0>;
                default_ifmt = "RGB24";

-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_disp0_2>;

                status = "okay";
        };
 };
                status = "okay";
        };
 };

diff --git a/arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts b/arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts
index 6116140f0f865e09d3a4b1e274193ce5aa26aa00..6722b0c7319f0f783eec635dee928c05bd0b2c3c 100644 (file)
--- a/arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts
+++ b/arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts
@@ -46,6 +46,8 @@
 
        mxcfb0: fb@2 {
                compatible = "fsl,mxc_sdc_fb";
 
        mxcfb0: fb@2 {
                compatible = "fsl,mxc_sdc_fb";

+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_disp0_2>;

                disp_dev = "lcd";
                interface_pix_fmt = "RGB24";
                mode_str = "";
                disp_dev = "lcd";
                interface_pix_fmt = "RGB24";
                mode_str = "";


@@ -80,8 +82,6 @@
                ipu_id = <0>;
                disp_id = <0>;
                default_ifmt = "RGB24";
                ipu_id = <0>;
                disp_id = <0>;
                default_ifmt = "RGB24";

-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_disp0_2>;

                status = "okay";
        };
 };
                status = "okay";
        };
 };

diff --git a/arch/arm/boot/dts/imx6q-tx6q-1020.dts b/arch/arm/boot/dts/imx6q-tx6q-1020.dts
index 1d2e19a4ba93df6ec301070f8b2298d810ed8930..269aa2c1939c1007a0f3dc5165c6e13b138df700 100644 (file)
--- a/arch/arm/boot/dts/imx6q-tx6q-1020.dts
+++ b/arch/arm/boot/dts/imx6q-tx6q-1020.dts
@@ -46,6 +46,8 @@
 
        mxcfb0: fb@2 {
                compatible = "fsl,mxc_sdc_fb";
 
        mxcfb0: fb@2 {
                compatible = "fsl,mxc_sdc_fb";

+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_disp0_2>;

                disp_dev = "lcd";
                interface_pix_fmt = "RGB24";
                mode_str = "";
                disp_dev = "lcd";
                interface_pix_fmt = "RGB24";
                mode_str = "";


@@ -174,8 +176,6 @@
                ipu_id = <0>;
                disp_id = <0>;
                default_ifmt = "RGB24";
                ipu_id = <0>;
                disp_id = <0>;
                default_ifmt = "RGB24";

-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_disp0_2>;

                status = "okay";
        };
 };
                status = "okay";
        };
 };

diff --git a/arch/arm/boot/dts/imx6q-tx6q-1033.dts b/arch/arm/boot/dts/imx6q-tx6q-1033.dts
index cab7acd112d02a8d432b047b3331ac7f3171179d..750892ebff0473f439564401d0f3c9927673d02b 100644 (file)
--- a/arch/arm/boot/dts/imx6q-tx6q-1033.dts
+++ b/arch/arm/boot/dts/imx6q-tx6q-1033.dts
@@ -46,6 +46,8 @@
 
        mxcfb0: fb@2 {
                compatible = "fsl,mxc_sdc_fb";
 
        mxcfb0: fb@2 {
                compatible = "fsl,mxc_sdc_fb";

+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_disp0_2>;

                disp_dev = "lcd";
                interface_pix_fmt = "RGB24";
                mode_str = "";
                disp_dev = "lcd";
                interface_pix_fmt = "RGB24";
                mode_str = "";


@@ -174,8 +176,6 @@
                ipu_id = <0>;
                disp_id = <0>;
                default_ifmt = "RGB24";
                ipu_id = <0>;
                disp_id = <0>;
                default_ifmt = "RGB24";

-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_disp0_2>;

                status = "okay";
        };
 };
                status = "okay";
        };
 };

diff --git a/arch/arm/boot/dts/imx6q-tx6q-10x0-comtft.dts b/arch/arm/boot/dts/imx6q-tx6q-10x0-comtft.dts
index e8c9bbe47364407c384b52c91e22fd76588af102..89975534279eba1044d53f721fd3cb813ce18912 100644 (file)
--- a/arch/arm/boot/dts/imx6q-tx6q-10x0-comtft.dts
+++ b/arch/arm/boot/dts/imx6q-tx6q-10x0-comtft.dts
@@ -46,6 +46,8 @@
 
        mxcfb0: fb@2 {
                compatible = "fsl,mxc_sdc_fb";
 
        mxcfb0: fb@2 {
                compatible = "fsl,mxc_sdc_fb";

+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_disp0_2>;

                disp_dev = "lcd";
                interface_pix_fmt = "RGB24";
                mode_str = "";
                disp_dev = "lcd";
                interface_pix_fmt = "RGB24";
                mode_str = "";


@@ -80,8 +82,6 @@
                ipu_id = <0>;
                disp_id = <0>;
                default_ifmt = "RGB24";
                ipu_id = <0>;
                disp_id = <0>;
                default_ifmt = "RGB24";

-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_disp0_2>;

                status = "okay";
        };
 };
                status = "okay";
        };
 };

diff --git a/arch/arm/boot/dts/imx6q-tx6q-10x0.dts b/arch/arm/boot/dts/imx6q-tx6q-10x0.dts
index ea3a8ac1c48d01ee3a6ff267f37e6a7743adbbf1..a1690a1d0d163189be9f664a2dd236c2fd4abd56 100644 (file)
--- a/arch/arm/boot/dts/imx6q-tx6q-10x0.dts
+++ b/arch/arm/boot/dts/imx6q-tx6q-10x0.dts
@@ -46,6 +46,8 @@
 
        mxcfb0: fb@2 {
                compatible = "fsl,mxc_sdc_fb";
 
        mxcfb0: fb@2 {
                compatible = "fsl,mxc_sdc_fb";

+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_disp0_2>;

                disp_dev = "lcd";
                interface_pix_fmt = "RGB24";
                mode_str = "";
                disp_dev = "lcd";
                interface_pix_fmt = "RGB24";
                mode_str = "";


@@ -174,8 +176,6 @@
                ipu_id = <0>;
                disp_id = <0>;
                default_ifmt = "RGB24";
                ipu_id = <0>;
                disp_id = <0>;
                default_ifmt = "RGB24";

-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_disp0_2>;

                status = "okay";
        };
 };
                status = "okay";
        };
 };