MLK-11431-4: ARM: DTS: imx: Update IPU and display property
authorSandor Yu <R01008@freescale.com>
Fri, 28 Aug 2015 10:05:53 +0000 (18:05 +0800)
committerNitin Garg <nitin.garg@nxp.com>
Mon, 19 Mar 2018 19:48:26 +0000 (14:48 -0500)
Update IPU and display property, make sure these dts files can
pass build.

Signed-off-by: Sandor Yu <R01008@freescale.com>
26 files changed:
arch/arm/boot/dts/imx6dl-aristainetos_4.dts
arch/arm/boot/dts/imx6dl-aristainetos_7.dts
arch/arm/boot/dts/imx6dl-riotboard.dts
arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts
arch/arm/boot/dts/imx6dl-tx6u-801x.dts
arch/arm/boot/dts/imx6q-gk802.dts
arch/arm/boot/dts/imx6q-gw5400-a.dts
arch/arm/boot/dts/imx6q-tbs2910.dts
arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts
arch/arm/boot/dts/imx6q-tx6q-1010.dts
arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts
arch/arm/boot/dts/imx6q-tx6q-1020.dts
arch/arm/boot/dts/imx6qdl-aristainetos.dtsi
arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
arch/arm/boot/dts/imx6qdl-gw552x.dtsi
arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi
arch/arm/boot/dts/imx6qdl-rex.dtsi
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
arch/arm/boot/dts/imx6qdl-udoo.dtsi
arch/arm/boot/dts/imx6qdl-wandboard.dtsi

index d4c4a22..926e4ee 100644 (file)
@@ -3,6 +3,8 @@
  *
  * Copyright (C) 2014 Heiko Schocher <hs@denx.de>
  *
+ * Copyright 2015 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
        memory {
                reg = <0x10000000 0x40000000>;
        };
+};
 
-       soc {
-               display0: display@di0 {
-                       compatible = "fsl,imx-parallel-display";
-                       interface-pix-fmt = "rgb24";
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&pinctrl_ipu_disp>;
-                       status = "okay";
-
-                       display-timings {
-                               480x800p60 {
-                                       native-mode;
-                                       clock-frequency = <30000000>;
-                                       hactive = <480>;
-                                       vactive = <800>;
-                                       hfront-porch = <59>;
-                                       hback-porch = <10>;
-                                       hsync-len = <10>;
-                                       vback-porch = <15>;
-                                       vfront-porch = <15>;
-                                       vsync-len = <15>;
-                                       hsync-active = <1>;
-                                       vsync-active = <1>;
-                               };
-                       };
+&mxcfb1 {
+       status = "okay";
+};
 
-                       port {
-                               display0_in: endpoint {
-                                       remote-endpoint = <&ipu1_di0_disp0>;
-                               };
-                       };
-               };
-       };
+&lcd {
+       ipu_id = <0>;
+       disp_id = <0>;
+       default_ifmt = "RGB24";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_ipu_disp>;
+       status = "okay";
 };
 
 &ecspi2 {
        status = "okay";
 };
 
-&ipu1_di0_disp0 {
-       remote-endpoint = <&display0_in>;
-};
-
 &pwm1 {
        status = "okay";
 };
index 15203f0..bad1e22 100644 (file)
@@ -3,6 +3,8 @@
  *
  * Copyright (C) 2014 Heiko Schocher <hs@denx.de>
  *
+ * Copyright 2015 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
                reg = <0x10000000 0x40000000>;
        };
 
-       soc {
-               display0: display@di0 {
-                       compatible = "fsl,imx-parallel-display";
-                       interface-pix-fmt = "rgb24";
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&pinctrl_ipu_disp>;
-                       status = "okay";
-
-                       display-timings {
-                               800x480p60 {
-                                       native-mode;
-                                       clock-frequency = <33246000>;
-                                       hactive = <800>;
-                                       vactive = <480>;
-                                       hfront-porch = <88>;
-                                       hback-porch = <88>;
-                                       hsync-len = <80>;
-                                       vback-porch = <10>;
-                                       vfront-porch = <10>;
-                                       vsync-len = <25>;
-                                       vsync-active = <1>;
-                               };
-                       };
-
-                       port {
-                               display0_in: endpoint {
-                                       remote-endpoint = <&ipu1_di0_disp0>;
-                               };
-                       };
-               };
-       };
-
        backlight {
                compatible = "pwm-backlight";
                pwms = <&pwm3 0 3000>;
        };
 };
 
+&mxcfb1 {
+       status = "okay";
+};
+
+&lcd {
+       ipu_id = <0>;
+       disp_id = <0>;
+       default_ifmt = "RGB24";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_ipu_disp>;
+       status = "okay";
+};
+
 &i2c2 {
        clock-frequency = <100000>;
        pinctrl-names = "default";
        status = "okay";
 };
 
-&ipu1_di0_disp0 {
-       remote-endpoint = <&display0_in>;
-};
-
 &pwm3 {
        status = "okay";
 };
