Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>

authored by

Lee Jones and committed by
Mark Brown
0475680b 6ce4eac1

+6 -13
+4 -4
arch/arm/mach-ux500/board-mop500-audio.c
··· 31 31 }; 32 32 33 33 struct msp_i2s_platform_data msp0_platform_data = { 34 - .id = MSP_I2S_0, 34 + .id = 0, 35 35 .msp_i2s_dma_rx = &msp0_dma_rx, 36 36 .msp_i2s_dma_tx = &msp0_dma_tx, 37 37 }; ··· 49 49 }; 50 50 51 51 struct msp_i2s_platform_data msp1_platform_data = { 52 - .id = MSP_I2S_1, 52 + .id = 1, 53 53 .msp_i2s_dma_rx = NULL, 54 54 .msp_i2s_dma_tx = &msp1_dma_tx, 55 55 }; ··· 69 69 }; 70 70 71 71 struct msp_i2s_platform_data msp2_platform_data = { 72 - .id = MSP_I2S_2, 72 + .id = 2, 73 73 .msp_i2s_dma_rx = &msp2_dma_rx, 74 74 .msp_i2s_dma_tx = &msp2_dma_tx, 75 75 }; 76 76 77 77 struct msp_i2s_platform_data msp3_platform_data = { 78 - .id = MSP_I2S_3, 78 + .id = 3, 79 79 .msp_i2s_dma_rx = &msp1_dma_rx, 80 80 .msp_i2s_dma_tx = NULL, 81 81 };
+1 -8
include/linux/platform_data/asoc-ux500-msp.h
··· 10 10 11 11 #include <linux/platform_data/dma-ste-dma40.h> 12 12 13 - enum msp_i2s_id { 14 - MSP_I2S_0 = 0, 15 - MSP_I2S_1, 16 - MSP_I2S_2, 17 - MSP_I2S_3, 18 - }; 19 - 20 13 /* Platform data structure for a MSP I2S-device */ 21 14 struct msp_i2s_platform_data { 22 - enum msp_i2s_id id; 15 + int id; 23 16 struct stedma40_chan_cfg *msp_i2s_dma_rx; 24 17 struct stedma40_chan_cfg *msp_i2s_dma_tx; 25 18 };
+1 -1
sound/soc/ux500/ux500_msp_i2s.h
··· 475 475 }; 476 476 477 477 struct ux500_msp { 478 - enum msp_i2s_id id; 478 + int id; 479 479 void __iomem *registers; 480 480 struct device *dev; 481 481 struct ux500_msp_dma_params playback_dma_data;