diff options
| -rw-r--r-- | arch/arm/boot/dts/imx7-colibri-aster.dtsi | 50 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 48 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7-colibri.dtsi | 28 |
3 files changed, 26 insertions, 100 deletions
diff --git a/arch/arm/boot/dts/imx7-colibri-aster.dtsi b/arch/arm/boot/dts/imx7-colibri-aster.dtsi index 4748ca7c0162..08044f273ee0 100644 --- a/arch/arm/boot/dts/imx7-colibri-aster.dtsi +++ b/arch/arm/boot/dts/imx7-colibri-aster.dtsi @@ -7,9 +7,6 @@ * (at your option) any later version. */ -#include <dt-bindings/input/input.h> -#include <dt-bindings/pwm/pwm.h> - / { chosen { bootargs = "console=ttymxc0,115200"; @@ -29,36 +26,6 @@ }; }; - panel_dpi: panel-dpi { - compatible = "panel-dpi"; - backlight = <&bl>; - power-supply = <®_3v3>; - - width-mm = <115>; - height-mm = <86>; - - data-mapping = "bgr666"; - - /* VESA DMT v1.13 mode VGA 640x480 60Hz */ - panel-timing { - clock-frequency = <25175000>; - hactive = <640>; - vactive = <480>; - hsync-len = <96>; - hfront-porch = <16>; - hback-porch = <48>; - vsync-len = <2>; - vfront-porch = <10>; - vback-porch = <33>; - }; - - port { - lcd_panel_in: endpoint { - remote-endpoint = <&lcdif_out>; - }; - }; - }; - reg_3v3: regulator-3v3 { compatible = "regulator-fixed"; regulator-name = "3.3V"; @@ -86,13 +53,6 @@ }; }; -&bl { - brightness-levels = <0 45 63 88 119 158 203 255>; - default-brightness-level = <4>; - pwms = <&pwm1 0 6666667 PWM_POLARITY_INVERTED>; - status = "okay"; -}; - &adc1 { status = "okay"; }; @@ -150,16 +110,6 @@ }; }; -&lcdif { - status = "okay"; - - port { - lcdif_out: endpoint { - remote-endpoint = <&lcd_panel_in>; - }; - }; -}; - &pwm1 { status = "okay"; }; diff --git a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi index 88e6c2966810..71951135aa55 100644 --- a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi +++ b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi @@ -78,36 +78,6 @@ }; }; - panel_dpi: panel-dpi { - compatible = "panel-dpi"; - backlight = <&bl>; - power-supply = <®_3v3>; - - width-mm = <115>; - height-mm = <86>; - - data-mapping = "bgr666"; - - /* VESA DMT v1.13 mode VGA 640x480 60Hz */ - panel-timing { - clock-frequency = <25175000>; - hactive = <640>; - vactive = <480>; - hsync-len = <96>; - hfront-porch = <16>; - hback-porch = <48>; - vsync-len = <2>; - vfront-porch = <10>; - vback-porch = <33>; - }; - - port { - lcd_panel_in: endpoint { - remote-endpoint = <&lcdif_out>; - }; - }; - }; - reg_3v3: regulator-3v3 { compatible = "regulator-fixed"; regulator-name = "3.3V"; @@ -134,14 +104,6 @@ }; }; -&bl { - brightness-levels = <0 4 8 16 32 64 128 255>; - default-brightness-level = <6>; - power-supply = <®_3v3>; - - status = "okay"; -}; - &adc1 { status = "okay"; }; @@ -214,16 +176,6 @@ }; }; -&lcdif { - status = "okay"; - - port { - lcdif_out: endpoint { - remote-endpoint = <&lcd_panel_in>; - }; - }; -}; - &pwm1 { status = "okay"; }; diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi index d85ad000136b..f283ef921642 100644 --- a/arch/arm/boot/dts/imx7-colibri.dtsi +++ b/arch/arm/boot/dts/imx7-colibri.dtsi @@ -40,13 +40,32 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#include <dt-bindings/pwm/pwm.h> + / { - bl: backlight { + backlight: backlight { compatible = "pwm-backlight"; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gpio_bl_on>; - pwms = <&pwm1 0 5000000 0>; + brightness-levels = <0 45 63 88 119 158 203 255>; + default-brightness-level = <4>; enable-gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; + power-supply = <®_module_3v3>; + pwms = <&pwm1 0 6666667 PWM_POLARITY_INVERTED>; + status = "disabled"; + }; + + panel_dpi: panel-dpi { + compatible = "panel-dpi"; + backlight = <&backlight>; + data-mapping = "bgr666"; + status = "disabled"; + + port { + lcd_panel_in: endpoint { + remote-endpoint = <&lcdif_out>; + }; + }; }; reg_module_3v3: regulator-module-3v3 { @@ -450,6 +469,11 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_lcdif_dat &pinctrl_lcdif_ctrl>; + port { + lcdif_out: endpoint { + remote-endpoint = <&lcd_panel_in>; + }; + }; }; &pwm1 { |