ENGR00274226-02 MX6 HDMI: Add prefix "fsl" to mxc specific dts properties.

- Add prefix "fsl" to mxc specific dts properties.
- imx_hdmi_type will been referenced by app move it to mxc_hdmi.h.

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

diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
index 387b9a5f123a82b63390640b51ae12f685b6e05c..dad02bd1aff3d70e8ee25e8916396a5c0db89b31 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@ -421,8 +421,8 @@
 &hdmi_video {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_hdmi_hdcp_1>;
-       phy_reg_vlev = <0x0294>;
-       phy_reg_cksymtx = <0x800d>;
+       fsl,phy_reg_vlev = <0x0294>;
+       fsl,phy_reg_cksymtx = <0x800d>;
        status = "okay";
 };
 

diff --git a/drivers/video/mxc/mxc_hdmi.c b/drivers/video/mxc/mxc_hdmi.c
index 6c0d422d669a9f6a963f285d6a586ab3290adf43..78404642b7196c7f1f5cfc62b1b190857522f2a3 100644 (file)
--- a/drivers/video/mxc/mxc_hdmi.c
+++ b/drivers/video/mxc/mxc_hdmi.c
@@ -202,11 +202,6 @@ struct mxc_hdmi {
        struct pinctrl_state *pins_cec;
 };
 
-enum imx_hdmim_type {
-       IMX6DL_HDMI,
-       IMX6Q_HDMI,
-};
-
 static int hdmi_major;
 static struct class *hdmi_class;
 
@@ -2484,11 +2479,11 @@ static void hdmi_get_of_property(struct mxc_hdmi *hdmi)
         * Default value will been setting in HDMI PHY config function
         * if it is not define in device tree.
         */
-       ret = of_property_read_u32(np, "phy_reg_vlev", &phy_reg_vlev);
+       ret = of_property_read_u32(np, "fsl,phy_reg_vlev", &phy_reg_vlev);
        if (ret)
                dev_dbg(&pdev->dev, "No board specific HDMI PHY vlev\n");
 
-       ret = of_property_read_u32(np, "phy_reg_cksymtx", &phy_reg_cksymtx);
+       ret = of_property_read_u32(np, "fsl,phy_reg_cksymtx", &phy_reg_cksymtx);
        if (ret)
                dev_dbg(&pdev->dev, "No board specific HDMI PHY cksymtx\n");
 

diff --git a/include/video/mxc_hdmi.h b/include/video/mxc_hdmi.h
index 94f76380caf6a0f34d25cf431ad721b1d849b58e..a47c8fb476c35517b3e044ac443b0634fadce962 100644 (file)
--- a/include/video/mxc_hdmi.h
+++ b/include/video/mxc_hdmi.h
@@ -1085,6 +1085,11 @@ enum {
 
 };
 
+enum imx_hdmi_type {
+       IMX6DL_HDMI,
+       IMX6Q_HDMI,
+};
+
 /* IOCTL commands */
 #define HDMI_IOC_MAGIC  'H'