index 75d7343..1e7437c 100644 (file)
@@ -1,6 +1,8 @@
 /*
  * Copyright 2014 Iain Paton <ipaton0@gmail.com>
  *
+ * Copyright 2015 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
        model = "RIoTboard i.MX6S";
        compatible = "riot,imx6s-riotboard", "fsl,imx6dl";
 
+       aliases {
+               mxcfb0 = &mxcfb1;
+       };
+
        memory {
                reg = <0x10000000 0x40000000>;
        };
                        mux-int-port = <1>;
                        mux-ext-port = <3>;
        };
+
+       mxcfb1: fb@0 {
+               compatible = "fsl,mxc_sdc_fb";
+               disp_dev = "hdmi";
+               interface_pix_fmt = "RGB24";
+               mode_str ="1920x1080M@60";
+               default_bpp = <24>;
+               int_clk = <0>;
+               late_init = <0>;
+               status = "okay";
+       };
 };
 
 &audmux {
        status = "okay";
 };
 
-&hdmi {
-       ddc-i2c-bus = <&i2c2>;
+&hdmi_core {
+       ipu_id = <0>;
+       disp_id = <0>;
+       status = "okay";
+};
+
+&hdmi_video {
+       fsl,phy_reg_vlev = <0x0294>;
+       fsl,phy_reg_cksymtx = <0x800d>;
        status = "okay";
 };
 
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_i2c2>;
        status = "okay";
+
+       hdmi_edid: edid@50 {
+               compatible = "fsl,imx6-hdmi-i2c";
+               reg = <0x50>;
+       };
 };
 
 &i2c4 {
index 063fe75..c6eba8f 100644 (file)
        model = "Ka-Ro electronics TX6DL Module on CoMpact TFT";
        compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl";
 
-       aliases {
-               display = &display;
-       };
-
        backlight: backlight {
                compatible = "pwm-backlight";
                pwms = <&pwm2 0 500000 0>;
                default-brightness-level = <50>;
        };
 
-       display: display@di0 {
-               compatible = "fsl,imx-parallel-display";
-               interface-pix-fmt = "rgb24";
+       lcd@0 {
+               compatible = "fsl,lcd";
+               ipu_id = <0>;
+               disp_id = <0>;
+               default_ifmt = "RGB565";
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_disp0_1>;
                status = "okay";
-
-               port {
-                       display0_in: endpoint {
-                               remote-endpoint = <&ipu1_di0_disp0>;
-                       };
-               };
-
-               display-timings {
-                       native-mode = <&ET070001DM6>;
-
-                       ET070001DM6: CoMTFT { /* same as ET0700 but with inverted pixel clock */
-                               clock-frequency = <33264000>;
-                               hactive = <800>;
-                               vactive = <480>;
-                               hback-porch = <88>;
-                               hsync-len = <128>;
-                               hfront-porch = <40>;
-                               vback-porch = <33>;
-                               vsync-len = <2>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <1>;
-                       };
-               };
-        };
+       };
 };
 
 &can1 {
        xceiver-supply = <&reg_3v3>;
 };
 
-&ipu1_di0_disp0 {
-       remote-endpoint = <&display0_in>;
-};
-
 &kpp {
        status = "disabled";
 };
index b7a7284..34cb356 100644 (file)
        model = "Ka-Ro electronics TX6U-801x Module";
        compatible = "karo,imx6dl-tx6dl", "fsl,imx6dl";
 
-       aliases {
-               display = &display;
-       };
-
        backlight: backlight {
                compatible = "pwm-backlight";
                pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>;
                default-brightness-level = <50>;
        };
 
