sound: u8500: msp: Remove v1 support

ST-Ericsson Linux next: Not tested, ask SSM for ER
ST-Ericsson ID: -
ST-Ericsson FOSS-OUT ID: Trivial

Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Change-Id: I9cdae05681ec60f13cf9079a4d3b0292157da91d
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24282
Reviewed-by: QATEST
Reviewed-by: Ola LILJA2 <ola.o.lilja@stericsson.com>

2 files changed, 12 insertions, 55 deletions

diff --git a/arch/arm/mach-ux500/board-mop500-msp.c b/arch/arm/mach-ux500/board-mop500-msp.c
index f398eed7a7b..0a7d00b0265 100644
--- a/arch/arm/mach-ux500/board-mop500-msp.c
+++ b/arch/arm/mach-ux500/board-mop500-msp.c
@@ -110,7 +110,7 @@ static struct stedma40_chan_cfg msp1_dma_rx = {
 	.high_priority = true,
 	.dir = STEDMA40_PERIPH_TO_MEM,
 
-	.src_dev_type = DB8500_DMA_DEV30_MSP1_RX, /* v2: MSP3 RX */
+	.src_dev_type = DB8500_DMA_DEV30_MSP3_RX,
 	.dst_dev_type = STEDMA40_DEV_DST_MEMORY,
 
 	.src_info.psize = STEDMA40_PSIZE_LOG_4,
@@ -134,7 +134,7 @@ static struct stedma40_chan_cfg msp1_dma_tx = {
 
 static struct msp_i2s_platform_data msp1_platform_data = {
 	.id = MSP_1_I2S_CONTROLLER,
-	.msp_i2s_dma_rx = &msp1_dma_rx,
+	.msp_i2s_dma_rx = NULL,
 	.msp_i2s_dma_tx = &msp1_dma_tx,
 	.msp_i2s_init = msp13_i2s_init,
 	.msp_i2s_exit = msp13_i2s_exit,
@@ -147,8 +147,9 @@ static struct stedma40_chan_cfg msp2_dma_rx = {
 	.src_dev_type = DB8500_DMA_DEV14_MSP2_RX,
 	.dst_dev_type = STEDMA40_DEV_DST_MEMORY,
 
-	.src_info.psize = STEDMA40_PSIZE_LOG_4,
-	.dst_info.psize = STEDMA40_PSIZE_LOG_4,
+	/* MSP2 DMA doesn't work with PSIZE == 4 on DB8500v2 */
+	.src_info.psize = STEDMA40_PSIZE_LOG_1,
+	.dst_info.psize = STEDMA40_PSIZE_LOG_1,
 
 	/* data_width is set during configuration */
 };
@@ -203,29 +204,12 @@ static struct i2s_board_info stm_i2s_board_info[] __initdata = {
 	},
 };
 
-static void __init mop500_msp_fixup(void)
-{
-	if (cpu_is_u8500ed() || cpu_is_u8500v1())
-		return;
-
-	/* DMA Rx is moved to MSP3 on DB8500v2 */
-	msp1_platform_data.msp_i2s_dma_rx = NULL;
-
-	/* MSP2 DMA doesn't work with PSIZE == 4 on DB8500v2 */
-	msp2_dma_rx.src_info.psize = STEDMA40_PSIZE_LOG_1;
-	msp2_dma_rx.dst_info.psize = STEDMA40_PSIZE_LOG_1;
-}
-
 void __init mop500_msp_init(void)
 {
-	mop500_msp_fixup();
-
 	db8500_add_msp0_i2s(&msp0_platform_data);
 	db8500_add_msp1_i2s(&msp1_platform_data);
 	db8500_add_msp2_i2s(&msp2_platform_data);
-
-	if (cpu_is_u8500v2())
-		db8500_add_msp3_i2s(&msp3_platform_data);
+	db8500_add_msp3_i2s(&msp3_platform_data);
 
 	i2s_register_board_info(stm_i2s_board_info,
 				ARRAY_SIZE(stm_i2s_board_info));
diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c
index 78e78e1fc04..3cbd3b783a5 100644
--- a/sound/soc/ux500/ux500_msp_dai.c
+++ b/sound/soc/ux500/ux500_msp_dai.c
@@ -969,60 +969,33 @@ static int ux500_msp_drv_remove(struct i2s_device *i2s_dev)
 	return 0;
 }
 
-static const struct i2s_device_id dev_id_table_v1[] = {
-	{ "i2s_device.0", 0, 0 },
-	{ "i2s_device.1", 1, 0 },
-	{ "i2s_device.2", 2, 0 },
-	{ },
-};
-MODULE_DEVICE_TABLE(i2s, dev_id_table_v1);
-
-static const struct i2s_device_id dev_id_table_v2[] = {
+static const struct i2s_device_id dev_id_table[] = {
 	{ "i2s_device.0", 0, 0 },
 	{ "i2s_device.1", 1, 0 },
 	{ "i2s_device.2", 2, 0 },
 	{ "i2s_device.3", 3, 0 },
 	{ },
 };
-MODULE_DEVICE_TABLE(i2s, dev_id_table_v2);
-
+MODULE_DEVICE_TABLE(i2s, dev_id_table);
 
-static struct i2s_driver i2sdrv_i2s_v1 = {
-	.driver = {
-		.name = "i2s",
-		.owner = THIS_MODULE,
-	},
-	.probe = ux500_msp_drv_probe,
-	.remove = ux500_msp_drv_remove,
-	.id_table = dev_id_table_v1,
-};
-
-static struct i2s_driver i2sdrv_i2s_v2 = {
+static struct i2s_driver i2sdrv_i2s = {
 	.driver = {
 		.name = "i2s",
 		.owner = THIS_MODULE,
 	},
 	.probe = ux500_msp_drv_probe,
 	.remove = __devexit_p(ux500_msp_drv_remove),
-	.id_table = dev_id_table_v2,
+	.id_table = dev_id_table,
 };
 
 static int __init ux500_msp_init(void)
 {
-	if (cpu_is_u8500ed() || cpu_is_u8500v1() || cpu_is_u8500v11())
-		return i2s_register_driver(&i2sdrv_i2s_v1);
-	else
-		return i2s_register_driver(&i2sdrv_i2s_v2);
+	return i2s_register_driver(&i2sdrv_i2s);
 }
 
 static void __exit ux500_msp_exit(void)
 {
-	pr_debug("%s: Enter.\n", __func__);
-
-	if (cpu_is_u8500ed() || cpu_is_u8500v1() || cpu_is_u8500v11())
-		i2s_unregister_driver(&i2sdrv_i2s_v1);
-	else
-		i2s_unregister_driver(&i2sdrv_i2s_v2);
+	i2s_unregister_driver(&i2sdrv_i2s);
 }
 
 module_init(ux500_msp_init);