From ccd223d87ae20e16f6260be8bdfdab9e6a2ba21c Mon Sep 17 00:00:00 2001 From: Denys Drozdov Date: Tue, 9 Feb 2021 15:08:00 +0200 Subject: ARM: dts: colibri-imx6ull: separate parallel-rgb interface Move parallel-rgb interface into separate module tree imx6ull-colibri-lcdif.dtsi. Keep lcdif, backlight and pwm4 disabled by default. Related-to: ELB-3244 Signed-off-by: Denys Drozdov --- arch/arm/boot/dts/imx6ull-colibri-aster.dtsi | 125 ------------------------- arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 125 ------------------------- arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi | 125 ------------------------- arch/arm/boot/dts/imx6ull-colibri-iris.dtsi | 125 ------------------------- arch/arm/boot/dts/imx6ull-colibri.dtsi | 122 +++++++++++++++++++++++- 5 files changed, 121 insertions(+), 501 deletions(-) diff --git a/arch/arm/boot/dts/imx6ull-colibri-aster.dtsi b/arch/arm/boot/dts/imx6ull-colibri-aster.dtsi index 06372f8621eb..e41e3f31ce5c 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-aster.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-aster.dtsi @@ -64,13 +64,6 @@ }; }; -&bl { - brightness-levels = <0 45 63 88 119 158 203 255>; - default-brightness-level = <4>; - pwms = <&pwm4 0 6666667 PWM_POLARITY_INVERTED>; - status = "okay"; -}; - &adc1 { status = "okay"; }; @@ -124,124 +117,6 @@ }; }; -&lcdif { - display = <&display0>; - status = "okay"; - - display0: lcd-display { - bits-per-pixel = <16>; - bus-width = <18>; - - display-timings { - native-mode = <&timing_vga>; - - /* Standard VGA timing */ - timing_vga: 640x480 { - clock-frequency = <25175000>; - hactive = <640>; - vactive = <480>; - hback-porch = <40>; - hfront-porch = <24>; - vback-porch = <32>; - vfront-porch = <11>; - hsync-len = <96>; - vsync-len = <2>; - - de-active = <1>; - hsync-active = <0>; - vsync-active = <0>; - pixelclk-active = <0>; - }; - - /* WVGA Timing, e.g. EDT ET070080DH6 */ - timing_wvga: 800x480 { - clock-frequency = <33260000>; - hactive = <800>; - vactive = <480>; - hback-porch = <216>; - hfront-porch = <40>; - vback-porch = <35>; - vfront-porch = <10>; - hsync-len = <128>; - vsync-len = <2>; - - de-active = <1>; - hsync-active = <0>; - vsync-active = <0>; - pixelclk-active = <0>; - }; - /* WVGA Timing, TouchRevolution Fusion 7" */ - timing_wvga2: 800x480pixclkact { - clock-frequency = <33260000>; - hactive = <800>; - vactive = <480>; - hback-porch = <216>; - hfront-porch = <40>; - vback-porch = <35>; - vfront-porch = <10>; - hsync-len = <128>; - vsync-len = <2>; - - de-active = <1>; - hsync-active = <0>; - vsync-active = <0>; - pixelclk-active = <1>; - }; - /* Standard SVGA timing */ - timing_svga: 800x600 { - clock-frequency = <40000000>; - hactive = <800>; - vactive = <600>; - hback-porch = <88>; - hfront-porch = <40>; - vback-porch = <23>; - vfront-porch = <1>; - hsync-len = <128>; - vsync-len = <4>; - - de-active = <1>; - hsync-active = <1>; - vsync-active = <1>; - pixelclk-active = <0>; - }; - /* TouchRevolution Fusion 10"/CLAA101NC05 10.1 inch */ - timing_wsvga: 1024x600 { - clock-frequency = <48000000>; - hactive = <1024>; - vactive = <600>; - hback-porch = <104>; - hfront-porch = <43>; - vback-porch = <24>; - vfront-porch = <20>; - hsync-len = <5>; - vsync-len = <5>; - - de-active = <1>; - hsync-active = <0>; - vsync-active = <0>; - pixelclk-active = <0>; - }; - /* Standard XGA timing */ - timing_xga: 1024x768 { - clock-frequency = <65000000>; - hactive = <1024>; - vactive = <768>; - hback-porch = <160>; - hfront-porch = <24>; - vback-porch = <29>; - vfront-porch = <3>; - hsync-len = <136>; - vsync-len = <6>; - - de-active = <1>; - hsync-active = <0>; - vsync-active = <0>; - pixelclk-active = <0>; - }; - }; - }; -}; - /* PWM */ &pwm4 { status = "okay"; diff --git a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi index dc7f43b47f16..19972a2ed59a 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi @@ -68,14 +68,6 @@ status = "okay"; }; -&bl { - brightness-levels = <0 45 63 88 119 158 203 255>; - default-brightness-level = <4>; - power-supply = <®_3v3>; - pwms = <&pwm4 0 6666667 PWM_POLARITY_INVERTED>; - status = "okay"; -}; - &pxp { status = "okay"; }; @@ -155,123 +147,6 @@ }; }; -&lcdif { - display = <&display0>; - status = "okay"; - - display0: lcd-display { - bits-per-pixel = <16>; - bus-width = <18>; - - display-timings { - native-mode = <&timing_vga>; - - /* Standard VGA timing */ - timing_vga: 640x480 { - clock-frequency = <25175000>; - hactive = <640>; - vactive = <480>; - hback-porch = <40>; - hfront-porch = <24>; - vback-porch = <32>; - vfront-porch = <11>; - hsync-len = <96>; - vsync-len = <2>; - - de-active = <1>; - hsync-active = <0>; - vsync-active = <0>; - pixelclk-active = <0>; - }; - - /* WVGA Timing, e.g. EDT ET070080DH6 */ - timing_wvga: 800x480 { - clock-frequency = <33260000>; - hactive = <800>; - vactive = <480>; - hback-porch = <216>; - hfront-porch = <40>; - vback-porch = <35>; - vfront-porch = <10>; - hsync-len = <128>; - vsync-len = <2>; - - de-active = <1>; - hsync-active = <0>; - vsync-active = <0>; - pixelclk-active = <0>; - }; - /* WVGA Timing, TouchRevolution Fusion 7" */ - timing_wvga2: 800x480pixclkact { - clock-frequency = <33260000>; - hactive = <800>; - vactive = <480>; - hback-porch = <216>; - hfront-porch = <40>; - vback-porch = <35>; - vfront-porch = <10>; - hsync-len = <128>; - vsync-len = <2>; - - de-active = <1>; - hsync-active = <0>; - vsync-active = <0>; - pixelclk-active = <1>; - }; - /* Standard SVGA timing */ - timing_svga: 800x600 { - clock-frequency = <40000000>; - hactive = <800>; - vactive = <600>; - hback-porch = <88>; - hfront-porch = <40>; - vback-porch = <23>; - vfront-porch = <1>; - hsync-len = <128>; - vsync-len = <4>; - - de-active = <1>; - hsync-active = <1>; - vsync-active = <1>; - pixelclk-active = <0>; - }; - /* TouchRevolution Fusion 10"/CLAA101NC05 10.1 inch */ - timing_wsvga: 1024x600 { - clock-frequency = <48000000>; - hactive = <1024>; - vactive = <600>; - hback-porch = <104>; - hfront-porch = <43>; - vback-porch = <24>; - vfront-porch = <20>; - hsync-len = <5>; - vsync-len = <5>; - - de-active = <1>; - hsync-active = <0>; - vsync-active = <0>; - pixelclk-active = <0>; - }; - /* Standard XGA timing */ - timing_xga: 1024x768 { - clock-frequency = <65000000>; - hactive = <1024>; - vactive = <768>; - hback-porch = <160>; - hfront-porch = <24>; - vback-porch = <29>; - vfront-porch = <3>; - hsync-len = <136>; - vsync-len = <6>; - - de-active = <1>; - hsync-active = <0>; - vsync-active = <0>; - pixelclk-active = <0>; - }; - }; - }; -}; /* PWM */ &pwm4 { diff --git a/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi b/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi index 1617013ed10a..1f776b96e383 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi @@ -70,13 +70,6 @@ }; }; -&bl { - brightness-levels = <0 45 63 88 119 158 203 255>; - default-brightness-level = <4>; - pwms = <&pwm4 0 6666667 PWM_POLARITY_INVERTED>; - status = "okay"; -}; - &adc1 { status = "okay"; }; @@ -112,124 +105,6 @@ }; }; -&lcdif { - display = <&display0>; - status = "okay"; - - display0: lcd-display { - bits-per-pixel = <16>; - bus-width = <18>; - - display-timings { - native-mode = <&timing_vga>; - - /* Standard VGA timing */ - timing_vga: 640x480 { - clock-frequency = <25175000>; - hactive = <640>; - vactive = <480>; - hback-porch = <40>; - hfront-porch = <24>; - vback-porch = <32>; - vfront-porch = <11>; - hsync-len = <96>; - vsync-len = <2>; - - de-active = <1>; - hsync-active = <0>; - vsync-active = <0>; - pixelclk-active = <0>; - }; - - /* WVGA Timing, e.g. EDT ET070080DH6 */ - timing_wvga: 800x480 { - clock-frequency = <33260000>; - hactive = <800>; - vactive = <480>; - hback-porch = <216>; - hfront-porch = <40>; - vback-porch = <35>; - vfront-porch = <10>; - hsync-len = <128>; - vsync-len = <2>; - - de-active = <1>; - hsync-active = <0>; - vsync-active = <0>; - pixelclk-active = <0>; - }; - /* WVGA Timing, TouchRevolution Fusion 7" */ - timing_wvga2: 800x480pixclkact { - clock-frequency = <33260000>; - hactive = <800>; - vactive = <480>; - hback-porch = <216>; - hfront-porch = <40>; - vback-porch = <35>; - vfront-porch = <10>; - hsync-len = <128>; - vsync-len = <2>; - - de-active = <1>; - hsync-active = <0>; - vsync-active = <0>; - pixelclk-active = <1>; - }; - /* Standard SVGA timing */ - timing_svga: 800x600 { - clock-frequency = <40000000>; - hactive = <800>; - vactive = <600>; - hback-porch = <88>; - hfront-porch = <40>; - vback-porch = <23>; - vfront-porch = <1>; - hsync-len = <128>; - vsync-len = <4>; - - de-active = <1>; - hsync-active = <1>; - vsync-active = <1>; - pixelclk-active = <0>; - }; - /* TouchRevolution Fusion 10"/CLAA101NC05 10.1 inch */ - timing_wsvga: 1024x600 { - clock-frequency = <48000000>; - hactive = <1024>; - vactive = <600>; - hback-porch = <104>; - hfront-porch = <43>; - vback-porch = <24>; - vfront-porch = <20>; - hsync-len = <5>; - vsync-len = <5>; - - de-active = <1>; - hsync-active = <0>; - vsync-active = <0>; - pixelclk-active = <0>; - }; - /* Standard XGA timing */ - timing_xga: 1024x768 { - clock-frequency = <65000000>; - hactive = <1024>; - vactive = <768>; - hback-porch = <160>; - hfront-porch = <24>; - vback-porch = <29>; - vfront-porch = <3>; - hsync-len = <136>; - vsync-len = <6>; - - de-active = <1>; - hsync-active = <0>; - vsync-active = <0>; - pixelclk-active = <0>; - }; - }; - }; -}; - /* PWM */ &pwm4 { status = "okay"; diff --git a/arch/arm/boot/dts/imx6ull-colibri-iris.dtsi b/arch/arm/boot/dts/imx6ull-colibri-iris.dtsi index 9db6e341ed5a..92bbcbc0bf0c 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-iris.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-iris.dtsi @@ -60,13 +60,6 @@ }; }; -&bl { - brightness-levels = <0 45 63 88 119 158 203 255>; - default-brightness-level = <4>; - pwms = <&pwm4 0 6666667 PWM_POLARITY_INVERTED>; - status = "okay"; -}; - &adc1 { status = "okay"; }; @@ -102,124 +95,6 @@ }; }; -&lcdif { - display = <&display0>; - status = "okay"; - - display0: lcd-display { - bits-per-pixel = <16>; - bus-width = <18>; - - display-timings { - native-mode = <&timing_vga>; - - /* Standard VGA timing */ - timing_vga: 640x480 { - clock-frequency = <25175000>; - hactive = <640>; - vactive = <480>; - hback-porch = <40>; - hfront-porch = <24>; - vback-porch = <32>; - vfront-porch = <11>; - hsync-len = <96>; - vsync-len = <2>; - - de-active = <1>; - hsync-active = <0>; - vsync-active = <0>; - pixelclk-active = <0>; - }; - - /* WVGA Timing, e.g. EDT ET070080DH6 */ - timing_wvga: 800x480 { - clock-frequency = <33260000>; - hactive = <800>; - vactive = <480>; - hback-porch = <216>; - hfront-porch = <40>; - vback-porch = <35>; - vfront-porch = <10>; - hsync-len = <128>; - vsync-len = <2>; - - de-active = <1>; - hsync-active = <0>; - vsync-active = <0>; - pixelclk-active = <0>; - }; - /* WVGA Timing, TouchRevolution Fusion 7" */ - timing_wvga2: 800x480pixclkact { - clock-frequency = <33260000>; - hactive = <800>; - vactive = <480>; - hback-porch = <216>; - hfront-porch = <40>; - vback-porch = <35>; - vfront-porch = <10>; - hsync-len = <128>; - vsync-len = <2>; - - de-active = <1>; - hsync-active = <0>; - vsync-active = <0>; - pixelclk-active = <1>; - }; - /* Standard SVGA timing */ - timing_svga: 800x600 { - clock-frequency = <40000000>; - hactive = <800>; - vactive = <600>; - hback-porch = <88>; - hfront-porch = <40>; - vback-porch = <23>; - vfront-porch = <1>; - hsync-len = <128>; - vsync-len = <4>; - - de-active = <1>; - hsync-active = <1>; - vsync-active = <1>; - pixelclk-active = <0>; - }; - /* TouchRevolution Fusion 10"/CLAA101NC05 10.1 inch */ - timing_wsvga: 1024x600 { - clock-frequency = <48000000>; - hactive = <1024>; - vactive = <600>; - hback-porch = <104>; - hfront-porch = <43>; - vback-porch = <24>; - vfront-porch = <20>; - hsync-len = <5>; - vsync-len = <5>; - - de-active = <1>; - hsync-active = <0>; - vsync-active = <0>; - pixelclk-active = <0>; - }; - /* Standard XGA timing */ - timing_xga: 1024x768 { - clock-frequency = <65000000>; - hactive = <1024>; - vactive = <768>; - hback-porch = <160>; - hfront-porch = <24>; - vback-porch = <29>; - vfront-porch = <3>; - hsync-len = <136>; - vsync-len = <6>; - - de-active = <1>; - hsync-active = <0>; - vsync-active = <0>; - pixelclk-active = <0>; - }; - }; - }; -}; - /* PWM */ &pwm4 { status = "okay"; diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx6ull-colibri.dtsi index 237d4e183529..032ba6764b7d 100644 --- a/arch/arm/boot/dts/imx6ull-colibri.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi @@ -4,6 +4,7 @@ */ #include "imx6ull.dtsi" +#include / { aliases { @@ -28,11 +29,14 @@ }; }; - bl: backlight { + backlight: backlight { compatible = "pwm-backlight"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gpio_bl_on>; enable-gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>; + brightness-levels = <0 45 63 88 119 158 203 255>; + default-brightness-level = <4>; + pwms = <&pwm4 0 6666667 PWM_POLARITY_INVERTED>; status = "disabled"; }; @@ -196,6 +200,122 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_lcdif_dat &pinctrl_lcdif_ctrl>; + + display = <&display0>; + status = "okay"; + + display0: lcd-display { + bits-per-pixel = <16>; + bus-width = <18>; + + display-timings { + native-mode = <&timing_vga>; + + /* Standard VGA timing */ + timing_vga: 640x480 { + clock-frequency = <25175000>; + hactive = <640>; + vactive = <480>; + hback-porch = <40>; + hfront-porch = <24>; + vback-porch = <32>; + vfront-porch = <11>; + hsync-len = <96>; + vsync-len = <2>; + + de-active = <1>; + hsync-active = <0>; + vsync-active = <0>; + pixelclk-active = <0>; + }; + + /* WVGA Timing, e.g. EDT ET070080DH6 */ + timing_wvga: 800x480 { + clock-frequency = <33260000>; + hactive = <800>; + vactive = <480>; + hback-porch = <216>; + hfront-porch = <40>; + vback-porch = <35>; + vfront-porch = <10>; + hsync-len = <128>; + vsync-len = <2>; + + de-active = <1>; + hsync-active = <0>; + vsync-active = <0>; + pixelclk-active = <0>; + }; + /* WVGA Timing, TouchRevolution Fusion 7" */ + timing_wvga2: 800x480pixclkact { + clock-frequency = <33260000>; + hactive = <800>; + vactive = <480>; + hback-porch = <216>; + hfront-porch = <40>; + vback-porch = <35>; + vfront-porch = <10>; + hsync-len = <128>; + vsync-len = <2>; + + de-active = <1>; + hsync-active = <0>; + vsync-active = <0>; + pixelclk-active = <1>; + }; + /* Standard SVGA timing */ + timing_svga: 800x600 { + clock-frequency = <40000000>; + hactive = <800>; + vactive = <600>; + hback-porch = <88>; + hfront-porch = <40>; + vback-porch = <23>; + vfront-porch = <1>; + hsync-len = <128>; + vsync-len = <4>; + + de-active = <1>; + hsync-active = <1>; + vsync-active = <1>; + pixelclk-active = <0>; + }; + /* TouchRevolution Fusion 10"/CLAA101NC05 10.1 inch */ + timing_wsvga: 1024x600 { + clock-frequency = <48000000>; + hactive = <1024>; + vactive = <600>; + hback-porch = <104>; + hfront-porch = <43>; + vback-porch = <24>; + vfront-porch = <20>; + hsync-len = <5>; + vsync-len = <5>; + + de-active = <1>; + hsync-active = <0>; + vsync-active = <0>; + pixelclk-active = <0>; + }; + /* Standard XGA timing */ + timing_xga: 1024x768 { + clock-frequency = <65000000>; + hactive = <1024>; + vactive = <768>; + hback-porch = <160>; + hfront-porch = <24>; + vback-porch = <29>; + vfront-porch = <3>; + hsync-len = <136>; + vsync-len = <6>; + + de-active = <1>; + hsync-active = <0>; + vsync-active = <0>; + pixelclk-active = <0>; + }; + }; + }; }; &pwm4 { -- cgit v1.2.3