diff options
| author | mattis fjallstrom <mattis@acm.org> | 2015-02-16 14:59:43 -0800 |
|---|---|---|
| committer | mattis fjallstrom <mattis@acm.org> | 2015-02-16 15:06:52 -0800 |
| commit | 3dbf592adf73e192bf781f8eec6813d8150107c8 (patch) | |
| tree | 3da988a3fc74a19d1a012af6e76f89afa2faf8db /arch/arm/mach-omap2/board-omap3h1.c | |
| parent | 6cf2983f35974bf0429a3e82b98faff9399d91ad (diff) | |
| download | olio-linux-3.10-3dbf592adf73e192bf781f8eec6813d8150107c8.tar.xz olio-linux-3.10-3dbf592adf73e192bf781f8eec6813d8150107c8.zip | |
Update for building linux kernel for the various versions of Olios H1B board.
Change-Id: Ic382b54ee0eb6423c8da2f40ed5079d682695204
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3h1.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3h1.c | 22 |
1 files changed, 16 insertions, 6 deletions
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(); |