diff options
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-audio.c | 16 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500.h | 2 |
2 files changed, 0 insertions, 18 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-audio.c b/arch/arm/mach-ux500/board-mop500-audio.c index 070629a95625..7adbed5df8a1 100644 --- a/arch/arm/mach-ux500/board-mop500-audio.c +++ b/arch/arm/mach-ux500/board-mop500-audio.c | |||
| @@ -150,15 +150,6 @@ static struct platform_device snd_soc_mop500 = { | |||
| 150 | }, | 150 | }, |
| 151 | }; | 151 | }; |
| 152 | 152 | ||
| 153 | /* Platform device for Ux500-PCM */ | ||
| 154 | static struct platform_device ux500_pcm = { | ||
| 155 | .name = "ux500-pcm", | ||
| 156 | .id = 0, | ||
| 157 | .dev = { | ||
| 158 | .platform_data = NULL, | ||
| 159 | }, | ||
| 160 | }; | ||
| 161 | |||
| 162 | struct msp_i2s_platform_data msp2_platform_data = { | 153 | struct msp_i2s_platform_data msp2_platform_data = { |
| 163 | .id = MSP_I2S_2, | 154 | .id = MSP_I2S_2, |
| 164 | .msp_i2s_dma_rx = &msp2_dma_rx, | 155 | .msp_i2s_dma_rx = &msp2_dma_rx, |
| @@ -186,10 +177,3 @@ void mop500_audio_init(struct device *parent) | |||
| 186 | db8500_add_msp_i2s(parent, 3, U8500_MSP3_BASE, IRQ_DB8500_MSP1, | 177 | db8500_add_msp_i2s(parent, 3, U8500_MSP3_BASE, IRQ_DB8500_MSP1, |
| 187 | &msp3_platform_data); | 178 | &msp3_platform_data); |
| 188 | } | 179 | } |
| 189 | |||
| 190 | /* Due for removal once the MSP driver has been fully DT:ed. */ | ||
| 191 | void mop500_of_audio_init(struct device *parent) | ||
| 192 | { | ||
| 193 | pr_info("%s: Register platform-device 'ux500-pcm'\n", __func__); | ||
| 194 | platform_device_register(&ux500_pcm); | ||
| 195 | } | ||
diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h index d77208232cbc..eaa605f5d90d 100644 --- a/arch/arm/mach-ux500/board-mop500.h +++ b/arch/arm/mach-ux500/board-mop500.h | |||
| @@ -104,8 +104,6 @@ void __init mop500_pinmaps_init(void); | |||
| 104 | void __init snowball_pinmaps_init(void); | 104 | void __init snowball_pinmaps_init(void); |
| 105 | void __init hrefv60_pinmaps_init(void); | 105 | void __init hrefv60_pinmaps_init(void); |
| 106 | void mop500_audio_init(struct device *parent); | 106 | void mop500_audio_init(struct device *parent); |
| 107 | /* Due for removal once the MSP driver has been fully DT:ed. */ | ||
| 108 | void mop500_of_audio_init(struct device *parent); | ||
| 109 | 107 | ||
| 110 | int __init mop500_uib_init(void); | 108 | int __init mop500_uib_init(void); |
| 111 | void mop500_uib_i2c_add(int busnum, struct i2c_board_info *info, | 109 | void mop500_uib_i2c_add(int busnum, struct i2c_board_info *info, |
