diff options
| author | Jon Mayo <jmayo@nvidia.com> | 2011-07-27 12:00:18 -0700 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-08-01 17:11:58 -0700 |
| commit | 280fd56c7b5f2943f86e5203eef1d65b3af1e2ac (patch) | |
| tree | cf77a6023e2ed223613b441b62565c0a155fe5df /arch/arm/mach-tegra | |
| parent | bdc83423928076ebab2c0a653d7a0f28c2fb4924 (diff) | |
Revert "ARM: tegra: cardhu: Fix clock-related issues on display."
Bug 853676
This reverts commit 6ecace358d333417632b097c85b51c752dc18839.
Conflicts:
arch/arm/mach-tegra/board-cardhu-panel.c
Change-Id: I95bac0fa54891c33bde33aa601885188e8cf231c
Reviewed-on: http://git-master/r/43559
Reviewed-by: Jonathan Mayo <jmayo@nvidia.com>
Tested-by: Jonathan Mayo <jmayo@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra')
| -rw-r--r-- | arch/arm/mach-tegra/board-cardhu-panel.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu-panel.c b/arch/arm/mach-tegra/board-cardhu-panel.c index 68f86f11195f..7db6102c9ec4 100644 --- a/arch/arm/mach-tegra/board-cardhu-panel.c +++ b/arch/arm/mach-tegra/board-cardhu-panel.c @@ -568,7 +568,6 @@ 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, @@ -849,10 +848,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), |