erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rk3288: reset edp after edp clock source select

Browse source 
edp must reset when device power up, otherwise the edp
register maybe uncertain, now the edp source clock default
select 27M, and in pinky and jerry board we use 24M as edp
sourec clock, if we want to reset edp, we must after the clock
source select 24M.

BUG=chrome-os-partner:34023
TEST=Booted Veyron jerry and read edid normal
BRANCH=None

Change-Id: Ica031d2d52deb539c1a0a56968786d6952b3d0e8
Signed-off-by: huang lin <hl@rock-chips.com>
Reviewed-on: https://chromium-review.googlesource.com/231336
Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
This commit is contained in:
huang lin 2014-11-25 09:27:13 +08:00 • committed by chrome-internal-fetch
commit 2292da77cc
2 changed files with 3 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/soc/rockchip/rk3288/clock.c
View file

@ -568,13 +568,13 @@ static int pll_para_config(u32 freq_hz, struct pll_div *div)
void rkclk_configure_edp(void)
{
/* clk_edp_24M source: 24M */
writel(RK_SETBITS(1 << 15), &cru_ptr->cru_clksel_con[28]);
/* rst edp */
writel(RK_SETBITS(1 << 15), &cru_ptr->cru_softrst_con[6]);
udelay(1);
writel(RK_CLRBITS(1 << 15), &cru_ptr->cru_softrst_con[6]);
/* clk_edp_24M source: 24M */
writel(RK_SETBITS(1 << 15), &cru_ptr->cru_clksel_con[28]);
}
void rkclk_configure_vop_aclk(u32 vop_id, u32 aclk_hz)
@ -600,7 +600,6 @@ void rkclk_configure_vop_aclk(u32 vop_id, u32 aclk_hz)
}
}
int rkclk_configure_vop_dclk(u32 vop_id, u32 dclk_hz)
{
struct pll_div npll_config = {0};

25
src/soc/rockchip/rk3288/edp.c
View file

@ -51,30 +51,6 @@ static const char *pre_emph_names[] = {
#define DP_VOLTAGE_MAX DP_TRAIN_VOLTAGE_SWING_1200
#define DP_PRE_EMPHASIS_MAX DP_TRAIN_PRE_EMPHASIS_9_5
static void rk_edp_reset(struct rk_edp *edp)
{
u32 reg;
/* Stop Video */
clrbits_le32(&edp->regs->video_ctl_1, VIDEO_EN);
setbits_le32(&edp->regs->video_ctl_1, VIDEO_MUTE);
reg = VID_CAP_FUNC_EN_N | AUD_FIFO_FUNC_EN_N |
AUD_FUNC_EN_N | HDCP_FUNC_EN_N | SW_FUNC_EN_N;
writel(reg, &edp->regs->func_en_1);
reg = SSC_FUNC_EN_N | AUX_FUNC_EN_N |
SERDES_FIFO_FUNC_EN_N |
LS_CLK_DOMAIN_FUNC_EN_N;
writel(reg, &edp->regs->func_en_2);
udelay(20);
reg = LANE3_MAP_LOGIC_LANE_3 | LANE2_MAP_LOGIC_LANE_2 |
LANE1_MAP_LOGIC_LANE_1 | LANE0_MAP_LOGIC_LANE_0;
writel(reg, &edp->regs->lane_map);
}
static void rk_edp_init_refclk(struct rk_edp *edp)
{
writel(SEL_24M, &edp->regs->analog_ctl_2);
@ -1005,7 +981,6 @@ void rk_edp_init(u32 vop_id)
val = (vop_id == 1) ? RK_SETBITS(1 << 5) : RK_CLRBITS(1 << 5);
writel(val, &rk3288_grf->soc_con6);
rk_edp_reset(&rk_edp);
rk_edp_init_refclk(&rk_edp);
rk_edp_init_interrupt(&rk_edp);
rk_edp_enable_sw_function(&rk_edp);