Commit 0475680b authored by Lee Jones's avatar Lee Jones Committed by Mark Brown

ARM: ux500: Don't use enums for MSP IDs - for easy DT conversion

Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 6ce4eac1
...@@ -31,7 +31,7 @@ static struct stedma40_chan_cfg msp0_dma_tx = { ...@@ -31,7 +31,7 @@ static struct stedma40_chan_cfg msp0_dma_tx = {
}; };
struct msp_i2s_platform_data msp0_platform_data = { struct msp_i2s_platform_data msp0_platform_data = {
.id = MSP_I2S_0, .id = 0,
.msp_i2s_dma_rx = &msp0_dma_rx, .msp_i2s_dma_rx = &msp0_dma_rx,
.msp_i2s_dma_tx = &msp0_dma_tx, .msp_i2s_dma_tx = &msp0_dma_tx,
}; };
...@@ -49,7 +49,7 @@ static struct stedma40_chan_cfg msp1_dma_tx = { ...@@ -49,7 +49,7 @@ static struct stedma40_chan_cfg msp1_dma_tx = {
}; };
struct msp_i2s_platform_data msp1_platform_data = { struct msp_i2s_platform_data msp1_platform_data = {
.id = MSP_I2S_1, .id = 1,
.msp_i2s_dma_rx = NULL, .msp_i2s_dma_rx = NULL,
.msp_i2s_dma_tx = &msp1_dma_tx, .msp_i2s_dma_tx = &msp1_dma_tx,
}; };
...@@ -69,13 +69,13 @@ static struct stedma40_chan_cfg msp2_dma_tx = { ...@@ -69,13 +69,13 @@ static struct stedma40_chan_cfg msp2_dma_tx = {
}; };
struct msp_i2s_platform_data msp2_platform_data = { struct msp_i2s_platform_data msp2_platform_data = {
.id = MSP_I2S_2, .id = 2,
.msp_i2s_dma_rx = &msp2_dma_rx, .msp_i2s_dma_rx = &msp2_dma_rx,
.msp_i2s_dma_tx = &msp2_dma_tx, .msp_i2s_dma_tx = &msp2_dma_tx,
}; };
struct msp_i2s_platform_data msp3_platform_data = { struct msp_i2s_platform_data msp3_platform_data = {
.id = MSP_I2S_3, .id = 3,
.msp_i2s_dma_rx = &msp1_dma_rx, .msp_i2s_dma_rx = &msp1_dma_rx,
.msp_i2s_dma_tx = NULL, .msp_i2s_dma_tx = NULL,
}; };
...@@ -10,16 +10,9 @@ ...@@ -10,16 +10,9 @@
#include <linux/platform_data/dma-ste-dma40.h> #include <linux/platform_data/dma-ste-dma40.h>
enum msp_i2s_id {
MSP_I2S_0 = 0,
MSP_I2S_1,
MSP_I2S_2,
MSP_I2S_3,
};
/* Platform data structure for a MSP I2S-device */ /* Platform data structure for a MSP I2S-device */
struct msp_i2s_platform_data { struct msp_i2s_platform_data {
enum msp_i2s_id id; int id;
struct stedma40_chan_cfg *msp_i2s_dma_rx; struct stedma40_chan_cfg *msp_i2s_dma_rx;
struct stedma40_chan_cfg *msp_i2s_dma_tx; struct stedma40_chan_cfg *msp_i2s_dma_tx;
}; };
......
...@@ -475,7 +475,7 @@ struct ux500_msp_dma_params { ...@@ -475,7 +475,7 @@ struct ux500_msp_dma_params {
}; };
struct ux500_msp { struct ux500_msp {
enum msp_i2s_id id; int id;
void __iomem *registers; void __iomem *registers;
struct device *dev; struct device *dev;
struct ux500_msp_dma_params playback_dma_data; struct ux500_msp_dma_params playback_dma_data;
......
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