diff options
| author | Ajay Kumar <ajaykumar.rs@samsung.com> | 2012-11-09 00:05:06 -0500 |
|---|---|---|
| committer | Jingoo Han <jg1.han@samsung.com> | 2012-11-28 20:33:28 -0500 |
| commit | 3fcb6eb4063ab4eef05601c266afa2af667c8e1f (patch) | |
| tree | 4e8c19818fe44d6f30ab5b3a1fc6f58c806a09b9 | |
| parent | 2f85f97e460a4bcfad678151fcc13dbf0b8181b3 (diff) | |
video: exynos_dp: remove redundant parameters
This patch cleans up few redundant parameters keeping
the same functionality intact.
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
| -rw-r--r-- | drivers/video/exynos/exynos_dp_core.c | 12 | ||||
| -rw-r--r-- | drivers/video/exynos/exynos_dp_core.h | 9 | ||||
| -rw-r--r-- | drivers/video/exynos/exynos_dp_reg.c | 23 |
3 files changed, 15 insertions, 29 deletions
diff --git a/drivers/video/exynos/exynos_dp_core.c b/drivers/video/exynos/exynos_dp_core.c index 5f9ac5c8a5d8..28fd686c6b81 100644 --- a/drivers/video/exynos/exynos_dp_core.c +++ b/drivers/video/exynos/exynos_dp_core.c | |||
| @@ -730,19 +730,15 @@ static int exynos_dp_set_link_train(struct exynos_dp_device *dp, | |||
| 730 | return retval; | 730 | return retval; |
| 731 | } | 731 | } |
| 732 | 732 | ||
| 733 | static int exynos_dp_config_video(struct exynos_dp_device *dp, | 733 | static int exynos_dp_config_video(struct exynos_dp_device *dp) |
| 734 | struct video_info *video_info) | ||
| 735 | { | 734 | { |
| 736 | int retval = 0; | 735 | int retval = 0; |
| 737 | int timeout_loop = 0; | 736 | int timeout_loop = 0; |
| 738 | int done_count = 0; | 737 | int done_count = 0; |
| 739 | 738 | ||
| 740 | exynos_dp_config_video_slave_mode(dp, video_info); | 739 | exynos_dp_config_video_slave_mode(dp); |
| 741 | 740 | ||
| 742 | exynos_dp_set_video_color_format(dp, video_info->color_depth, | 741 | exynos_dp_set_video_color_format(dp); |
| 743 | video_info->color_space, | ||
| 744 | video_info->dynamic_range, | ||
| 745 | video_info->ycbcr_coeff); | ||
| 746 | 742 | ||
| 747 | if (exynos_dp_get_pll_lock_status(dp) == PLL_UNLOCKED) { | 743 | if (exynos_dp_get_pll_lock_status(dp) == PLL_UNLOCKED) { |
| 748 | dev_err(dp->dev, "PLL is not locked yet.\n"); | 744 | dev_err(dp->dev, "PLL is not locked yet.\n"); |
| @@ -893,7 +889,7 @@ static void exynos_dp_hotplug(struct work_struct *work) | |||
| 893 | exynos_dp_set_link_bandwidth(dp, dp->video_info->link_rate); | 889 | exynos_dp_set_link_bandwidth(dp, dp->video_info->link_rate); |
| 894 | 890 | ||
| 895 | exynos_dp_init_video(dp); | 891 | exynos_dp_init_video(dp); |
| 896 | ret = exynos_dp_config_video(dp, dp->video_info); | 892 | ret = exynos_dp_config_video(dp); |
| 897 | if (ret) | 893 | if (ret) |
| 898 | dev_err(dp->dev, "unable to config video\n"); | 894 | dev_err(dp->dev, "unable to config video\n"); |
| 899 | } | 895 | } |
diff --git a/drivers/video/exynos/exynos_dp_core.h b/drivers/video/exynos/exynos_dp_core.h index ef3bb545f9a9..6c567bbf2fb8 100644 --- a/drivers/video/exynos/exynos_dp_core.h +++ b/drivers/video/exynos/exynos_dp_core.h | |||
| @@ -119,11 +119,7 @@ u32 exynos_dp_get_lane3_link_training(struct exynos_dp_device *dp); | |||
| 119 | void exynos_dp_reset_macro(struct exynos_dp_device *dp); | 119 | void exynos_dp_reset_macro(struct exynos_dp_device *dp); |
| 120 | void exynos_dp_init_video(struct exynos_dp_device *dp); | 120 | void exynos_dp_init_video(struct exynos_dp_device *dp); |
| 121 | 121 | ||
| 122 | void exynos_dp_set_video_color_format(struct exynos_dp_device *dp, | 122 | void exynos_dp_set_video_color_format(struct exynos_dp_device *dp); |
| 123 | u32 color_depth, | ||
| 124 | u32 color_space, | ||
| 125 | u32 dynamic_range, | ||
| 126 | u32 ycbcr_coeff); | ||
| 127 | int exynos_dp_is_slave_video_stream_clock_on(struct exynos_dp_device *dp); | 123 | int exynos_dp_is_slave_video_stream_clock_on(struct exynos_dp_device *dp); |
| 128 | void exynos_dp_set_video_cr_mn(struct exynos_dp_device *dp, | 124 | void exynos_dp_set_video_cr_mn(struct exynos_dp_device *dp, |
| 129 | enum clock_recovery_m_value_type type, | 125 | enum clock_recovery_m_value_type type, |
| @@ -133,8 +129,7 @@ void exynos_dp_set_video_timing_mode(struct exynos_dp_device *dp, u32 type); | |||
| 133 | void exynos_dp_enable_video_master(struct exynos_dp_device *dp, bool enable); | 129 | void exynos_dp_enable_video_master(struct exynos_dp_device *dp, bool enable); |
| 134 | void exynos_dp_start_video(struct exynos_dp_device *dp); | 130 | void exynos_dp_start_video(struct exynos_dp_device *dp); |
| 135 | int exynos_dp_is_video_stream_on(struct exynos_dp_device *dp); | 131 | int exynos_dp_is_video_stream_on(struct exynos_dp_device *dp); |
| 136 | void exynos_dp_config_video_slave_mode(struct exynos_dp_device *dp, | 132 | void exynos_dp_config_video_slave_mode(struct exynos_dp_device *dp); |
| 137 | struct video_info *video_info); | ||
| 138 | void exynos_dp_enable_scrambling(struct exynos_dp_device *dp); | 133 | void exynos_dp_enable_scrambling(struct exynos_dp_device *dp); |
| 139 | void exynos_dp_disable_scrambling(struct exynos_dp_device *dp); | 134 | void exynos_dp_disable_scrambling(struct exynos_dp_device *dp); |
| 140 | 135 | ||
diff --git a/drivers/video/exynos/exynos_dp_reg.c b/drivers/video/exynos/exynos_dp_reg.c index 93b4b6bb796c..29d9d035c73a 100644 --- a/drivers/video/exynos/exynos_dp_reg.c +++ b/drivers/video/exynos/exynos_dp_reg.c | |||
| @@ -1058,24 +1058,20 @@ void exynos_dp_init_video(struct exynos_dp_device *dp) | |||
| 1058 | writel(reg, dp->reg_base + EXYNOS_DP_VIDEO_CTL_8); | 1058 | writel(reg, dp->reg_base + EXYNOS_DP_VIDEO_CTL_8); |
| 1059 | } | 1059 | } |
| 1060 | 1060 | ||
| 1061 | void exynos_dp_set_video_color_format(struct exynos_dp_device *dp, | 1061 | void exynos_dp_set_video_color_format(struct exynos_dp_device *dp) |
| 1062 | u32 color_depth, | ||
| 1063 | u32 color_space, | ||
| 1064 | u32 dynamic_range, | ||
| 1065 | u32 ycbcr_coeff) | ||
| 1066 | { | 1062 | { |
| 1067 | u32 reg; | 1063 | u32 reg; |
| 1068 | 1064 | ||
| 1069 | /* Configure the input color depth, color space, dynamic range */ | 1065 | /* Configure the input color depth, color space, dynamic range */ |
| 1070 | reg = (dynamic_range << IN_D_RANGE_SHIFT) | | 1066 | reg = (dp->video_info->dynamic_range << IN_D_RANGE_SHIFT) | |
| 1071 | (color_depth << IN_BPC_SHIFT) | | 1067 | (dp->video_info->color_depth << IN_BPC_SHIFT) | |
| 1072 | (color_space << IN_COLOR_F_SHIFT); | 1068 | (dp->video_info->color_space << IN_COLOR_F_SHIFT); |
| 1073 | writel(reg, dp->reg_base + EXYNOS_DP_VIDEO_CTL_2); | 1069 | writel(reg, dp->reg_base + EXYNOS_DP_VIDEO_CTL_2); |
| 1074 | 1070 | ||
| 1075 | /* Set Input Color YCbCr Coefficients to ITU601 or ITU709 */ | 1071 | /* Set Input Color YCbCr Coefficients to ITU601 or ITU709 */ |
| 1076 | reg = readl(dp->reg_base + EXYNOS_DP_VIDEO_CTL_3); | 1072 | reg = readl(dp->reg_base + EXYNOS_DP_VIDEO_CTL_3); |
| 1077 | reg &= ~IN_YC_COEFFI_MASK; | 1073 | reg &= ~IN_YC_COEFFI_MASK; |
| 1078 | if (ycbcr_coeff) | 1074 | if (dp->video_info->ycbcr_coeff) |
| 1079 | reg |= IN_YC_COEFFI_ITU709; | 1075 | reg |= IN_YC_COEFFI_ITU709; |
| 1080 | else | 1076 | else |
| 1081 | reg |= IN_YC_COEFFI_ITU601; | 1077 | reg |= IN_YC_COEFFI_ITU601; |
| @@ -1202,8 +1198,7 @@ int exynos_dp_is_video_stream_on(struct exynos_dp_device *dp) | |||
| 1202 | return 0; | 1198 | return 0; |
| 1203 | } | 1199 | } |
| 1204 | 1200 | ||
| 1205 | void exynos_dp_config_video_slave_mode(struct exynos_dp_device *dp, | 1201 | void exynos_dp_config_video_slave_mode(struct exynos_dp_device *dp) |
| 1206 | struct video_info *video_info) | ||
| 1207 | { | 1202 | { |
| 1208 | u32 reg; | 1203 | u32 reg; |
| 1209 | 1204 | ||
| @@ -1214,17 +1209,17 @@ void exynos_dp_config_video_slave_mode(struct exynos_dp_device *dp, | |||
| 1214 | 1209 | ||
| 1215 | reg = readl(dp->reg_base + EXYNOS_DP_VIDEO_CTL_10); | 1210 | reg = readl(dp->reg_base + EXYNOS_DP_VIDEO_CTL_10); |
| 1216 | reg &= ~INTERACE_SCAN_CFG; | 1211 | reg &= ~INTERACE_SCAN_CFG; |
| 1217 | reg |= (video_info->interlaced << 2); | 1212 | reg |= (dp->video_info->interlaced << 2); |
| 1218 | writel(reg, dp->reg_base + EXYNOS_DP_VIDEO_CTL_10); | 1213 | writel(reg, dp->reg_base + EXYNOS_DP_VIDEO_CTL_10); |
| 1219 | 1214 | ||
| 1220 | reg = readl(dp->reg_base + EXYNOS_DP_VIDEO_CTL_10); | 1215 | reg = readl(dp->reg_base + EXYNOS_DP_VIDEO_CTL_10); |
| 1221 | reg &= ~VSYNC_POLARITY_CFG; | 1216 | reg &= ~VSYNC_POLARITY_CFG; |
| 1222 | reg |= (video_info->v_sync_polarity << 1); | 1217 | reg |= (dp->video_info->v_sync_polarity << 1); |
| 1223 | writel(reg, dp->reg_base + EXYNOS_DP_VIDEO_CTL_10); | 1218 | writel(reg, dp->reg_base + EXYNOS_DP_VIDEO_CTL_10); |
| 1224 | 1219 | ||
| 1225 | reg = readl(dp->reg_base + EXYNOS_DP_VIDEO_CTL_10); | 1220 | reg = readl(dp->reg_base + EXYNOS_DP_VIDEO_CTL_10); |
| 1226 | reg &= ~HSYNC_POLARITY_CFG; | 1221 | reg &= ~HSYNC_POLARITY_CFG; |
| 1227 | reg |= (video_info->h_sync_polarity << 0); | 1222 | reg |= (dp->video_info->h_sync_polarity << 0); |
| 1228 | writel(reg, dp->reg_base + EXYNOS_DP_VIDEO_CTL_10); | 1223 | writel(reg, dp->reg_base + EXYNOS_DP_VIDEO_CTL_10); |
| 1229 | 1224 | ||
| 1230 | reg = AUDIO_MODE_SPDIF_MODE | VIDEO_MODE_SLAVE_MODE; | 1225 | reg = AUDIO_MODE_SPDIF_MODE | VIDEO_MODE_SLAVE_MODE; |
