board-loki: set pinmux and clock to enable HDMI
Shaoming Feng [Tue, 13 Aug 2013 23:14:59 +0000 (16:14 -0700)]
Change-Id: Ie16fad993a82aea6277b63f8a9c73f04534cd321
Signed-off-by: Shaoming Feng <shaomingf@nvidia.com>
Reviewed-on: http://git-master/r/261210
(cherry picked from commit f07233f707a5bbe9a60211c46eea48d5b64552e1)
Reviewed-on: http://git-master/r/273411
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Xue Dong <xdong@nvidia.com>
Reviewed-by: Chao Xu <cxu@nvidia.com>

arch/arm/mach-tegra/board-loki-panel.c
arch/arm/mach-tegra/board-loki-pinmux-t12x.h

index 451917d..ab7c56a 100644 (file)
@@ -776,7 +776,7 @@ static void loki_hdmi_hotplug_report(bool state)
 static struct tegra_dc_out loki_disp2_out = {
        .type           = TEGRA_DC_OUT_HDMI,
        .flags          = TEGRA_DC_OUT_HOTPLUG_HIGH,
-       .parent_clk     = "pll_d2_out0",
+       .parent_clk     = "pll_d2",
 
        .dcc_bus        = 3,
        .hotplug_gpio   = loki_hdmi_hpd,
index 4c1b190..c8fc3d7 100644 (file)
@@ -154,8 +154,8 @@ static __initdata struct tegra_pingroup_config loki_pinmux_common[] = {
        CEC_PINMUX(HDMI_CEC, CEC, NORMAL, NORMAL, INPUT, DEFAULT, DISABLE),
 
        /* I2C4 pinmux */
-       DDC_PINMUX(DDC_SCL, I2C4, NORMAL, NORMAL, INPUT, DEFAULT, HIGH),
-       DDC_PINMUX(DDC_SDA, I2C4, NORMAL, NORMAL, INPUT, DEFAULT, HIGH),
+       DDC_PINMUX(DDC_SCL, I2C4, NORMAL, NORMAL, INPUT, DEFAULT, NORMAL),
+       DDC_PINMUX(DDC_SDA, I2C4, NORMAL, NORMAL, INPUT, DEFAULT, NORMAL),
 
        /* GPIO pinmux */
        GPIO_PINMUX(GPIO_X6_AUD, PULL_UP, NORMAL, INPUT, DISABLE),