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

drm/rockchip: lvds: check PLL lock state before enable tx

Browse Source 
Change-Id: I299d93f89ec52d3778bc2b18cb9105f9910dd5fc
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
This commit is contained in:
Wyon Bi
2018-10-11 11:44:06 +08:00
parent f125bf6b07
commit b9c21ec37c
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/gpu/drm/rockchip/rockchip_lvds.c
View File

@@ -21,6 +21,7 @@
#include <linux/component.h>
#include <linux/clk.h>
#include <linux/iopoll.h>
#include <linux/mfd/syscon.h>
#include <linux/of_device.h>
#include <linux/of_graph.h>
@@ -144,6 +145,9 @@ static inline int lvds_name_to_output(const char *s)
static int innov2_lvds_power_on(struct rockchip_lvds *lvds)
{
u32 status;
int ret;
if (lvds->output == DISPLAY_OUTPUT_RGB) {
lvds_writel(lvds, RK3288_LVDS_CH0_REG0,
RK3288_LVDS_CH0_REG0_TTL_EN |
@@ -213,6 +217,13 @@ static int innov2_lvds_power_on(struct rockchip_lvds *lvds)
writel(RK3288_LVDS_CFG_REGC_PLL_ENABLE,
lvds->regs + RK3288_LVDS_CFG_REGC);
ret = readl_poll_timeout(lvds->regs + RK3288_LVDS_CH0_REGF, status,
status & RK3288_LVDS_CH0_PLL_LOCK, 500, 10000);
if (ret) {
dev_err(lvds->dev, "PLL is not lock\n");
return ret;
}
writel(RK3288_LVDS_CFG_REG21_TX_ENABLE,
lvds->regs + RK3288_LVDS_CFG_REG21);

3
drivers/gpu/drm/rockchip/rockchip_lvds.h
View File

@@ -71,6 +71,9 @@
#define RK3288_LVDS_CH0_REGD 0x34
#define RK3288_LVDS_CH0_REGD_PLL_PREDIV_MASK 0x1f
#define RK3288_LVDS_CH0_REGF 0x3c
#define RK3288_LVDS_CH0_PLL_LOCK BIT(1)
#define RK3288_LVDS_CH0_REG20 0x80
#define RK3288_LVDS_CH0_REG20_MSB 0x45
#define RK3288_LVDS_CH0_REG20_LSB 0x44