-       display: display@di0 {
-               compatible = "fsl,imx-parallel-display";
-               interface-pix-fmt = "rgb24";
+       lcd@0 {
+               compatible = "fsl,lcd";
+               ipu_id = <0>;
+               disp_id = <0>;
+               default_ifmt = "RGB565";
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_disp0_1>;
                status = "okay";
-
-               port {
-                       display0_in: endpoint {
-                               remote-endpoint = <&ipu1_di0_disp0>;
-                       };
-               };
-
-               display-timings {
-                       VGA {
-                               clock-frequency = <25200000>;
-                               hactive = <640>;
-                               vactive = <480>;
-                               hback-porch = <48>;
-                               hsync-len = <96>;
-                               hfront-porch = <16>;
-                               vback-porch = <31>;
-                               vsync-len = <2>;
-                               vfront-porch = <12>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ETV570 {
-                               clock-frequency = <25200000>;
-                               hactive = <640>;
-                               vactive = <480>;
-                               hback-porch = <114>;
-                               hsync-len = <30>;
-                               hfront-porch = <16>;
-                               vback-porch = <32>;
-                               vsync-len = <3>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ET0350 {
-                               clock-frequency = <6413760>;
-                               hactive = <320>;
-                               vactive = <240>;
-                               hback-porch = <34>;
-                               hsync-len = <34>;
-                               hfront-porch = <20>;
-                               vback-porch = <15>;
-                               vsync-len = <3>;
-                               vfront-porch = <4>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ET0430 {
-                               clock-frequency = <9009000>;
-                               hactive = <480>;
-                               vactive = <272>;
-                               hback-porch = <2>;
-                               hsync-len = <41>;
-                               hfront-porch = <2>;
-                               vback-porch = <2>;
-                               vsync-len = <10>;
-                               vfront-porch = <2>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <1>;
-                       };
-
-                       ET0500 {
-                               clock-frequency = <33264000>;
-                               hactive = <800>;
-                               vactive = <480>;
-                               hback-porch = <88>;
-                               hsync-len = <128>;
-                               hfront-porch = <40>;
-                               vback-porch = <33>;
-                               vsync-len = <2>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ET0700 { /* same as ET0500 */
-                               clock-frequency = <33264000>;
-                               hactive = <800>;
-                               vactive = <480>;
-                               hback-porch = <88>;
-                               hsync-len = <128>;
-                               hfront-porch = <40>;
-                               vback-porch = <33>;
-                               vsync-len = <2>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ETQ570 {
-                               clock-frequency = <6596040>;
-                               hactive = <320>;
-                               vactive = <240>;
-                               hback-porch = <38>;
-                               hsync-len = <30>;
-                               hfront-porch = <30>;
-                               vback-porch = <16>;
-                               vsync-len = <3>;
-                               vfront-porch = <4>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-               };
-        };
+       };
 };
 
-&ipu1_di0_disp0 {
-       remote-endpoint = <&display0_in>;
-};
index b715deb..b27b8aa 100644 (file)
@@ -1,6 +1,8 @@
 /*
  * Copyright (C) 2013 Philipp Zabel
  *
+ * Copyright 2015 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
  * This file is licensed under the terms of the GNU General Public License
  * version 2.  This program is licensed "as is" without any warranty of any
  * kind, whether express or implied.
        model = "Zealz GK802";
        compatible = "zealz,imx6q-gk802", "fsl,imx6q";
 
+       aliases {
+               mxcfb0 = &mxcfb1;
+       };
+
        chosen {
                stdout-path = &uart4;
        };
                        wakeup-source;
                };
        };
+
+       mxcfb1: fb@0 {
+               compatible = "fsl,mxc_sdc_fb";
+               disp_dev = "hdmi";
+               interface_pix_fmt = "RGB24";
+               mode_str ="1920x1080M@60";
+               default_bpp = <24>;
+               int_clk = <0>;
+               late_init = <0>;
+               status = "okay";
+       };
 };
 
-&hdmi {
-       ddc-i2c-bus = <&i2c3>;
+&hdmi_core {
+       ipu_id = <0>;
+       disp_id = <0>;
+       status = "okay";
+};
+
+&hdmi_video {
+       fsl,phy_reg_vlev = <0x0294>;
+       fsl,phy_reg_cksymtx = <0x800d>;
        status = "okay";
 };
 
        pinctrl-0 = <&pinctrl_i2c3>;
        clock-frequency = <100000>;
        status = "okay";
+
+       hdmi_edid: edid@50 {
+               compatible = "fsl,imx6-hdmi-i2c";
+               reg = <0x50>;
+       };
 };
 
 &iomuxc {
index 747bc10..7c39985 100644 (file)
@@ -1,6 +1,8 @@
 /*
  * Copyright 2013 Gateworks Corporation
  *
+ * Copyright 2015 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
  * The code contained herein is licensed under the GNU General Public
  * License. You may obtain a copy of the GNU General Public License
  * Version 2 or later at the following locations:
@@ -30,6 +32,7 @@
                spi0 = &ecspi1;
                usb0 = &usbh1;
                usb1 = &usbotg;
+               mxcfb0 = &mxcfb1;
        };
 
        chosen {
                mux-int-port = <1>;
                mux-ext-port = <4>;
        };
+
+       mxcfb1: fb@0 {
+               compatible = "fsl,mxc_sdc_fb";
+               disp_dev = "hdmi";
+               interface_pix_fmt = "RGB24";
+               mode_str ="1920x1080M@60";
+               default_bpp = <24>;
+               int_clk = <0>;
+               late_init = <0>;
+               status = "okay";
+       };
 };
 
 &audmux {
        status = "okay";
 };
 
-&hdmi {
-       ddc-i2c-bus = <&i2c3>;
+&hdmi_core {
+       ipu_id = <0>;
+       disp_id = <0>;
+       status = "okay";
+};
+
+&hdmi_video {
+       fsl,phy_reg_vlev = <0x0294>;
+       fsl,phy_reg_cksymtx = <0x800d>;
        status = "okay";
 };
 
                VDDIO-supply = <&reg_3p3v>;
        };
 
+       hdmi_edid: edid@50 {
+               compatible = "fsl,imx6-hdmi-i2c";
+               reg = <0x50>;
+       };
+
        touchscreen: egalax_ts@04 {
                compatible = "eeti,egalax_ts";
                reg = <0x04>;
index 06f492e..43ff8f5 100644 (file)
@@ -1,6 +1,8 @@
 /*
  * Copyright 2014 Soeren Moch <smoch@web.de>
  *
+ * Copyright 2015 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
  * This file is dual-licensed: you can use it either under the terms
  * of the GPL or the X11 license, at your option. Note that this dual
  * licensing only applies to this file, and not this project as a
        model = "TBS2910 Matrix ARM mini PC";
        compatible = "tbs,imx6q-tbs2910", "fsl,imx6q";
 
+       aliases {
+               mxcfb0 = &mxcfb1;
+       };
+
        chosen {
                stdout-path = &uart1;
        };
                spdif-controller = <&spdif>;
                spdif-out;
        };
+
+       mxcfb1: fb@0 {
+               compatible = "fsl,mxc_sdc_fb";
+               disp_dev = "hdmi";
+               interface_pix_fmt = "RGB24";
+               mode_str ="1920x1080M@60";
+               default_bpp = <24>;
+               int_clk = <0>;
+               late_init = <0>;
+               status = "okay";
+       };
 };
 
 &audmux {
        status = "okay";
 };
 
-&hdmi {
+&hdmi_cec {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_hdmi>;
-       ddc-i2c-bus = <&i2c2>;
+       status = "okay";
+};
+
+&hdmi_core {
+       ipu_id = <0>;
+       disp_id = <0>;
+       status = "okay";
+};
+
+&hdmi_video {
+       fsl,phy_reg_vlev = <0x0294>;
+       fsl,phy_reg_cksymtx = <0x800d>;
        status = "okay";
 };
 
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_i2c2>;
        status = "okay";
+
+       hdmi_edid: edid@50 {
+               compatible = "fsl,imx6-hdmi-i2c";
+               reg = <0x50>;
+       };
 };
 
 &i2c3 {
index 65e95ae..2a129af 100644 (file)
        model = "Ka-Ro electronics TX6Q-1010 Module on CoMpact TFT";
        compatible = "karo,imx6q-tx6q", "fsl,imx6q";
 
-       aliases {
-               display = &display;
-       };
-
        backlight: backlight {
                compatible = "pwm-backlight";
                pwms = <&pwm2 0 500000 0>;
                default-brightness-level = <50>;
        };
 
-       display: display@di0 {
-               compatible = "fsl,imx-parallel-display";
-               interface-pix-fmt = "rgb24";
+       lcd@0 {
+               compatible = "fsl,lcd";
+               ipu_id = <0>;
+               disp_id = <0>;
+               default_ifmt = "RGB565";
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_disp0_1>;
                status = "okay";
-
-               port {
-                       display0_in: endpoint {
-                               remote-endpoint = <&ipu1_di0_disp0>;
-                       };
-               };
-
-               display-timings {
-                       native-mode = <&ET070001DM6>;
-
-                       ET070001DM6: CoMTFT { /* same as ET0700 but with inverted pixel clock */
-                               clock-frequency = <33264000>;
-                               hactive = <800>;
-                               vactive = <480>;
-                               hback-porch = <88>;
-                               hsync-len = <128>;
-                               hfront-porch = <40>;
-                               vback-porch = <33>;
-                               vsync-len = <2>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <1>;
-                       };
-               };
-        };
+       };
 };
 
 &can1 {
        xceiver-supply = <&reg_3v3>;
 };
 
