Revert "ARM: tegra: cardhu: Fix clock-related issues on display."
Jon Mayo [Wed, 27 Jul 2011 19:00:18 +0000 (12:00 -0700)]
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

arch/arm/mach-tegra/board-cardhu-panel.c

index 5d75b15..125c0ec 100644 (file)
@@ -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),