diff options
| author | Puneet Saxena <puneets@nvidia.com> | 2012-01-24 12:23:13 +0530 |
|---|---|---|
| committer | Puneet Saxena <puneets@nvidia.com> | 2012-02-07 01:59:27 -0800 |
| commit | 380ebeba0ad7b7188c573703e87843d0f90bbb7d (patch) | |
| tree | 8876002e06ff0ee0dcb5ef58f41e85f212421d54 | |
| parent | e8ce66609ca4111eeb590f4840f76bc9a131496f (diff) | |
video: tegra: Handle pinmux setting differenly for Tegra2 an Tegra3
For Tegra2, pinmuxing is done in each driver, For Tegra3
it is done at boot up time.
Handling it conditionally for Tegra2 and Tegra3.
BUG=chromium-os:23496
TEST=Build ok for Cardhu, Waluigi and Seaboard. Tested on Waluigi.
Change-Id: I95e2dc4d46c0c47037611ff9177f2d8823c11d1f
Signed-off-by: Puneet Saxena <puneets@nvidia.com>
Reviewed-on: https://gerrit.chromium.org/gerrit/14695
| -rw-r--r-- | drivers/video/tegra.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/video/tegra.c b/drivers/video/tegra.c index 2bdb392a7a..13574877c2 100644 --- a/drivers/video/tegra.c +++ b/drivers/video/tegra.c @@ -85,6 +85,7 @@ static void clk_init(void) clock_start_periph_pll(PERIPH_ID_PWM, CLOCK_ID_SFROM32KHZ, CLK_32768); } +#if defined(CONFIG_TEGRA2) /* * The PINMUX macro is used per board to setup the pinmux configuration. */ @@ -127,6 +128,7 @@ struct pingroup_config pinmux_cros_1[] = { PINMUX(LVS, DISPA, NORMAL, NORMAL), PINMUX(SLXD, SPDIF, NORMAL, NORMAL), }; +#endif /* Initialize the Tegra LCD panel and controller */ void init_lcd(struct fdt_lcd *config) @@ -271,8 +273,10 @@ static int handle_stage(const void *blob) return -1; } +#if defined(CONFIG_TEGRA2) /* TODO: put pinmux into the FDT */ pinmux_config_table(pinmux_cros_1, ARRAY_SIZE(pinmux_cros_1)); +#endif fdt_setup_gpio(&config.panel_vdd); fdt_setup_gpio(&config.lvds_shutdown); |