diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/omap3_h1.dts | 15 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3h1.c | 10 |
2 files changed, 21 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/omap3_h1.dts b/arch/arm/boot/dts/omap3_h1.dts index b83d1bdb0bd..b8c949698ae 100644 --- a/arch/arm/boot/dts/omap3_h1.dts +++ b/arch/arm/boot/dts/omap3_h1.dts @@ -75,8 +75,9 @@ /* listed below will be reported as the wakeup reason */ /* */ /* off IRQ handle */ - ti,pad_irq = <0x150 88 1>, /* 72 + 16, uart1 - BT input */ - <0x9f6 143 1>, /* mpu6515 irq pin - is this offset correct? */ + ti,pad_irq = <0x150 88 1>, /* 72 + 16, uart1 - BT input */ + <0x9f6 143 1>, /* mpu6515 irq pin - is this offset correct? */ + <0x9ea 122 1>, /* bq27400 chg irq8 */ <0x9f4 123 1>, /* BT host wake */ <0x1b0 23 1>; /* sys_nirq */ }; @@ -232,7 +233,15 @@ pinctrl-single,pins = < 0x006 0x008 /* SYS_CLKREQ, MODE0 | PULLDOWN */ 0x018 0x000 /* SYS_OFF_MODE, MODE0 */ - 0x01a 0x10c /* SYS_CLKOUT1, MODE4 | INPUT_PULLDOWN */ + /* Fuel gauge interrupt */ + 0x01a 0x4104 /* SYS_CLKOUT1, MODE4 | OMAP_PIN_INPUT */ + + /* + * lm3530 PWM pin, gpio128 + * gpio128, MODE4 | OFFPULLDOWN | OFFENABLE | OFFOUTENABLE | + * OUTPUT + */ + 0x058 0x1604 /* Wakeup from Bluetooth */ 0x024 0x410C /* JTAG_EMU0, OMAP_MUX_MODE4 | OMAP_PIN_INPUT | diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c index 071af9b51c3..c1009f3b7e2 100644 --- a/arch/arm/mach-omap2/board-omap3h1.c +++ b/arch/arm/mach-omap2/board-omap3h1.c @@ -79,6 +79,7 @@ #define TPS_SYS_NIRQ 0 #define USB_IRQ 124 #define USB_CS 17 +#define CHG_GPOUT 10 #define DEFAULT_RXDMA_POLLRATE 1 /* RX DMA polling rate (us) */ #define DEFAULT_RXDMA_BUFSIZE 4096 /* RX DMA buffer size */ @@ -90,6 +91,8 @@ #define LCD_RESET_GPIO 122 #endif +#define BACKLIGHT_PWM_GPIO 128 + static struct of_device_id omap_dt_match_table[] __initdata = { { .compatible = "olio,omap3-h1", }, { .compatible = "simple-bus", }, @@ -198,7 +201,7 @@ static struct mpu_platform_data mpu_data = { #endif static struct lm3530_platform_data omap3h1_backlight_platform_data = { - .mode = LM3530_BL_MODE_MANUAL, + .mode = LM3530_BL_MODE_SIMPLE_MANUAL, //.als_input_mode = LM3530_INPUT_ALS1, .max_current = LM3530_FS_CURR_29mA, //.pwm_pol_hi = true, @@ -211,6 +214,7 @@ static struct lm3530_platform_data omap3h1_backlight_platform_data = { //.als_vmin = 730, /* mV */ //.als_vmax = 10a20, /* mV */ .brt_val = 0x64, /* initial brightness */ + .pwm_gpio = BACKLIGHT_PWM_GPIO, }; @@ -418,6 +422,10 @@ static int __init omap3_h1_i2c_init(void) omap3h1_i2c1_board_info[1].irq = acc_irq; #endif +#if defined (CONFIG_MACH_OMAP3_H1_PV) + omap3h1_i2c2_board_info[4].irq = gpio_to_irq(CHG_GPOUT); +#endif + gpio_request_one(USB_CS, GPIOF_OUT_INIT_HIGH, "USB on"); /* Register buses */ |