diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 8 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3h1.c | 39 |
2 files changed, 29 insertions, 18 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 53b9a9dd4ca..c3fdbc0f08a 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -226,9 +226,13 @@ 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" +config MACH_OMAP3_H1_DVT1 + bool "DVT1 Build of the H1 board" depends on MACH_OMAP3_H1 + +config MACH_OMAP3_H1_DVT2 + bool "DVT2 Build of the H1 board" + depends on MACH_OMAP3_H1 endchoice diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c index 4eea89ca049..d0ac1d16311 100644 --- a/arch/arm/mach-omap2/board-omap3h1.c +++ b/arch/arm/mach-omap2/board-omap3h1.c @@ -66,7 +66,7 @@ #define USB_IRQ 124 #define USB_ON_ETK_D7 21 -#ifdef CONFIG_MACH_OMAP3_H1_DVT +#if defined(CONFIG_MACH_OMAP3_H1_DVT1) || defined(CONFIG_MACH_OMAP3_H1_DVT2) #define LCD_RESET_GPIO 94 #else #define LCD_RESET_GPIO 122 @@ -472,6 +472,10 @@ static struct i2c_board_info __initdata omap3h1_i2c1_board_info[] = { I2C_BOARD_INFO("tps65910", 0x2d), .platform_data = &omap3h1_tps65910_pdata, }, +#ifdef CONFIG_MACH_OMAP3_H1_DVT2 +}; +static struct i2c_board_info __initdata omap3h1_i2c2_board_info[] = { +#endif { I2C_BOARD_INFO("mpu6515", 0x68), // This is needed for the interrupt wake. IH_GPIO_BASE changed in 3.10 @@ -487,19 +491,13 @@ static struct i2c_board_info __initdata omap3h1_i2c1_board_info[] = { I2C_BOARD_INFO("mXT224", 0x4a), .platform_data = &mxt_data, }, -#ifndef CONFIG_MACH_OMAP3_H1_EVT1 +#ifdef CONFIG_MACH_OMAP3_H1_EVT1 +}; +static struct i2c_board_info __initdata omap3h1_i2c3_board_info[] = { +#endif { I2C_BOARD_INFO("bq274xx", 0x55), }, -#endif -}; - -static struct i2c_board_info __initdata omap3h1_i2c3_board_info[] = { - #ifdef CONFIG_MACH_OMAP3_H1_EVT1 - { - I2C_BOARD_INFO("bq274xx", 0x55), - }, - #endif }; @@ -511,17 +509,26 @@ 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 IRQ pin"); - omap3h1_i2c1_board_info[1].irq = gpio_to_irq(MPUIRQ_GPIO); +#ifdef CONFIG_MACH_OMAP3_H1_DVT2 + omap3h1_i2c2_board_info[2].irq = gpio_to_irq(ATMEL_MXT_GPIO); + omap3h1_i2c2_board_info[0].irq = gpio_to_irq(MPUIRQ_GPIO); +#else + omap3h1_i2c1_board_info[3].irq = gpio_to_irq(ATMEL_MXT_GPIO); + omap3h1_i2c1_board_info[1].irq = gpio_to_irq(MPUIRQ_GPIO); +#endif gpio_request_one(USB_ON_ETK_D7, GPIOF_OUT_INIT_HIGH, "USB on"); /* Register buses */ omap_register_i2c_bus(1, 400, omap3h1_i2c1_board_info, ARRAY_SIZE(omap3h1_i2c1_board_info)); +#ifdef CONFIG_MACH_OMAP3_H1_DVT2 + omap_register_i2c_bus(2, 400, omap3h1_i2c2_board_info, ARRAY_SIZE(omap3h1_i2c2_board_info)); +#endif +#ifdef CONFIG_MACH_OMAP3_H1_EVT1 omap_register_i2c_bus(3, 400, omap3h1_i2c3_board_info, ARRAY_SIZE(omap3h1_i2c3_board_info)); +#endif return 0; } @@ -535,7 +542,7 @@ static struct platform_device *omap3h1_devices[] __initdata = { #ifdef CONFIG_OMAP_MUX static struct omap_board_mux board_mux[] __initdata = { -#ifdef CONFIG_MACH_OMAP3_H1_DVT +#if defined(CONFIG_MACH_OMAP3_H1_DVT1) || defined(CONFIG_MACH_OMAP3_H1_DVT2) OMAP3_MUX(CAM_HS, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT), #else OMAP3_MUX(HSUSB0_DIR, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT), @@ -571,7 +578,7 @@ static struct omap_board_mux board_mux[] __initdata = { OMAP3_MUX(CAM_D6, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP), -#ifdef CONFIG_MACH_OMAP3_H1_DVT +#if defined(CONFIG_MACH_OMAP3_H1_DVT1) || defined(CONFIG_MACH_OMAP3_H1_DVT2) /* USB pin settings (mUSB) */ OMAP3_MUX(HSUSB0_CLK, (OMAP_MUX_MODE0 | OMAP_PIN_INPUT)), |