projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rk31xx lvds: compatible with rk31xx and rk3368
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
video
/
rockchip
/
transmitter
/
rk31xx_lvds.c
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); \
#define grf_writel(v,offset) \
do { \
writel_relaxed(v, RK_GRF_VIRT + offset); \
- dsb(sy); \
+ dsb(sy); \
} while (0)
} 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);
}
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");
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);
}
}
return PTR_ERR(lvds->grf_lvds_base);
}
}
+#endif
ret = rk31xx_lvds_clk_init(lvds);
if(ret < 0)
goto err_clk_init;
ret = rk31xx_lvds_clk_init(lvds);
if(ret < 0)
goto err_clk_init;