From: Lothar Waßmann Date: Mon, 9 Mar 2015 07:44:19 +0000 (+0100) Subject: ARM: dts: tx6: move LCD related pinctrl properties to 'display' node X-Git-Tag: KARO-TX6-2015-03-24~1 X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=41fa76dfc2ca7da355cc90f27b755998c2f217a9 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 1604a57f0b56..d78197b8bf98 100644 --- 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"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_disp0_2>; disp_dev = "lcd"; interface_pix_fmt = "RGB24"; mode_str = ""; @@ -80,8 +82,6 @@ ipu_id = <0>; disp_id = <0>; default_ifmt = "RGB24"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_disp0_2>; status = "okay"; }; }; diff --git a/arch/arm/boot/dts/imx6dl-tx6s-8034.dts b/arch/arm/boot/dts/imx6dl-tx6s-8034.dts index 7120549641c2..6b597ea08bdf 100644 --- 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"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_disp0_2>; disp_dev = "lcd"; interface_pix_fmt = "RGB24"; mode_str = ""; @@ -174,8 +176,6 @@ ipu_id = <0>; disp_id = <0>; default_ifmt = "RGB24"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_disp0_2>; status = "okay"; }; }; diff --git a/arch/arm/boot/dts/imx6dl-tx6s-8035.dts b/arch/arm/boot/dts/imx6dl-tx6s-8035.dts index aefcbba31e45..6e9f105ab46d 100644 --- 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"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_disp0_2>; disp_dev = "lcd"; interface_pix_fmt = "RGB24"; mode_str = ""; @@ -174,8 +176,6 @@ ipu_id = <0>; disp_id = <0>; default_ifmt = "RGB24"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_disp0_2>; status = "okay"; }; }; diff --git a/arch/arm/boot/dts/imx6dl-tx6u-8033.dts b/arch/arm/boot/dts/imx6dl-tx6u-8033.dts index 550f9acc5bcd..0ccf09ad0d3f 100644 --- 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"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_disp0_2>; disp_dev = "lcd"; interface_pix_fmt = "RGB24"; mode_str = ""; @@ -174,8 +176,6 @@ ipu_id = <0>; disp_id = <0>; default_ifmt = "RGB24"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_disp0_2>; status = "okay"; }; }; diff --git a/arch/arm/boot/dts/imx6dl-tx6u-80xx.dts b/arch/arm/boot/dts/imx6dl-tx6u-80xx.dts index 6dbbe6857879..807e86075085 100644 --- 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"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_disp0_2>; disp_dev = "lcd"; interface_pix_fmt = "RGB24"; mode_str = ""; @@ -174,8 +176,6 @@ ipu_id = <0>; disp_id = <0>; default_ifmt = "RGB24"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_disp0_2>; 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 6116140f0f86..6722b0c7319f 100644 --- 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"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_disp0_2>; disp_dev = "lcd"; interface_pix_fmt = "RGB24"; mode_str = ""; @@ -80,8 +82,6 @@ ipu_id = <0>; disp_id = <0>; default_ifmt = "RGB24"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_disp0_2>; status = "okay"; }; }; diff --git a/arch/arm/boot/dts/imx6q-tx6q-1020.dts b/arch/arm/boot/dts/imx6q-tx6q-1020.dts index 1d2e19a4ba93..269aa2c1939c 100644 --- 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"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_disp0_2>; disp_dev = "lcd"; interface_pix_fmt = "RGB24"; mode_str = ""; @@ -174,8 +176,6 @@ ipu_id = <0>; disp_id = <0>; default_ifmt = "RGB24"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_disp0_2>; status = "okay"; }; }; diff --git a/arch/arm/boot/dts/imx6q-tx6q-1033.dts b/arch/arm/boot/dts/imx6q-tx6q-1033.dts index cab7acd112d0..750892ebff04 100644 --- 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"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_disp0_2>; disp_dev = "lcd"; interface_pix_fmt = "RGB24"; mode_str = ""; @@ -174,8 +176,6 @@ ipu_id = <0>; disp_id = <0>; default_ifmt = "RGB24"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_disp0_2>; 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 e8c9bbe47364..89975534279e 100644 --- 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"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_disp0_2>; disp_dev = "lcd"; interface_pix_fmt = "RGB24"; mode_str = ""; @@ -80,8 +82,6 @@ ipu_id = <0>; disp_id = <0>; default_ifmt = "RGB24"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_disp0_2>; status = "okay"; }; }; diff --git a/arch/arm/boot/dts/imx6q-tx6q-10x0.dts b/arch/arm/boot/dts/imx6q-tx6q-10x0.dts index ea3a8ac1c48d..a1690a1d0d16 100644 --- 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"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_disp0_2>; disp_dev = "lcd"; interface_pix_fmt = "RGB24"; mode_str = ""; @@ -174,8 +176,6 @@ ipu_id = <0>; disp_id = <0>; default_ifmt = "RGB24"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_disp0_2>; status = "okay"; }; };