diff options
| author | Andy Green <andy.green@linaro.org> | 2012-03-03 07:34:08 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2012-03-03 07:34:08 +0800 |
| commit | 522e44cf43214b9203aa8658d5e84d885f122c4f (patch) | |
| tree | 63f5d9dffd615fb56aab516533dd3bc6ac83214f | |
| parent | 3a2117eeca8fd6c5535955b25cd20e2faee62f08 (diff) | |
omap5 asoc board different gpio on uevmtilt-3.3-omap5-eng-3
Signed-off-by: Andy Green <andy.green@linaro.org>
| -rw-r--r-- | arch/arm/mach-omap2/board-omap5evm.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap5evm.c b/arch/arm/mach-omap2/board-omap5evm.c index 31ffb8feba4..c14346fc1cc 100644 --- a/arch/arm/mach-omap2/board-omap5evm.c +++ b/arch/arm/mach-omap2/board-omap5evm.c @@ -1413,7 +1413,7 @@ static struct omap_dss_device *omap5evm_dss_devices[] = { static struct omap_dss_board_info omap5evm_dss_data = { .num_devices = ARRAY_SIZE(omap5evm_dss_devices), .devices = omap5evm_dss_devices, - .default_device = &omap5evm_hdmi_device, + .default_device = &omap5evm_lcd_device, }; static void __init omap54xx_common_init(void) @@ -1469,6 +1469,9 @@ static void __init omap_5432_uevm_init(void) omap_mux_init_signal("gpio_195", OMAP_PIN_INPUT_PULLUP | OMAP_PIN_OFF_NONE); omap5evm_dss_data.default_device = &omap5evm_hdmi_device, + twl6040_data.audpwron_gpio = 141; + omap_mux_init_signal("gpio_141", OMAP_PIN_OUTPUT | OMAP_PIN_OFF_NONE); + /* AUXCLK1 at 19.2kHz for Usb Host chip */ omap_writel(0x01000100, 0x4ae0a314); omap_writel(0, 0x4AE0C858); |