Skip to content

Commit

Permalink
ARM: ux500: Stop registering the PCM driver from platform code
Browse files Browse the repository at this point in the history
We now initialise the PCM driver through the MSP DAI, so there is
no need to register it though platform code anymore. This patch
strips out all PCM platform registration.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
  • Loading branch information
Lee Jones committed Nov 27, 2012
1 parent 8ad49c6 commit 065871f
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 18 deletions.
16 changes: 0 additions & 16 deletions arch/arm/mach-ux500/board-mop500-audio.c
Original file line number Diff line number Diff line change
Expand Up @@ -150,15 +150,6 @@ static struct platform_device snd_soc_mop500 = {
},
};

/* Platform device for Ux500-PCM */
static struct platform_device ux500_pcm = {
.name = "ux500-pcm",
.id = 0,
.dev = {
.platform_data = NULL,
},
};

struct msp_i2s_platform_data msp2_platform_data = {
.id = MSP_I2S_2,
.msp_i2s_dma_rx = &msp2_dma_rx,
Expand Down Expand Up @@ -186,10 +177,3 @@ void mop500_audio_init(struct device *parent)
db8500_add_msp_i2s(parent, 3, U8500_MSP3_BASE, IRQ_DB8500_MSP1,
&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);
}
2 changes: 0 additions & 2 deletions arch/arm/mach-ux500/board-mop500.h
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,6 @@ void __init mop500_pinmaps_init(void);
void __init snowball_pinmaps_init(void);
void __init hrefv60_pinmaps_init(void);
void mop500_audio_init(struct device *parent);
/* Due for removal once the MSP driver has been fully DT:ed. */
void mop500_of_audio_init(struct device *parent);

int __init mop500_uib_init(void);
void mop500_uib_i2c_add(int busnum, struct i2c_board_info *info,
Expand Down

0 comments on commit 065871f

Please sign in to comment.