-&ipu1_di0_disp0 {
-       remote-endpoint = <&display0_in>;
-};
-
 &kpp {
        status = "disabled";
 };
index 20cd0e7..48e6d08 100644 (file)
        model = "Ka-Ro electronics TX6Q-1010 Module";
        compatible = "karo,imx6q-tx6q", "fsl,imx6q";
 
-       aliases {
-               display = &display;
-       };
-
        backlight: backlight {
                compatible = "pwm-backlight";
                pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>;
                default-brightness-level = <50>;
        };
 
-       display: display@di0 {
-               compatible = "fsl,imx-parallel-display";
-               interface-pix-fmt = "rgb24";
+       lcd@0 {
+               compatible = "fsl,lcd";
+               ipu_id = <0>;
+               disp_id = <0>;
+               default_ifmt = "RGB565";
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_disp0_1>;
                status = "okay";
+       };
 
-               port {
-                       display0_in: endpoint {
-                               remote-endpoint = <&ipu1_di0_disp0>;
-                       };
-               };
-
-               display-timings {
-                       VGA {
-                               clock-frequency = <25200000>;
-                               hactive = <640>;
-                               vactive = <480>;
-                               hback-porch = <48>;
-                               hsync-len = <96>;
-                               hfront-porch = <16>;
-                               vback-porch = <31>;
-                               vsync-len = <2>;
-                               vfront-porch = <12>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ETV570 {
-                               clock-frequency = <25200000>;
-                               hactive = <640>;
-                               vactive = <480>;
-                               hback-porch = <114>;
-                               hsync-len = <30>;
-                               hfront-porch = <16>;
-                               vback-porch = <32>;
-                               vsync-len = <3>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ET0350 {
-                               clock-frequency = <6413760>;
-                               hactive = <320>;
-                               vactive = <240>;
-                               hback-porch = <34>;
-                               hsync-len = <34>;
-                               hfront-porch = <20>;
-                               vback-porch = <15>;
-                               vsync-len = <3>;
-                               vfront-porch = <4>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ET0430 {
-                               clock-frequency = <9009000>;
-                               hactive = <480>;
-                               vactive = <272>;
-                               hback-porch = <2>;
-                               hsync-len = <41>;
-                               hfront-porch = <2>;
-                               vback-porch = <2>;
-                               vsync-len = <10>;
-                               vfront-porch = <2>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <1>;
-                       };
-
-                       ET0500 {
-                               clock-frequency = <33264000>;
-                               hactive = <800>;
-                               vactive = <480>;
-                               hback-porch = <88>;
-                               hsync-len = <128>;
-                               hfront-porch = <40>;
-                               vback-porch = <33>;
-                               vsync-len = <2>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ET0700 { /* same as ET0500 */
-                               clock-frequency = <33264000>;
-                               hactive = <800>;
-                               vactive = <480>;
-                               hback-porch = <88>;
-                               hsync-len = <128>;
-                               hfront-porch = <40>;
-                               vback-porch = <33>;
-                               vsync-len = <2>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ETQ570 {
-                               clock-frequency = <6596040>;
-                               hactive = <320>;
-                               vactive = <240>;
-                               hback-porch = <38>;
-                               hsync-len = <30>;
-                               hfront-porch = <30>;
-                               vback-porch = <16>;
-                               vsync-len = <3>;
-                               vfront-porch = <4>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-               };
-        };
-};
-
-&ipu1_di0_disp0 {
-       remote-endpoint = <&display0_in>;
 };
index 9ed243b..51d8b01 100644 (file)
        model = "Ka-Ro electronics TX6Q-1020 Module on CoMpact TFT";
        compatible = "karo,imx6q-tx6q", "fsl,imx6q";
 
-       aliases {
-               display = &display;
-       };
-
        backlight: backlight {
                compatible = "pwm-backlight";
                pwms = <&pwm2 0 500000 0>;
                default-brightness-level = <50>;
        };
 
-       display: display@di0 {
-               compatible = "fsl,imx-parallel-display";
-               interface-pix-fmt = "rgb24";
+       lcd@0 {
+               compatible = "fsl,lcd";
+               ipu_id = <0>;
+               disp_id = <0>;
+               default_ifmt = "RGB565";
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_disp0_1>;
                status = "okay";
-
-               port {
-                       display0_in: endpoint {
-                               remote-endpoint = <&ipu1_di0_disp0>;
-                       };
-               };
-
-               display-timings {
-                       native-mode = <&ET070001DM6>;
-
-                       ET070001DM6: CoMTFT { /* same as ET0700 but with inverted pixel clock */
-                               clock-frequency = <33264000>;
-                               hactive = <800>;
-                               vactive = <480>;
-                               hback-porch = <88>;
-                               hsync-len = <128>;
-                               hfront-porch = <40>;
-                               vback-porch = <33>;
-                               vsync-len = <2>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <1>;
-                       };
-               };
-        };
+       };
 };
 
 &can1 {
        status = "disabled";
 };
 
-&ipu1_di0_disp0 {
-       remote-endpoint = <&display0_in>;
-};
-
 &kpp {
        status = "disabled";
 };
index 347b531..a3a87cc 100644 (file)
        model = "Ka-Ro electronics TX6Q-1020 Module";
        compatible = "karo,imx6q-tx6q", "fsl,imx6q";
 
-       aliases {
-               display = &display;
-       };
-
        backlight: backlight {
                compatible = "pwm-backlight";
                pwms = <&pwm2 0 500000 PWM_POLARITY_INVERTED>;
                default-brightness-level = <50>;
        };
 
-       display: display@di0 {
-               compatible = "fsl,imx-parallel-display";
-               interface-pix-fmt = "rgb24";
+       lcd@0 {
+               compatible = "fsl,lcd";
+               ipu_id = <0>;
+               disp_id = <0>;
+               default_ifmt = "RGB565";
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_disp0_1>;
                status = "okay";
-
-               port {
-                       display0_in: endpoint {
-                               remote-endpoint = <&ipu1_di0_disp0>;
-                       };
-               };
-
-               display-timings {
-                       VGA {
-                               clock-frequency = <25200000>;
-                               hactive = <640>;
-                               vactive = <480>;
-                               hback-porch = <48>;
-                               hsync-len = <96>;
-                               hfront-porch = <16>;
-                               vback-porch = <31>;
-                               vsync-len = <2>;
-                               vfront-porch = <12>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ETV570 {
-                               clock-frequency = <25200000>;
-                               hactive = <640>;
-                               vactive = <480>;
-                               hback-porch = <114>;
-                               hsync-len = <30>;
-                               hfront-porch = <16>;
-                               vback-porch = <32>;
-                               vsync-len = <3>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ET0350 {
-                               clock-frequency = <6413760>;
-                               hactive = <320>;
-                               vactive = <240>;
-                               hback-porch = <34>;
-                               hsync-len = <34>;
-                               hfront-porch = <20>;
-                               vback-porch = <15>;
-                               vsync-len = <3>;
-                               vfront-porch = <4>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ET0430 {
-                               clock-frequency = <9009000>;
-                               hactive = <480>;
-                               vactive = <272>;
-                               hback-porch = <2>;
-                               hsync-len = <41>;
-                               hfront-porch = <2>;
-                               vback-porch = <2>;
-                               vsync-len = <10>;
-                               vfront-porch = <2>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <1>;
-                       };
-
-                       ET0500 {
-                               clock-frequency = <33264000>;
-                               hactive = <800>;
-                               vactive = <480>;
-                               hback-porch = <88>;
-                               hsync-len = <128>;
-                               hfront-porch = <40>;
-                               vback-porch = <33>;
-                               vsync-len = <2>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ET0700 { /* same as ET0500 */
-                               clock-frequency = <33264000>;
-                               hactive = <800>;
-                               vactive = <480>;
-                               hback-porch = <88>;
-                               hsync-len = <128>;
-                               hfront-porch = <40>;
-                               vback-porch = <33>;
-                               vsync-len = <2>;
-                               vfront-porch = <10>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-
-                       ETQ570 {
-                               clock-frequency = <6596040>;
-                               hactive = <320>;
-                               vactive = <240>;
-                               hback-porch = <38>;
-                               hsync-len = <30>;
-                               hfront-porch = <30>;
-                               vback-porch = <16>;
-                               vsync-len = <3>;
-                               vfront-porch = <4>;
-                               hsync-active = <0>;
-                               vsync-active = <0>;
-                               de-active = <1>;
-                               pixelclk-active = <0>;
-                       };
-               };
-        };
+       };
 };
 
 &ds1339 {
        status = "disabled";
 };
 
-&ipu1_di0_disp0 {
-       remote-endpoint = <&display0_in>;
-};
-
 &usdhc4 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_usdhc4>;
index 54f4f01..d8e1bfb 100644 (file)
@@ -3,6 +3,8 @@
  *
  * Copyright (C) 2014 Heiko Schocher <hs@denx.de>
  *
+ * Copyright 2015 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
 #include <dt-bindings/gpio/gpio.h>
 
 / {
+       aliases {
+               mxcfb0 = &mxcfb1;
+               mxcfb1 = &mxcfb2;
+               mxcfb2 = &mxcfb3;
+               mxcfb3 = &mxcfb4;
+       };
+
        regulators {
                compatible = "simple-bus";
                #address-cells = <1>;
                        regulator-max-microvolt = <5000000>;
                };
        };
+
+       mxcfb1: fb@0 {
+               compatible = "fsl,mxc_sdc_fb";
+               disp_dev = "ldb";
+               interface_pix_fmt = "RGB666";
+               default_bpp = <16>;
+               int_clk = <0>;
+               late_init = <0>;
+               status = "disabled";
+       };
+
+       mxcfb2: fb@1 {
+               compatible = "fsl,mxc_sdc_fb";
+               disp_dev = "hdmi";
+               interface_pix_fmt = "RGB24";
+               mode_str ="1920x1080M@60";
+               default_bpp = <24>;
+               int_clk = <0>;
+               late_init = <0>;
+               status = "disabled";
+       };
+
+       mxcfb3: fb@2 {
+               compatible = "fsl,mxc_sdc_fb";
+               disp_dev = "lcd";
+               interface_pix_fmt = "RGB565";
+               mode_str ="CLAA-WVGA";
+               default_bpp = <16>;
+               int_clk = <0>;
+               late_init = <0>;
+               status = "disabled";
+       };
+
+       mxcfb4: fb@3 {
+               compatible = "fsl,mxc_sdc_fb";
+               disp_dev = "ldb";
+               interface_pix_fmt = "RGB666";
+               default_bpp = <16>;
+               int_clk = <0>;
+               late_init = <0>;
+               status = "disabled";
+       };
+
+       lcd: lcd@0 {
+               compatible = "fsl,lcd";
+               status = "disabled";
+       };
 };
 
 &audmux {
index ff41f83..03d7b41 100644 (file)
@@ -1,6 +1,8 @@
 /*
  * Copyright (C) 2014 Russell King
  *
+ * Copyright 2015 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
  * This file is dual-licensed: you can use it either under the terms
  * of the GPL or the X11 license, at your option. Note that this dual
  * licensing only applies to this file, and not this project as a
        };
 };
 
-&hdmi {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_cubox_i_hdmi>;
-       ddc-i2c-bus = <&i2c2>;
-       status = "okay";
-};
-
 &i2c2 {
        clock-frequency = <100000>;
        pinctrl-names = "default";
index afec2c7..02cab60 100644 (file)
@@ -1,6 +1,8 @@
 /*
  * Copyright 2013 Gateworks Corporation
  *
+ * Copyright 2015 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
  * The code contained herein is licensed under the GNU General Public
  * License. You may obtain a copy of the GNU General Public License
  * Version 2 or later at the following locations:
@@ -19,6 +21,7 @@
                nand = &gpmi;
                usb0 = &usbh1;
                usb1 = &usbotg;
+               mxcfb0 = &mxcfb1;
        };
 
        chosen {
                        enable-active-high;
                };
        };
+
+       mxcfb1: fb@0 {
+               compatible = "fsl,mxc_sdc_fb";
+               disp_dev = "hdmi";
+               interface_pix_fmt = "RGB24";
+               mode_str ="1920x1080M@60";
+               default_bpp = <24>;
+               int_clk = <0>;
+               late_init = <0>;
+               status = "okay";
+       };
 };
 
 &fec {
        status = "okay";
 };
 
-&hdmi {
-       ddc-i2c-bus = <&i2c3>;
+&hdmi_core {
+       ipu_id = <0>;
+       disp_id = <0>;
+       status = "okay";
+};
+
+&hdmi_video {
+       fsl,phy_reg_vlev = <0x0294>;
+       fsl,phy_reg_cksymtx = <0x800d>;
        status = "okay";
 };
 
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_i2c3>;
        status = "okay";
+
+       hdmi_edid: edid@50 {
+               compatible = "fsl,imx6-hdmi-i2c";
+               reg = <0x50>;
+       };
 };
 
 &pcie {
index a7100f9..45ef098 100644 (file)
@@ -1,6 +1,8 @@
 /*
  * Copyright 2013 Gateworks Corporation
  *
+ * Copyright 2015 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
  * The code contained herein is licensed under the GNU General Public
  * License. You may obtain a copy of the GNU General Public License
  * Version 2 or later at the following locations:
@@ -21,6 +23,7 @@
                ssi0 = &ssi1;
                usb0 = &usbh1;
                usb1 = &usbotg;
+               mxcfb0 = &mxcfb1;
        };
 
        chosen {
                };
        };
 
+       mxcfb1: fb@0 {
+               compatible = "fsl,mxc_sdc_fb";
+               disp_dev = "hdmi";
+               interface_pix_fmt = "RGB24";
+               mode_str ="1920x1080M@60";
+               default_bpp = <24>;
+               int_clk = <0>;
+               late_init = <0>;
+               status = "okay";
+       };
+
        sound {
                compatible = "fsl,imx6q-ventana-sgtl5000",
                             "fsl,imx-audio-sgtl5000";
        status = "okay";
 };
 
-&hdmi {
-       ddc-i2c-bus = <&i2c3>;
+&hdmi_core {
+       ipu_id = <0>;
+       disp_id = <0>;
+       status = "okay";
+};
+
+&hdmi_video {
+       fsl,phy_reg_vlev = <0x0294>;
+       fsl,phy_reg_cksymtx = <0x800d>;
        status = "okay";
 };
 
                VDDIO-supply = <&reg_3p3v>;
        };
 
+       hdmi_edid: edid@50 {
+               compatible = "fsl,imx6-hdmi-i2c";
+               reg = <0x50>;
+       };
+
        touchscreen: egalax_ts@04 {
                compatible = "eeti,egalax_ts";
                reg = <0x04>;
index 8953eba..452ba93 100644 (file)
@@ -1,6 +1,8 @@
 /*
  * Copyright 2013 Gateworks Corporation
  *
+ * Copyright 2015 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
  * The code contained herein is licensed under the GNU General Public
  * License. You may obtain a copy of the GNU General Public License
  * Version 2 or later at the following locations:
@@ -22,6 +24,7 @@
                ssi0 = &ssi1;
                usb0 = &usbh1;
                usb1 = &usbotg;
+               mxcfb0 = &mxcfb1;
        };
 
        chosen {
                mux-int-port = <1>;
                mux-ext-port = <4>;
        };
+
+       mxcfb1: fb@0 {
+               compatible = "fsl,mxc_sdc_fb";
+               disp_dev = "hdmi";
+               interface_pix_fmt = "RGB24";
+               mode_str ="1920x1080M@60";
+               default_bpp = <24>;
+               int_clk = <0>;
+               late_init = <0>;
+               status = "okay";
+       };
 };
 
 &audmux {
        status = "okay";
 };
 
-&hdmi {
-       ddc-i2c-bus = <&i2c3>;
+&hdmi_core {
+       ipu_id = <0>;
+       disp_id = <0>;
+       status = "okay";
+};
+
+&hdmi_video {
+       fsl,phy_reg_vlev = <0x0294>;
+       fsl,phy_reg_cksymtx = <0x800d>;
        status = "okay";
 };
 
                VDDIO-supply = <&reg_3p3v>;
        };
 
+       hdmi_edid: edid@50 {
+               compatible = "fsl,imx6-hdmi-i2c";
+               reg = <0x50>;
+       };
+
        touchscreen: egalax_ts@04 {
                compatible = "eeti,egalax_ts";
                reg = <0x04>;
index 6ac41c7..4c6c1b9 100644 (file)
@@ -1,6 +1,8 @@
 /*
  * Copyright 2013 Gateworks Corporation
  *
+ * Copyright 2015 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
  * The code contained herein is licensed under the GNU General Public
  * License. You may obtain a copy of the GNU General Public License
  * Version 2 or later at the following locations:
@@ -22,6 +24,7 @@
                ssi0 = &ssi1;
                usb0 = &usbh1;
                usb1 = &usbotg;
+               mxcfb0 = &mxcfb1;
        };
 
        chosen {
                mux-int-port = <1>;
                mux-ext-port = <4>;
        };
+
+       mxcfb1: fb@0 {
+               compatible = "fsl,mxc_sdc_fb";
+               disp_dev = "hdmi";
+               interface_pix_fmt = "RGB24";
+               mode_str ="1920x1080M@60";
+               default_bpp = <24>;
+               int_clk = <0>;
+               late_init = <0>;
+               status = "okay";
+       };
 };
 
 &audmux {
        status = "okay";
 };
 
-&hdmi {
-       ddc-i2c-bus = <&i2c3>;
+&hdmi_core {
+       ipu_id = <0>;
+       disp_id = <0>;
+       status = "okay";
+};
+
+&hdmi_video {
+       fsl,phy_reg_vlev = <0x0294>;
+       fsl,phy_reg_cksymtx = <0x800d>;
        status = "okay";
 };
 
                VDDIO-supply = <&reg_3p3v>;
        };
 
+       hdmi_edid: edid@50 {
+               compatible = "fsl,imx6-hdmi-i2c";
+               reg = <0x50>;
+       };
+
        touchscreen: egalax_ts@04 {
                compatible = "eeti,egalax_ts";
                reg = <0x04>;
index 805e236..ff0da13 100644 (file)
@@ -1,6 +1,8 @@
 /*
  * Copyright 2014 Gateworks Corporation
  *
+ * Copyright 2015 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
  * The code contained herein is licensed under the GNU General Public
  * License. You may obtain a copy of the GNU General Public License
  * Version 2 or later at the following locations:
@@ -20,6 +22,7 @@
                nand = &gpmi;
                usb0 = &usbh1;
                usb1 = &usbotg;
+               mxcfb0 = &mxcfb1;
        };
 
        chosen {
                        regulator-always-on;
                };
        };
+
+       mxcfb1: fb@0 {
+               compatible = "fsl,mxc_sdc_fb";
+               disp_dev = "hdmi";
+               interface_pix_fmt = "RGB24";
+               mode_str ="1920x1080M@60";
+               default_bpp = <24>;
+               int_clk = <0>;
+               late_init = <0>;
+               status = "okay";
+       };
 };
 
 &gpmi {
        status = "okay";
 };
 
-&hdmi {
-       ddc-i2c-bus = <&i2c3>;
+&hdmi_core {
+       ipu_id = <0>;
+       disp_id = <0>;
+       status = "okay";
+};
+
+&hdmi_video {
+       fsl,phy_reg_vlev = <0x0294>;
+       fsl,phy_reg_cksymtx = <0x800d>;
        status = "okay";
 };
 
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_i2c3>;
        status = "okay";
+
+       hdmi_edid: edid@50 {
+               compatible = "fsl,imx6-hdmi-i2c";
+               reg = <0x50>;
+       };
 };
 
 &pcie {
index d6c2358..d3b0b20 100644 (file)
@@ -1,6 +1,8 @@
 /*
  * Copyright (C) 2013,2014 Russell King
  *
+ * Copyright 2015 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
  * This file is dual-licensed: you can use it either under the terms
  * of the GPL or the X11 license, at your option. Note that this dual
  * licensing only applies to this file, and not this project as a
 #include "imx6qdl-microsom-ar8035.dtsi"
 
 / {
+       aliases {
+               mxcfb0 = &mxcfb1;
+       };
+
        chosen {
                stdout-path = &uart1;
        };
                spdif-controller = <&spdif>;
                spdif-out;
        };
+
+       mxcfb1: fb@0 {
+               compatible = "fsl,mxc_sdc_fb";
+               disp_dev = "hdmi";
+               interface_pix_fmt = "RGB24";
+               mode_str ="1920x1080M@60";
+               default_bpp = <24>;
+               int_clk = <0>;
+               late_init = <0>;
+               status = "okay";
+       };
 };
 
 &audmux {
        status = "okay";
 };
 
-&hdmi {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_hummingboard_hdmi>;
-       ddc-i2c-bus = <&i2c2>;
+&hdmi_core {
+       ipu_id = <0>;
+       disp_id = <0>;
+       status = "okay";
+};
+
+&hdmi_video {
+       fsl,phy_reg_vlev = <0x0294>;
+       fsl,phy_reg_cksymtx = <0x800d>;
        status = "okay";
 };
 
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_hummingboard_i2c2>;
        status = "okay";
+
+       hdmi_edid: edid@50 {
+               compatible = "fsl,imx6-hdmi-i2c";
+               reg = <0x50>;
+       };
 };
 
 &iomuxc {
index db868bc..e002dc7 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Copyright 2013 Boundary Devices, Inc.
- * Copyright 2011 Freescale Semiconductor, Inc.
+ * Copyright 2011-2015 Freescale Semiconductor, Inc.
  * Copyright 2011 Linaro Ltd.
  *
  * This file is dual-licensed: you can use it either under the terms
 #include <dt-bindings/input/input.h>
 
 / {
+       aliases {
+               mxcfb0 = &mxcfb1;
+       };
+
        chosen {
                stdout-path = &uart2;
        };
                        };
                };
        };
+
+       mxcfb1: fb@0 {
+               compatible = "fsl,mxc_sdc_fb";
+               disp_dev = "hdmi";
+               interface_pix_fmt = "RGB24";
+               mode_str ="1920x1080M@60";
+               default_bpp = <24>;
+               int_clk = <0>;
+               late_init = <0>;
+               status = "okay";
+       };
 };
 
 &audmux {
        status = "okay";
 };
 
-&hdmi {
-       ddc-i2c-bus = <&i2c2>;
+&hdmi_core {
+       ipu_id = <0>;
+       disp_id = <0>;
+       status = "okay";
+};
+
+&hdmi_video {
+       fsl,phy_reg_vlev = <0x0294>;
+       fsl,phy_reg_cksymtx = <0x800d>;
        status = "okay";
 };
 
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_i2c2>;
        status = "okay";
+
+       hdmi_edid: edid@50 {
+               compatible = "fsl,imx6-hdmi-i2c";
+               reg = <0x50>;
+       };
 };
 
 &i2c3 {
index 585b4f6..044d46e 100644 (file)
@@ -1,6 +1,8 @@
 /*
  * Copyright 2013 Christian Hemp, Phytec Messtechnik GmbH
  *
+ * Copyright 2015 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
  * The code contained herein is licensed under the GNU General Public
  * License. You may obtain a copy of the GNU General Public License
  * Version 2 or later at the following locations:
 #include <dt-bindings/sound/fsl-imx-audmux.h>
 
 / {
+       aliases {
+               mxcfb0 = &mxcfb1;
+       };
+
        chosen {
                linux,stdout-path = &uart4;
        };
                };
        };
 
+       mxcfb1: fb@0 {
+               compatible = "fsl,mxc_sdc_fb";
+               disp_dev = "hdmi";
+               interface_pix_fmt = "RGB24";
+               mode_str ="1920x1080M@60";
+               default_bpp = <24>;
+               int_clk = <0>;
+               late_init = <0>;
+               status = "okay";
+       };
+
 };
 
 &audmux {
        status = "okay";
 };
 
-&hdmi {
+&hdmi_core {
+       ipu_id = <0>;
+       disp_id = <0>;
+       status = "okay";
+};
+
+&hdmi_video {
+       fsl,phy_reg_vlev = <0x0294>;
+       fsl,phy_reg_cksymtx = <0x800d>;
        status = "okay";
 };
 
index 17704a5..08596ca 100644 (file)
@@ -1,6 +1,8 @@
 /*
  * Copyright 2014 FEDEVEL, Inc.
  *
+ * Copyright 2015 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
  * Author: Robert Nelson <robertcnelson@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
 #include <dt-bindings/input/input.h>
 
 / {
+       aliases {
+               mxcfb0 = &mxcfb1;
+       };
+
        chosen {
                stdout-path = &uart1;
        };
                mux-int-port = <1>;
                mux-ext-port = <3>;
        };
+
+       mxcfb1: fb@0 {
+               compatible = "fsl,mxc_sdc_fb";
+               disp_dev = "hdmi";
+               interface_pix_fmt = "RGB24";
+               mode_str ="1920x1080M@60";
+               default_bpp = <24>;
+               int_clk = <0>;
+               late_init = <0>;
+               status = "okay";
+       };
 };
 
 &audmux {
        status = "okay";
 };
 
-&hdmi {
-       ddc-i2c-bus = <&i2c2>;
+&hdmi_core {
+       ipu_id = <0>;
+       disp_id = <0>;
+       status = "okay";
+};
+
+&hdmi_video {
+       fsl,phy_reg_vlev = <0x0294>;
+       fsl,phy_reg_cksymtx = <0x800d>;
        status = "okay";
 };
 
        pinctrl-0 = <&pinctrl_i2c2>;
        status = "okay";
 
+       hdmi_edid: edid@50 {
+               compatible = "fsl,imx6-hdmi-i2c";
+               reg = <0x50>;
+       };
+
        eeprom@57 {
                compatible = "at,24c02";
                reg = <0x57>;
index 0101462..bee1fff 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 Freescale Semiconductor, Inc.
+ * Copyright 2011-2015 Freescale Semiconductor, Inc.
  * Copyright 2011 Linaro Ltd.
  *
  * This file is dual-licensed: you can use it either under the terms
        status = "okay";
 };
 
-&hdmi {
-       ddc-i2c-bus = <&i2c2>;
-       status = "okay";
-};
-
 &i2c1 {
        clock-frequency = <100000>;
        pinctrl-names = "default";
index c96c91d..6b4984f 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Freescale Semiconductor, Inc.
+ * Copyright 2013-2015 Freescale Semiconductor, Inc.
  *
  * Author: Fabio Estevam <fabio.estevam@freescale.com>
  *
@@ -15,6 +15,7 @@
                panelchan = &panelchan;
                panel7 = &panel7;
                touchscreenp7 = &touchscreenp7;
+               mxcfb0 = &mxcfb1;
        };
 
        chosen {
                mux-int-port = <1>;
                mux-ext-port = <6>;
        };
+
+       mxcfb1: fb@0 {
+               compatible = "fsl,mxc_sdc_fb";
+               disp_dev = "hdmi";
+               interface_pix_fmt = "RGB24";
+               mode_str ="1920x1080M@60";
+               default_bpp = <24>;
+               int_clk = <0>;
+               late_init = <0>;
+               status = "okay";
+       };
 };
 
 &fec {
        status = "okay";
 };
 
-&hdmi {
-       ddc-i2c-bus = <&i2c2>;
+&hdmi_core {
+       ipu_id = <0>;
+       disp_id = <0>;
+       status = "okay";
+};
+
+&hdmi_video {
+       fsl,phy_reg_vlev = <0x0294>;
+       fsl,phy_reg_cksymtx = <0x800d>;
        status = "okay";
 };
 
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_i2c2>;
        status = "okay";
+
+       hdmi_edid: edid@50 {
+               compatible = "fsl,imx6-hdmi-i2c";
+               reg = <0x50>;
+       };
 };
 
 &i2c3 {
index 2b9c2be..0fb20cd 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Freescale Semiconductor, Inc.
+ * Copyright 2013-2015 Freescale Semiconductor, Inc.
  *
  * Author: Fabio Estevam <fabio.estevam@freescale.com>
  *
        status = "okay";
 };
 
-&hdmi {
-       ddc-i2c-bus = <&i2c1>;
-       status = "okay";
-};
-
 &i2c1 {
        clock-frequency = <100000>;
        pinctrl-names = "default";