diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2012-04-19 15:18:04 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:02:48 +0200 |
| commit | 005453b85b67108233b84252fe109efa24a36270 (patch) | |
| tree | ec9041ba3e56f6b595daa3a6d19441e226024857 | |
| parent | 25f6d1c0c3b5c6eca2913defa31f5371a8eea887 (diff) | |
mach-ux500: try to manage parent device for sound devices at init
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/devices-common.h | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 3299c0f73f9..a90f9f2b1c6 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -1233,7 +1233,7 @@ static void __init mop500_init_machine(void) mop500_spi_init(parent); mop500_uart_init(parent); #ifdef CONFIG_STM_MSP_SPI - mop500_msp_init(); + mop500_msp_init(parent); #endif #if defined(CONFIG_CW1200) || defined(CONFIG_CW1200_MODULE) mop500_wlan_init(); @@ -1287,7 +1287,7 @@ static void __init snowball_init_machine(void) mop500_spi_init(parent); mop500_uart_init(parent); #ifdef CONFIG_STM_MSP_SPI - mop500_msp_init(); + mop500_msp_init(parent); #endif #if defined(CONFIG_CW1200) || defined(CONFIG_CW1200_MODULE) mop500_wlan_init(); @@ -1364,7 +1364,7 @@ static void __init hrefv60_init_machine(void) mop500_spi_init(parent); mop500_uart_init(parent); #ifdef CONFIG_STM_MSP_SPI - mop500_msp_init(); + mop500_msp_init(parent); #endif #if defined(CONFIG_CW1200) || defined(CONFIG_CW1200_MODULE) mop500_wlan_init(); diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h index 6fcedb67460..fd6d4aad95c 100644 --- a/arch/arm/mach-ux500/board-mop500.h +++ b/arch/arm/mach-ux500/board-mop500.h @@ -89,7 +89,7 @@ extern void mach_u8520_sdi_init(struct device *parent); extern void mop500_sdi_tc35892_init(struct device *parent); void __init mop500_u8500uib_init(void); void __init mop500_stuib_init(void); -void __init mop500_msp_init(void); +void __init mop500_msp_init(struct device *parent); void __init mop500_pins_init(void); void __init mop500_vibra_init(void); void __init hrefv60_pins_init(void); diff --git a/arch/arm/mach-ux500/devices-common.h b/arch/arm/mach-ux500/devices-common.h index 243c0215f34..23d65b07795 100644 --- a/arch/arm/mach-ux500/devices-common.h +++ b/arch/arm/mach-ux500/devices-common.h @@ -97,9 +97,10 @@ dbx500_add_i2c(struct device *parent, int id, resource_size_t base, int irq, struct msp_i2s_platform_data; static inline struct platform_device * -dbx500_add_msp_i2s(int id, resource_size_t base, int irq, +dbx500_add_msp_i2s(struct device *parent, int id, resource_size_t base, int irq, struct msp_i2s_platform_data *pdata) { + /* FIXME parent parameter ignored */ return dbx500_add_platform_device_4k1irq("ux500-msp-i2s", id, base, irq, pdata); } |