diff options
Diffstat (limited to 'arch/arm/mach-imx/mach-pcm038.c')
-rw-r--r-- | arch/arm/mach-imx/mach-pcm038.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/mach-pcm038.c b/arch/arm/mach-imx/mach-pcm038.c index 2f3debe2a113..95f49d936fd3 100644 --- a/arch/arm/mach-imx/mach-pcm038.c +++ b/arch/arm/mach-imx/mach-pcm038.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <linux/mfd/mc13783.h> | 27 | #include <linux/mfd/mc13783.h> |
28 | #include <linux/spi/spi.h> | 28 | #include <linux/spi/spi.h> |
29 | #include <linux/irq.h> | 29 | #include <linux/irq.h> |
30 | #include <linux/gpio.h> | ||
30 | 31 | ||
31 | #include <asm/mach-types.h> | 32 | #include <asm/mach-types.h> |
32 | #include <asm/mach/arch.h> | 33 | #include <asm/mach/arch.h> |
@@ -274,7 +275,7 @@ static struct mc13xxx_platform_data pcm038_pmic = { | |||
274 | static struct spi_board_info pcm038_spi_board_info[] __initdata = { | 275 | static struct spi_board_info pcm038_spi_board_info[] __initdata = { |
275 | { | 276 | { |
276 | .modalias = "mc13783", | 277 | .modalias = "mc13783", |
277 | .irq = IRQ_GPIOB(23), | 278 | /* irq number is run-time assigned */ |
278 | .max_speed_hz = 300000, | 279 | .max_speed_hz = 300000, |
279 | .bus_num = 0, | 280 | .bus_num = 0, |
280 | .chip_select = 0, | 281 | .chip_select = 0, |
@@ -325,6 +326,7 @@ static void __init pcm038_init(void) | |||
325 | mxc_gpio_mode(GPIO_PORTB | 23 | GPIO_GPIO | GPIO_IN); | 326 | mxc_gpio_mode(GPIO_PORTB | 23 | GPIO_GPIO | GPIO_IN); |
326 | 327 | ||
327 | imx27_add_spi_imx0(&pcm038_spi0_data); | 328 | imx27_add_spi_imx0(&pcm038_spi0_data); |
329 | pcm038_spi_board_info[0].irq = gpio_to_irq(IMX_GPIO_NR(2, 23)); | ||
328 | spi_register_board_info(pcm038_spi_board_info, | 330 | spi_register_board_info(pcm038_spi_board_info, |
329 | ARRAY_SIZE(pcm038_spi_board_info)); | 331 | ARRAY_SIZE(pcm038_spi_board_info)); |
330 | 332 | ||
@@ -332,8 +334,8 @@ static void __init pcm038_init(void) | |||
332 | 334 | ||
333 | imx27_add_fec(NULL); | 335 | imx27_add_fec(NULL); |
334 | platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); | 336 | platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); |
335 | imx27_add_imx2_wdt(NULL); | 337 | imx27_add_imx2_wdt(); |
336 | imx27_add_mxc_w1(NULL); | 338 | imx27_add_mxc_w1(); |
337 | 339 | ||
338 | #ifdef CONFIG_MACH_PCM970_BASEBOARD | 340 | #ifdef CONFIG_MACH_PCM970_BASEBOARD |
339 | pcm970_baseboard_init(); | 341 | pcm970_baseboard_init(); |