rk31xx lvds: compatible with rk31xx and rk3368

Signed-off-by: hjc <hjc@rock-chips.com>

diff --git a/drivers/video/rockchip/transmitter/rk31xx_lvds.c b/drivers/video/rockchip/transmitter/rk31xx_lvds.c
index 8769334a1a6bb24fe588342ea8e89431fe037a81..4b2d563ae1b57d4bb1813b8e0442eec911d6ab10 100755 (executable)
--- a/drivers/video/rockchip/transmitter/rk31xx_lvds.c
+++ b/drivers/video/rockchip/transmitter/rk31xx_lvds.c
@@ -32,7 +32,7 @@
 #define grf_writel(v,offset)                                    \
         do {                                                    \
                 writel_relaxed(v, RK_GRF_VIRT + offset);        \
-               dsb(sy);                                        \
+               dsb(sy);                                        \
         } while (0)
 
 
@@ -455,6 +455,7 @@ static int rk31xx_lvds_probe(struct platform_device *pdev)
                dev_err(&pdev->dev, "ioremap mipi-lvds ctl reg failed\n");
                return PTR_ERR(lvds->ctrl_reg);
        }
+#ifdef CONFIG_MFD_SYSCON
        if (lvds->data->soc_type == LVDS_SOC_RK3368) {
                lvds->grf_lvds_base =
                        syscon_regmap_lookup_by_phandle(np, "rockchip,grf");
@@ -463,6 +464,7 @@ static int rk31xx_lvds_probe(struct platform_device *pdev)
                        return PTR_ERR(lvds->grf_lvds_base);
                }
        }
+#endif
        ret = rk31xx_lvds_clk_init(lvds);
        if(ret < 0)
                goto err_clk_init;

diff --git a/drivers/video/rockchip/transmitter/rk31xx_lvds.h b/drivers/video/rockchip/transmitter/rk31xx_lvds.h
index dbc094ce3fa68e90968b4b648b53661ac10fe1eb..57e6dbee82725e6a8612d3ddfabcd7587e882003 100755 (executable)
--- a/drivers/video/rockchip/transmitter/rk31xx_lvds.h
+++ b/drivers/video/rockchip/transmitter/rk31xx_lvds.h
@@ -186,8 +186,10 @@ static inline int lvds_dsi_writel(struct rk_lvds_device *lvds,
 static inline u32 lvds_phy_lockon(struct rk_lvds_device *lvds)
 {
        u32 val = 0;
-
-       val = readl_relaxed(lvds->ctrl_reg + 0x10);
+       if (lvds->data->soc_type == LVDS_SOC_RK312X)
+               val = readl_relaxed(lvds->ctrl_reg);
+       else
+               val = readl_relaxed(lvds->ctrl_reg + 0x10);
        return (val & 0x01);
 }