Merge remote-tracking branch 'regulator/for-5.7' into regulator-linus

[linux-2.6-microblaze.git] / arch / arm / boot / dts / imx6ul-pico.dtsi

diff --git a/arch/arm/boot/dts/imx6ul-pico.dtsi b/arch/arm/boot/dts/imx6ul-pico.dtsi
index de9f831..df1da98 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-pico.dtsi
+++ b/arch/arm/boot/dts/imx6ul-pico.dtsi
@@ -20,7 +20,7 @@
                stdout-path = &uart6;
        };
 
-       backlight {
+       backlight: backlight {
                compatible = "pwm-backlight";
                pwms = <&pwm3 0 5000000>;
                brightness-levels = <0 4 8 16 32 64 128 255>;
@@ -72,6 +72,17 @@
                regulator-max-microvolt = <3300000>;
                startup-delay-us = <200000>;
        };
+
+       panel {
+               compatible = "vxt,vl050-8048nt-c01";
+               backlight = <&backlight>;
+
+               port {
+                       panel_in: endpoint {
+                               remote-endpoint = <&display_out>;
+                       };
+               };
+       };
 };
 
 &can1 {
@@ -154,31 +165,11 @@
 &lcdif {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_lcdif_dat &pinctrl_lcdif_ctrl>;
-       display = <&display0>;
        status = "okay";
 
-       display0: display0 {
-               bits-per-pixel = <32>;
-               bus-width = <24>;
-
-               display-timings {
-                       native-mode = <&timing0>;
-
-                       timing0: timing0 {
-                               clock-frequency = <33200000>;
-                               hactive = <800>;
-                               vactive = <480>;
-                               hfront-porch = <210>;
-                               hback-porch = <46>;
-                               hsync-len = <1>;
-                               vback-porch = <22>;
-                               vfront-porch = <23>;
-                               vsync-len = <1>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
+       port {
+               display_out: endpoint {
+                       remote-endpoint = <&panel_in>;
                };
        };
 };