Commit 39b740bf authored by Lee Jones's avatar Lee Jones

ARM: ux500: Rename MSP board file to something more meaningful

The 'msp' board file does more than just register MSP devices. It
also registers some other components necessary to get audio working
on ux500 based platforms; such as the PCM and Machine Drivers. For
that reason we're changing the filename to be more encompassing -
'audio'.
Acked-by: default avatarOla Lilja <ola.o.lilja@stericsson.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 4fa46941
...@@ -12,6 +12,6 @@ obj-$(CONFIG_MACH_MOP500) += board-mop500.o board-mop500-sdi.o \ ...@@ -12,6 +12,6 @@ obj-$(CONFIG_MACH_MOP500) += board-mop500.o board-mop500-sdi.o \
board-mop500-uib.o board-mop500-stuib.o \ board-mop500-uib.o board-mop500-stuib.o \
board-mop500-u8500uib.o \ board-mop500-u8500uib.o \
board-mop500-pins.o \ board-mop500-pins.o \
board-mop500-msp.o board-mop500-audio.o
obj-$(CONFIG_SMP) += platsmp.o headsmp.o obj-$(CONFIG_SMP) += platsmp.o headsmp.o
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
...@@ -171,14 +171,7 @@ struct msp_i2s_platform_data msp3_platform_data = { ...@@ -171,14 +171,7 @@ struct msp_i2s_platform_data msp3_platform_data = {
.msp_i2s_dma_tx = NULL, .msp_i2s_dma_tx = NULL,
}; };
/* Due for removal once the MSP driver has been fully DT:ed. */ void mop500_audio_init(struct device *parent)
void mop500_of_msp_init(struct device *parent)
{
pr_info("%s: Register platform-device 'ux500-pcm'\n", __func__);
platform_device_register(&ux500_pcm);
}
void mop500_msp_init(struct device *parent)
{ {
pr_info("%s: Register platform-device 'snd-soc-mop500'.\n", __func__); pr_info("%s: Register platform-device 'snd-soc-mop500'.\n", __func__);
platform_device_register(&snd_soc_mop500); platform_device_register(&snd_soc_mop500);
...@@ -193,3 +186,10 @@ void mop500_msp_init(struct device *parent) ...@@ -193,3 +186,10 @@ void mop500_msp_init(struct device *parent)
db8500_add_msp_i2s(parent, 3, U8500_MSP3_BASE, IRQ_DB8500_MSP1, db8500_add_msp_i2s(parent, 3, U8500_MSP3_BASE, IRQ_DB8500_MSP1,
&msp3_platform_data); &msp3_platform_data);
} }
/* Due for removal once the MSP driver has been fully DT:ed. */
void mop500_of_audio_init(struct device *parent)
{
pr_info("%s: Register platform-device 'ux500-pcm'\n", __func__);
platform_device_register(&ux500_pcm);
}
...@@ -607,7 +607,7 @@ static void __init mop500_init_machine(void) ...@@ -607,7 +607,7 @@ static void __init mop500_init_machine(void)
mop500_i2c_init(parent); mop500_i2c_init(parent);
mop500_sdi_init(parent); mop500_sdi_init(parent);
mop500_spi_init(parent); mop500_spi_init(parent);
mop500_msp_init(parent); mop500_audio_init(parent);
mop500_uart_init(parent); mop500_uart_init(parent);
u8500_cryp1_hash1_init(parent); u8500_cryp1_hash1_init(parent);
...@@ -641,7 +641,7 @@ static void __init snowball_init_machine(void) ...@@ -641,7 +641,7 @@ static void __init snowball_init_machine(void)
mop500_i2c_init(parent); mop500_i2c_init(parent);
snowball_sdi_init(parent); snowball_sdi_init(parent);
mop500_spi_init(parent); mop500_spi_init(parent);
mop500_msp_init(parent); mop500_audio_init(parent);
mop500_uart_init(parent); mop500_uart_init(parent);
/* This board has full regulator constraints */ /* This board has full regulator constraints */
...@@ -673,7 +673,7 @@ static void __init hrefv60_init_machine(void) ...@@ -673,7 +673,7 @@ static void __init hrefv60_init_machine(void)
mop500_i2c_init(parent); mop500_i2c_init(parent);
hrefv60_sdi_init(parent); hrefv60_sdi_init(parent);
mop500_spi_init(parent); mop500_spi_init(parent);
mop500_msp_init(parent); mop500_audio_init(parent);
mop500_uart_init(parent); mop500_uart_init(parent);
i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices); i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices);
...@@ -804,7 +804,7 @@ static void __init u8500_init_machine(void) ...@@ -804,7 +804,7 @@ static void __init u8500_init_machine(void)
ARRAY_SIZE(mop500_platform_devs)); ARRAY_SIZE(mop500_platform_devs));
mop500_sdi_init(parent); mop500_sdi_init(parent);
mop500_msp_init(parent); mop500_audio_init(parent);
i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices); i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices);
i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs); i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs);
i2c_register_board_info(2, mop500_i2c2_devices, i2c_register_board_info(2, mop500_i2c2_devices,
...@@ -813,7 +813,7 @@ static void __init u8500_init_machine(void) ...@@ -813,7 +813,7 @@ static void __init u8500_init_machine(void)
mop500_uib_init(); mop500_uib_init();
} else if (of_machine_is_compatible("calaosystems,snowball-a9500")) { } else if (of_machine_is_compatible("calaosystems,snowball-a9500")) {
mop500_of_msp_init(parent); mop500_of_audio_init(parent);
} else if (of_machine_is_compatible("st-ericsson,hrefv60+")) { } else if (of_machine_is_compatible("st-ericsson,hrefv60+")) {
/* /*
* The HREFv60 board removed a GPIO expander and routed * The HREFv60 board removed a GPIO expander and routed
...@@ -825,7 +825,7 @@ static void __init u8500_init_machine(void) ...@@ -825,7 +825,7 @@ static void __init u8500_init_machine(void)
ARRAY_SIZE(mop500_platform_devs)); ARRAY_SIZE(mop500_platform_devs));
hrefv60_sdi_init(parent); hrefv60_sdi_init(parent);
mop500_msp_init(parent); mop500_audio_init(parent);
i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices); i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices);
i2c0_devs -= NUM_PRE_V60_I2C0_DEVICES; i2c0_devs -= NUM_PRE_V60_I2C0_DEVICES;
......
...@@ -99,9 +99,9 @@ void __init mop500_stuib_init(void); ...@@ -99,9 +99,9 @@ void __init mop500_stuib_init(void);
void __init mop500_pinmaps_init(void); void __init mop500_pinmaps_init(void);
void __init snowball_pinmaps_init(void); void __init snowball_pinmaps_init(void);
void __init hrefv60_pinmaps_init(void); void __init hrefv60_pinmaps_init(void);
void mop500_msp_init(struct device *parent); void mop500_audio_init(struct device *parent);
/* Due for removal once the MSP driver has been fully DT:ed. */ /* Due for removal once the MSP driver has been fully DT:ed. */
void mop500_of_msp_init(struct device *parent); void mop500_of_audio_init(struct device *parent);
int __init mop500_uib_init(void); int __init mop500_uib_init(void);
void mop500_uib_i2c_add(int busnum, struct i2c_board_info *info, void mop500_uib_i2c_add(int busnum, struct i2c_board_info *info,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment