Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 333437
b: refs/heads/master
c: 1ec7be9
h: refs/heads/master
i:
  333435: 808ebe7
v: v3
  • Loading branch information
Jingoo Han authored and Florian Tobias Schandinat committed Aug 23, 2012
1 parent f754eae commit f7e23cb
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 09d00d170f8da388761cc29de1cf8c12c69c1300
refs/heads/master: 1ec7be9c9f3ee416d5c97c1c649f3cba9e41ee1d
2 changes: 1 addition & 1 deletion trunk/drivers/video/exynos/exynos_dp_core.h
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ u32 exynos_dp_get_lane1_link_training(struct exynos_dp_device *dp);
u32 exynos_dp_get_lane2_link_training(struct exynos_dp_device *dp);
u32 exynos_dp_get_lane3_link_training(struct exynos_dp_device *dp);
void exynos_dp_reset_macro(struct exynos_dp_device *dp);
int exynos_dp_init_video(struct exynos_dp_device *dp);
void exynos_dp_init_video(struct exynos_dp_device *dp);

void exynos_dp_set_video_color_format(struct exynos_dp_device *dp,
u32 color_depth,
Expand Down
4 changes: 1 addition & 3 deletions trunk/drivers/video/exynos/exynos_dp_reg.c
Original file line number Diff line number Diff line change
Expand Up @@ -1009,7 +1009,7 @@ void exynos_dp_reset_macro(struct exynos_dp_device *dp)
writel(reg, dp->reg_base + EXYNOS_DP_PHY_TEST);
}

int exynos_dp_init_video(struct exynos_dp_device *dp)
void exynos_dp_init_video(struct exynos_dp_device *dp)
{
u32 reg;

Expand All @@ -1027,8 +1027,6 @@ int exynos_dp_init_video(struct exynos_dp_device *dp)

reg = VID_HRES_TH(2) | VID_VRES_TH(0);
writel(reg, dp->reg_base + EXYNOS_DP_VIDEO_CTL_8);

return 0;
}

void exynos_dp_set_video_color_format(struct exynos_dp_device *dp,
Expand Down

0 comments on commit f7e23cb

Please sign in to comment.