From d77c4a65e810dba31014fcb57e8a3f83bfbf0cee Mon Sep 17 00:00:00 2001 From: Jingoo Han Date: Fri, 25 May 2012 16:21:08 +0900 Subject: [PATCH] --- yaml --- r: 310379 b: refs/heads/master c: 24db03a834089a3600780ea1c7abe08e483e5d29 h: refs/heads/master i: 310377: 35a0395ae8b6eb491660809c5c7b683661cff421 310375: 66141969f60bc072a9bd00995f158fb3529807e0 v: v3 --- [refs] | 2 +- trunk/drivers/video/exynos/exynos_dp_core.c | 2 ++ trunk/drivers/video/exynos/exynos_dp_core.h | 1 + trunk/drivers/video/exynos/exynos_dp_reg.c | 7 +++++-- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a83ed3d785d0..b7da7660176c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4d10ecf86b31b732092dc9668a6088323c24ab09 +refs/heads/master: 24db03a834089a3600780ea1c7abe08e483e5d29 diff --git a/trunk/drivers/video/exynos/exynos_dp_core.c b/trunk/drivers/video/exynos/exynos_dp_core.c index aabd214990d3..b446f7e42f2a 100644 --- a/trunk/drivers/video/exynos/exynos_dp_core.c +++ b/trunk/drivers/video/exynos/exynos_dp_core.c @@ -27,6 +27,8 @@ static int exynos_dp_init_dp(struct exynos_dp_device *dp) { exynos_dp_reset(dp); + exynos_dp_swreset(dp); + /* SW defined function Normal operation */ exynos_dp_enable_sw_function(dp); diff --git a/trunk/drivers/video/exynos/exynos_dp_core.h b/trunk/drivers/video/exynos/exynos_dp_core.h index 8f596b9e7b2b..1e0f998e0c9f 100644 --- a/trunk/drivers/video/exynos/exynos_dp_core.h +++ b/trunk/drivers/video/exynos/exynos_dp_core.h @@ -41,6 +41,7 @@ void exynos_dp_lane_swap(struct exynos_dp_device *dp, bool enable); void exynos_dp_init_analog_param(struct exynos_dp_device *dp); void exynos_dp_init_interrupt(struct exynos_dp_device *dp); void exynos_dp_reset(struct exynos_dp_device *dp); +void exynos_dp_swreset(struct exynos_dp_device *dp); void exynos_dp_config_interrupt(struct exynos_dp_device *dp); u32 exynos_dp_get_pll_lock_status(struct exynos_dp_device *dp); void exynos_dp_set_pll_power_down(struct exynos_dp_device *dp, bool enable); diff --git a/trunk/drivers/video/exynos/exynos_dp_reg.c b/trunk/drivers/video/exynos/exynos_dp_reg.c index 99bafb82537e..6ce76d56c3a1 100644 --- a/trunk/drivers/video/exynos/exynos_dp_reg.c +++ b/trunk/drivers/video/exynos/exynos_dp_reg.c @@ -109,8 +109,6 @@ void exynos_dp_reset(struct exynos_dp_device *dp) { u32 reg; - writel(RESET_DP_TX, dp->reg_base + EXYNOS_DP_TX_SW_RESET); - exynos_dp_stop_video(dp); exynos_dp_enable_video_mute(dp, 0); @@ -155,6 +153,11 @@ void exynos_dp_reset(struct exynos_dp_device *dp) exynos_dp_init_interrupt(dp); } +void exynos_dp_swreset(struct exynos_dp_device *dp) +{ + writel(RESET_DP_TX, dp->reg_base + EXYNOS_DP_TX_SW_RESET); +} + void exynos_dp_config_interrupt(struct exynos_dp_device *dp) { u32 reg;