diff options
| author | Kevin Huang <kevinh@nvidia.com> | 2011-06-30 15:04:42 -0700 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-07-08 16:38:33 -0700 |
| commit | 6ecace358d333417632b097c85b51c752dc18839 (patch) | |
| tree | 8fa4a016c45accefd58c260f7805c374667da297 /arch/arm/mach-tegra/board-cardhu-panel.c | |
| parent | 346dd1318aeb571c136f22bb53d2d075e8e97f17 (diff) | |
ARM: tegra: cardhu: Fix clock-related issues on display.
- Set parent clock for lvds and HDMI to avoid clock source conflict.
- Fixed short lvds shutdown during booting.
Bug 847219
Change-Id: Ib32f2047c69c64516d639de247258df001ecd180
Reviewed-on: http://git-master/r/39271
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-cardhu-panel.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-cardhu-panel.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu-panel.c b/arch/arm/mach-tegra/board-cardhu-panel.c index 115d3c56c9f6..824a12aa22d7 100644 --- a/arch/arm/mach-tegra/board-cardhu-panel.c +++ b/arch/arm/mach-tegra/board-cardhu-panel.c @@ -512,6 +512,7 @@ static struct tegra_fb_data cardhu_hdmi_fb_data = { static struct tegra_dc_out cardhu_disp2_out = { .type = TEGRA_DC_OUT_HDMI, .flags = TEGRA_DC_OUT_HOTPLUG_HIGH, + .parent_clk = "pll_d2_out0", .dcc_bus = 3, .hotplug_gpio = cardhu_hdmi_hpd, @@ -788,10 +789,10 @@ static struct tegra_dc_out cardhu_disp1_out = { .align = TEGRA_DC_ALIGN_MSB, .order = TEGRA_DC_ORDER_RED_BLUE, .sd_settings = &cardhu_sd_settings, - .parent_clk = "pll_p", #ifndef CONFIG_TEGRA_CARDHU_DSI .type = TEGRA_DC_OUT_RGB, + .parent_clk = "pll_d_out0", .modes = cardhu_panel_modes, .n_modes = ARRAY_SIZE(cardhu_panel_modes), @@ -920,15 +921,10 @@ int __init cardhu_panel_init(void) cardhu_carveouts[1].base = tegra_carveout_start; cardhu_carveouts[1].size = tegra_carveout_size; - if (board_info.board_id == BOARD_PM269) { + if (board_info.board_id == BOARD_PM269) gpio_request(pm269_lvds_shutdown, "lvds_shutdown"); - gpio_direction_output(pm269_lvds_shutdown, 0); - tegra_gpio_enable(pm269_lvds_shutdown); - } else { + else gpio_request(cardhu_lvds_shutdown, "lvds_shutdown"); - gpio_direction_output(cardhu_lvds_shutdown, 0); - tegra_gpio_enable(cardhu_lvds_shutdown); - } tegra_gpio_enable(cardhu_hdmi_hpd); gpio_request(cardhu_hdmi_hpd, "hdmi_hpd"); |