diff options
| author | Leonard Crestez <leonard.crestez@nxp.com> | 2018-06-12 16:55:18 +0300 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-02-12 10:32:14 +0800 |
| commit | 7629febba60add7e46a877fbd921924f278e4200 (patch) | |
| tree | a244dc455b0bd774dfc88c3640ddf3bf85219fd6 /arch/arm/boot/dts/imx7d-sdb.dts | |
| parent | 2106c06cf4f362fdd184a96ab3c51a8aa9c5194e (diff) | |
MLK-18583: Revert "ARM: dts: imx7d-sdb: Add DRM panel support"
This reverts commit d8236af53074c61b7f88af773357f3cdcf378a9d.
The mxsfb driver uses old bindings so we need to provide those.
The LCD timings were already upstreamed but then an upstream commit
removed them in favor of adding a DRM path. Making mxsfb work requires
reverting this upstream commit
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Acked-by: Robert Chiras <robert.chiras@nxp.com>
Diffstat (limited to 'arch/arm/boot/dts/imx7d-sdb.dts')
| -rw-r--r-- | arch/arm/boot/dts/imx7d-sdb.dts | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts index 096eb9457e1d..ce8780d1bce4 100644 --- a/arch/arm/boot/dts/imx7d-sdb.dts +++ b/arch/arm/boot/dts/imx7d-sdb.dts @@ -126,14 +126,6 @@ startup-delay-us = <200000>; }; - reg_lcd_3v3: regulator-lcd-3v3 { - compatible = "regulator-fixed"; - regulator-name = "lcd-3v3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - gpio = <&extended_io 7 GPIO_ACTIVE_LOW>; - }; - reg_can2_3v3: regulator-can2-3v3 { compatible = "regulator-fixed"; regulator-name = "can2-3v3"; @@ -164,19 +156,6 @@ enable-active-high; }; - panel { - compatible = "innolux,at043tn24"; - pinctrl-0 = <&pinctrl_backlight>; - enable-gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>; - power-supply = <®_lcd_3v3>; - - port { - panel_in: endpoint { - remote-endpoint = <&display_out>; - }; - }; - }; - backlight { compatible = "pwm-backlight"; pwms = <&pwm1 0 5000000>; @@ -621,11 +600,31 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_lcdif>; enable-gpio = <&extended_io 7 GPIO_ACTIVE_LOW>; + display = <&display0>; status = "okay"; - port { - display_out: endpoint { - remote-endpoint = <&panel_in>; + display0: display { + bits-per-pixel = <16>; + bus-width = <24>; + + display-timings { + native-mode = <&timing0>; + + timing0: timing0 { + clock-frequency = <9200000>; + hactive = <480>; + vactive = <272>; + hfront-porch = <8>; + hback-porch = <4>; + hsync-len = <41>; + vback-porch = <2>; + vfront-porch = <4>; + vsync-len = <10>; + hsync-active = <0>; + vsync-active = <0>; + de-active = <1>; + pixelclk-active = <0>; + }; }; }; }; |