shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

rk31xx lvds: add lvds grf config

Browse Source 
Signed-off-by: hjc <hjc@rock-chips.com>
This commit is contained in:
hjc
2014-12-13 17:20:43 +08:00
committed by Huang, Tao
parent 06f6340537
commit 84f0f91f51
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm64/boot/dts/rk3368.dtsi
View File

@@ -631,6 +631,7 @@
lvds: lvds@ff968000 {
compatible = "rockchip,rk3368-lvds";
rockchip,grf = <&grf>;
reg = <0x0 0xff968000 0x0 0x4000>, <0x0 0xff9600b0 0x0 0x01>;
reg-names = "mipi_lvds_phy", "mipi_lvds_ctl";
clocks = <&clk_gates22 10>, <&clk_gates17 3>;

15
drivers/video/rockchip/transmitter/rk31xx_lvds.c Executable file → Normal file
View File

@@ -32,7 +32,7 @@
#define grf_writel(v,offset) \
do { \
writel_relaxed(v, RK_GRF_VIRT + offset); \
dsb(); \
dsb(sy); \
} while (0)
@@ -186,7 +186,9 @@ static void rk31xx_output_lvds(struct rk_lvds_device *lvds,
val |= v_RK3368_MIPIPHY_LANE0_EN(1) |
v_RK3368_MIPIDPI_FORCEX_EN(1);
/*rk3368 RK3368_GRF_SOC_CON7 = 0X0041C*/
grf_writel(val, 0x0041C);
/*grf_writel(val, 0x0041C);*/
regmap_write(lvds->grf_lvds_base, GRF_SOC_CON7_LVDS, val);
dsb(sy);
} else {
/* enable lvds mode */
val |= v_LVDSMODE_EN(1) | v_MIPIPHY_TTL_EN(0);
@@ -413,7 +415,14 @@ 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);
}
if (lvds->data->soc_type == LVDS_SOC_RK3368) {
lvds->grf_lvds_base =
syscon_regmap_lookup_by_phandle(np, "rockchip,grf");
if (IS_ERR(lvds->grf_lvds_base)) {
dev_err(&pdev->dev, "can't find rockchip,grf property\n");
return PTR_ERR(lvds->grf_lvds_base);
}
}
ret = rk31xx_lvds_clk_init(lvds);
if(ret < 0)
goto err_clk_init;

5
drivers/video/rockchip/transmitter/rk31xx_lvds.h
View File

@@ -2,7 +2,8 @@
#define _RK31XX_LVDS_H_
#include <linux/rk_screen.h>
#include <linux/mfd/syscon.h>
#include <linux/regmap.h>
#define BITS(x, bit) ((x) << (bit))
#define BITS_MASK(x, mask, bit) BITS((x) & (mask), bit)
@@ -105,6 +106,7 @@ enum {
#define v_LANE1_EN(x) BITS_MASK(x, 1, 6)
#define v_LANE0_EN(x) BITS_MASK(x, 1, 7)
#define GRF_SOC_CON7_LVDS 0x041c
enum {
LVDS_SOC_RK312X,
LVDS_SOC_RK3368
@@ -120,6 +122,7 @@ struct rk_lvds_device {
struct device *dev;
void __iomem *regbase;
void __iomem *ctrl_reg;
struct regmap *grf_lvds_base;
struct clk *pclk; /*phb clk*/
struct clk *ctrl_pclk; /* mipi ctrl pclk*/
struct clk *ctrl_hclk; /* mipi ctrl hclk*/