diff options
author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2013-06-16 09:35:12 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2013-06-18 06:12:13 -0400 |
commit | a4b13a3b26e4ef7a5e50b95480eb396336095525 (patch) | |
tree | b00034a04d5298377b26fa01093dcac260e5fec7 /arch/arm/mach-omap1 | |
parent | 8fb61e8d84e673eebf31e564a83bb71a50b1ed48 (diff) |
ARM: OMAP1: nokia770: enable Tahvo
Add platform data for Tahvo.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
[tony@atomide.com: left out extcon to remove dependency to USB patches]
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1')
-rw-r--r-- | arch/arm/mach-omap1/board-nokia770.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c index 62a15e289c79..91449c5cb70f 100644 --- a/arch/arm/mach-omap1/board-nokia770.c +++ b/arch/arm/mach-omap1/board-nokia770.c | |||
@@ -234,16 +234,26 @@ static struct i2c_board_info nokia770_i2c_board_info_2[] __initdata = { | |||
234 | { | 234 | { |
235 | I2C_BOARD_INFO("retu-mfd", 0x01), | 235 | I2C_BOARD_INFO("retu-mfd", 0x01), |
236 | }, | 236 | }, |
237 | { | ||
238 | I2C_BOARD_INFO("tahvo-mfd", 0x02), | ||
239 | }, | ||
237 | }; | 240 | }; |
238 | 241 | ||
239 | static void __init nokia770_cbus_init(void) | 242 | static void __init nokia770_cbus_init(void) |
240 | { | 243 | { |
241 | const int retu_irq_gpio = 62; | 244 | const int retu_irq_gpio = 62; |
245 | const int tahvo_irq_gpio = 40; | ||
242 | 246 | ||
243 | if (gpio_request_one(retu_irq_gpio, GPIOF_IN, "Retu IRQ")) | 247 | if (gpio_request_one(retu_irq_gpio, GPIOF_IN, "Retu IRQ")) |
244 | return; | 248 | return; |
249 | if (gpio_request_one(tahvo_irq_gpio, GPIOF_IN, "Tahvo IRQ")) { | ||
250 | gpio_free(retu_irq_gpio); | ||
251 | return; | ||
252 | } | ||
245 | irq_set_irq_type(gpio_to_irq(retu_irq_gpio), IRQ_TYPE_EDGE_RISING); | 253 | irq_set_irq_type(gpio_to_irq(retu_irq_gpio), IRQ_TYPE_EDGE_RISING); |
254 | irq_set_irq_type(gpio_to_irq(tahvo_irq_gpio), IRQ_TYPE_EDGE_RISING); | ||
246 | nokia770_i2c_board_info_2[0].irq = gpio_to_irq(retu_irq_gpio); | 255 | nokia770_i2c_board_info_2[0].irq = gpio_to_irq(retu_irq_gpio); |
256 | nokia770_i2c_board_info_2[1].irq = gpio_to_irq(tahvo_irq_gpio); | ||
247 | i2c_register_board_info(2, nokia770_i2c_board_info_2, | 257 | i2c_register_board_info(2, nokia770_i2c_board_info_2, |
248 | ARRAY_SIZE(nokia770_i2c_board_info_2)); | 258 | ARRAY_SIZE(nokia770_i2c_board_info_2)); |
249 | platform_device_register(&nokia770_cbus_device); | 259 | platform_device_register(&nokia770_cbus_device); |