Update for building linux kernel for the various versions of Olios H1B board.

Change-Id: Ic382b54ee0eb6423c8da2f40ed5079d682695204

3 files changed, 36 insertions, 8 deletions

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 662b2bb0921..53b9a9dd4ca 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -214,6 +214,24 @@ config MACH_OMAP3_H1
 	default y
 	select OMAP_PACKAGE_CBP
 
+choice
+       prompt "Olio H1B build version"
+       default MACH_OMAP3_H1_EVT2
+
+config MACH_OMAP3_H1_EVT1
+       bool "EVT1 Build of the H1 board"
+       depends on MACH_OMAP3_H1
+
+config MACH_OMAP3_H1_EVT2
+       bool "EVT2 Build of the H1 board"
+       depends on MACH_OMAP3_H1
+
+config MACH_OMAP3_H1_DVT
+       bool "DVT Build of the H1 board"
+       depends on MACH_OMAP3_H1
+
+endchoice
+
 config MACH_DEVKIT8000
 	bool "DEVKIT8000 board"
 	depends on ARCH_OMAP3
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 8df971b821b..9245b2356df 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -225,8 +225,8 @@ obj-$(CONFIG_MACH_OMAP_GENERIC)		+= board-generic.o
 obj-$(CONFIG_MACH_OMAP_H4)		+= board-h4.o
 obj-$(CONFIG_MACH_OMAP_2430SDP)		+= board-2430sdp.o
 obj-$(CONFIG_MACH_OMAP3_BEAGLE)		+= board-omap3beagle.o
-obj-$(CONFIG_MACH_OMAP3_H1)			+= board-omap3h1.o \
-										board-omap3h1-bluetooth.o
+obj-$(CONFIG_MACH_OMAP3_H1)		+= board-omap3h1.o
+obj-$(CONFIG_MACH_OMAP3_H1)		+= board-omap3h1-bluetooth.o
 obj-$(CONFIG_MACH_DEVKIT8000)     	+= board-devkit8000.o
 obj-$(CONFIG_MACH_OMAP_LDP)		+= board-ldp.o
 obj-$(CONFIG_MACH_OMAP3530_LV_SOM)      += board-omap3logic.o
diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c
index 8e2055c5ff6..fbd1296b204 100644
--- a/arch/arm/mach-omap2/board-omap3h1.c
+++ b/arch/arm/mach-omap2/board-omap3h1.c
@@ -56,7 +56,13 @@
 
 #define NAND_CS 0
 #define MPUIRQ_GPIO 31
+
+#ifdef CONFIG_MACH_OMAP3_H1_DVT
 #define LCD_RESET_GPIO 94
+#else 
+#define LCD_RESET_GPIO 122
+#endif
+
 #define ATMEL_MXT_GPIO 105
 
 static struct mtd_partition omap3h1_nand_partitions[] = {
@@ -160,8 +166,8 @@ static struct lm3530_platform_data omap3h1_backlight_platform_data = {
 	.brt_ramp_rise = LM3530_RAMP_TIME_1s,
 	//.als1_resistor_sel = LM3530_ALS_IMPD_13_53kOhm,
 	//.als2_resistor_sel = LM3530_ALS_IMPD_Z,
-	//.als_vmin = 730,	/* mV */
-	//.als_vmax = 1020,	/* mV */
+	//.als_vmin = 730,	    /* mV */
+	//.als_vmax = 10a20,	/* mV */
 	.brt_val = 0x64,	/* initial brightness */
 };
 
@@ -451,7 +457,7 @@ static int __init omap3_h1_i2c_init(void)
 	gpio_request_one(ATMEL_MXT_GPIO, GPIOF_IN, "atmel_mxt_ts CHG");
 	omap3h1_i2c1_board_info[3].irq = gpio_to_irq(ATMEL_MXT_GPIO);
 
-	gpio_request_one(MPUIRQ_GPIO, GPIOF_IN, "mpu6515 gpio CHG");
+	gpio_request_one(MPUIRQ_GPIO, GPIOF_IN, "mpu6515");
     omap3h1_i2c1_board_info[1].irq = gpio_to_irq(MPUIRQ_GPIO);
 
     /* Register buses */
@@ -468,8 +474,12 @@ static struct platform_device *omap3h1_devices[] __initdata = {
 
 #ifdef CONFIG_OMAP_MUX
 static struct omap_board_mux board_mux[] __initdata = {
-	OMAP3_MUX(CAM_HS, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT),
 
+#ifdef CONFIG_MACH_OMAP3_H1_DVT
+	OMAP3_MUX(CAM_HS, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT),
+#else
+	OMAP3_MUX(HSUSB0_DIR, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT),
+#endif
 	OMAP3_MUX(DSS_PCLK, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
 	OMAP3_MUX(DSS_HSYNC, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
 	OMAP3_MUX(DSS_VSYNC, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT),
@@ -515,8 +525,8 @@ static void __init omap3_h1_init(void)
 	omap_sdrc_init(NULL, NULL);
 
 	board_nand_init(omap3h1_nand_partitions,
-			ARRAY_SIZE(omap3h1_nand_partitions), NAND_CS,
-			NAND_BUSWIDTH_16, NULL);
+                    ARRAY_SIZE(omap3h1_nand_partitions), NAND_CS,
+                    NAND_BUSWIDTH_16, NULL);
 
 	platform_add_devices(omap3h1_devices, ARRAY_SIZE(omap3h1_devices));
 	omap3h1_spi_init();