summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattis fjallstrom <mattis@acm.org>2015-02-14 14:24:00 -0800
committermattis fjallstrom <mattis@acm.org>2015-02-14 14:24:00 -0800
commit6cf2983f35974bf0429a3e82b98faff9399d91ad (patch)
treef880231ad5e56dbd12bf8a16e0adcd241812d3cd
parent2d967a6c256cf13b32a3eea9edd22432ed53a163 (diff)
downloadolio-linux-3.10-6cf2983f35974bf0429a3e82b98faff9399d91ad.tar.xz
olio-linux-3.10-6cf2983f35974bf0429a3e82b98faff9399d91ad.zip
Changed LCD reset pin to work with DVT boards
Change-Id: Ib9511e33b8c8b8618631f036eb1ef3d55f865761
-rw-r--r--arch/arm/mach-omap2/board-omap3h1.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c
index ab06bb48943..8e2055c5ff6 100644
--- a/arch/arm/mach-omap2/board-omap3h1.c
+++ b/arch/arm/mach-omap2/board-omap3h1.c
@@ -56,7 +56,7 @@
#define NAND_CS 0
#define MPUIRQ_GPIO 31
-#define LCD_RESET_GPIO 122
+#define LCD_RESET_GPIO 94
#define ATMEL_MXT_GPIO 105
static struct mtd_partition omap3h1_nand_partitions[] = {
@@ -468,7 +468,7 @@ static struct platform_device *omap3h1_devices[] __initdata = {
#ifdef CONFIG_OMAP_MUX
static struct omap_board_mux board_mux[] __initdata = {
- OMAP3_MUX(HSUSB0_DIR, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT),
+ OMAP3_MUX(CAM_HS, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT),
OMAP3_MUX(DSS_PCLK, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
OMAP3_MUX(DSS_HSYNC, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),