diff options
| author | Jon Mayo <jmayo@nvidia.com> | 2011-07-27 12:00:18 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:47:59 -0800 |
| commit | 3df38b47a8e963220c037cb7e616a868e425d49a (patch) | |
| tree | 68edd325723a9c750e24f1967251a4f72f32d102 /arch/arm/mach-tegra/board-cardhu-panel.c | |
| parent | 27f0f234d2416b52a5d1d5db40e6caa43c25bd90 (diff) | |
Revert "ARM: tegra: cardhu: Fix clock-related issues on display."
Bug 853676
This reverts commit ea52a5ff2107adac0f27c4710728e4158463f5c7.
Conflicts:
arch/arm/mach-tegra/board-cardhu-panel.c
Original-Change-Id: I95bac0fa54891c33bde33aa601885188e8cf231c
Reviewed-on: http://git-master/r/43559
Reviewed-by: Jonathan Mayo <jmayo@nvidia.com>
Tested-by: Jonathan Mayo <jmayo@nvidia.com>
Rebase-Id: Re50c56f529f83f76e54a27d5207441f5130bdaf3
Diffstat (limited to 'arch/arm/mach-tegra/board-cardhu-panel.c')
| -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 5d75b15b8305..125c0ec38514 100644 --- a/arch/arm/mach-tegra/board-cardhu-panel.c +++ b/arch/arm/mach-tegra/board-cardhu-panel.c @@ -567,7 +567,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, @@ -848,10 +847,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), |