diff options
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/omap3_h1.dts | 4 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3h1.c | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap3_h1.dts b/arch/arm/boot/dts/omap3_h1.dts index 090cd6f4362..a12cf478222 100644 --- a/arch/arm/boot/dts/omap3_h1.dts +++ b/arch/arm/boot/dts/omap3_h1.dts @@ -77,6 +77,7 @@ /* off IRQ handle */ ti,pad_irq = <0x150 88 1>, /* 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,8 @@ 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 */ /* 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 063b3851b4e..6a6e8b2bd45 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 */ @@ -397,6 +398,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 */ |