ENGR00274226-03 HDMI DTS: Add prefix "fsl" to mxc specific dts properties.

Add prefix "fsl" to mxc specific dts properties.

Signed-off-by: Sandor Yu <R01008@freescale.com>

diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi
index 5aae91f72da8ac4754ec5c063cc5fac8419ec51e..2087d2add5a6b75ca0dd10ae716f12eb91f2dae2 100644 (file)
--- a/arch/arm/boot/dts/imx6dl.dtsi
+++ b/arch/arm/boot/dts/imx6dl.dtsi
@@ -58,27 +58,26 @@
 
                hdmi_core: hdmi_core@00120000 {
                        compatible = "fsl,imx6dl-hdmi-core";
-                       ipu_id = <0>;
-                       disp_id = <0>;
                        reg = <0x00120000 0x9000>;
-                       reg-names = "hdmi_regs";
                        clocks = <&clks 124>, <&clks 123>;
                        clock-names = "hdmi_isfr", "hdmi_iahb";
-                       status = "okay";
+                       status = "disabled";
                };
 
-               hdmi_video: hdmi_video@00120000 {
+               hdmi_video: hdmi_video@020e0000 {
                        compatible = "fsl,imx6dl-hdmi-video";
-                       reg = <0x020E0000 0x1000>;
+                       reg =  <0x020e0000 0x1000>;
                        reg-names = "hdmi_gpr";
                        interrupts = <0 115 0x04>;
                        clocks = <&clks 124>, <&clks 123>;
                        clock-names = "hdmi_isfr", "hdmi_iahb";
+                       status = "disabled";
                };
 
                hdmi_cec: hdmi_cec@00120000 {
                        compatible = "fsl,imx6dl-hdmi-cec";
                        interrupts = <0 116 0x04>;
+                       status = "disabled";
                };
 
                aips1: aips-bus@02000000 {

diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index 72b7547556b1a2742c125de542e281db3f1e318b..e9d6b08ed8717a2f70afeed57f116a6a9838f997 100644 (file)
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -91,27 +91,26 @@
 
                hdmi_core: hdmi_core@00120000 {
                        compatible = "fsl,imx6q-hdmi-core";
-                       ipu_id = <0>;
-                       disp_id = <0>;
                        reg = <0x00120000 0x9000>;
-                       reg-names = "hdmi_regs";
                        clocks = <&clks 124>, <&clks 123>;
                        clock-names = "hdmi_isfr", "hdmi_iahb";
-                       status = "okay";
+                       status = "disabled";
                };
 
-               hdmi_video: hdmi_video@00120000 {
+               hdmi_video: hdmi_video@020e0000 {
                        compatible = "fsl,imx6q-hdmi-video";
-                       reg = <0x020E0000 0x1000>;
+                       reg = <0x020e0000 0x1000>;
                        reg-names = "hdmi_gpr";
                        interrupts = <0 115 0x04>;
                        clocks = <&clks 124>, <&clks 123>;
                        clock-names = "hdmi_isfr", "hdmi_iahb";
+                       status = "disabled";
                };
 
                hdmi_cec: hdmi_cec@00120000 {
                        compatible = "fsl,imx6q-hdmi-cec";
                        interrupts = <0 116 0x04>;
+                       status = "disabled";
                };
 
                aips-bus@02000000 { /* AIPS1 */

diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
index dad02bd1aff3d70e8ee25e8916396a5c0db89b31..9a5a126e14e33c41fcffdaee50d205478f37454f 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@ -418,6 +418,12 @@
        status = "okay";
 };
 
+&hdmi_core {
+       ipu_id = <0>;
+       disp_id = <0>;
+       status = "okay";
+};
+
 &hdmi_video {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_hdmi_hdcp_1>;