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

MIPI: fix merge error with develop-3.10

Browse Source
This commit is contained in:
xjh
2014-07-28 15:54:37 +08:00
parent d54505daaf
commit a9a4971ca9
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/video/rockchip/transmitter/rk32_mipi_dsi.c
View File

@@ -1689,7 +1689,7 @@ static int rk32_dsi_enable(void)
rk_fb_get_prmry_screen(dsi0->screen.screen);
dsi0->screen.lcdc_id = dsi0->screen.screen->lcdc_id;
rk_init_phy_mode(dsi0->screen.lcdc_id);
rk32_init_phy_mode(dsi0->screen.lcdc_id);
dsi_init(0, 0);
if (rk_mipi_get_dsi_num() ==2)
@@ -1741,6 +1741,10 @@ static void rk32_init_phy_mode(int lcdc_id)
int val0 = 0, val1 = 0;
MIPI_DBG("rk32_init_phy_mode----------lcdc_id=%d\n",lcdc_id);
if(cpu_is_rk312x())
return;
//D-PHY mode select
if( rk_mipi_get_dsi_num() ==1 ){
@@ -1767,12 +1771,6 @@ static void rk32_init_phy_mode(int lcdc_id)
}
}
static void rk_init_phy_mode(int lcdc_id)
{
if(cpu_is_rk3288())
rk32_init_phy_mode(lcdc_id);
}
#ifdef CONFIG_RK_3288_DSI_UBOOT
#ifdef CONFIG_OF_LIBFDT
int rk_dsi_host_parse_dt(const void *blob, struct dsi *dsi)

1
drivers/video/rockchip/transmitter/rk32_mipi_dsi.h
View File

@@ -300,7 +300,6 @@ int rk_mipi_get_dsi_lane(void);
static int rk32_mipi_power_down_DDR(void);
static int rk32_mipi_power_up_DDR(void);
static void rk32_init_phy_mode(int lcdc_id);
static void rk_init_phy_mode(int lcdc_id);
#endif /* end of RK32_MIPI_DSI_H */