From e68ab3f558db114e2551071f9141961e78d8cec4 Mon Sep 17 00:00:00 2001 From: Sandor Yu Date: Wed, 7 Aug 2013 19:18:11 +0800 Subject: [PATCH] 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 --- arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 4 ++-- drivers/video/mxc/mxc_hdmi.c | 9 ++------- include/video/mxc_hdmi.h | 5 +++++ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi index 387b9a5f123a..dad02bd1aff3 100644 --- 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 6c0d422d669a..78404642b719 100644 --- 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 94f76380caf6..a47c8fb476c3 100644 --- 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' -- 2.39.5