[PATCH] Removes unused platform device for osk5912

[PATCH] Removes unused platform device for osk5912

[arunks]

From: Arun KS <arunks@mistralsolutions.com>

This patch removes platform device used my ALSA driver, which
is now replaced with ASoC driver.

Signed-off-by: Arun KS <arunks@mistralsolutions.com>
---
 arch/arm/mach-omap1/board-osk.c |   37 -------------------------------------
 1 files changed, 0 insertions(+), 37 deletions(-)

diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index 41e40d6..d2dfff5 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -141,47 +141,10 @@ static struct platform_device osk5912_cf_device = {
 	.resource	= osk5912_cf_resources,
 };
 
-#define DEFAULT_BITPERSAMPLE 16
-
-static struct omap_mcbsp_reg_cfg mcbsp_regs = {
-	.spcr2 = FREE | FRST | GRST | XRST | XINTM(3),
-	.spcr1 = RINTM(3) | RRST,
-	.rcr2 = RPHASE | RFRLEN2(OMAP_MCBSP_WORD_8) |
-	    RWDLEN2(OMAP_MCBSP_WORD_16) | RDATDLY(0),
-	.rcr1 = RFRLEN1(OMAP_MCBSP_WORD_8) | RWDLEN1(OMAP_MCBSP_WORD_16),
-	.xcr2 = XPHASE | XFRLEN2(OMAP_MCBSP_WORD_8) |
-	    XWDLEN2(OMAP_MCBSP_WORD_16) | XDATDLY(0) | XFIG,
-	.xcr1 = XFRLEN1(OMAP_MCBSP_WORD_8) | XWDLEN1(OMAP_MCBSP_WORD_16),
-	.srgr1 = FWID(DEFAULT_BITPERSAMPLE - 1),
-	.srgr2 = GSYNC | CLKSP | FSGM | FPER(DEFAULT_BITPERSAMPLE * 2 - 1),
-	/*.pcr0 = FSXM | FSRM | CLKXM | CLKRM | CLKXP | CLKRP,*/ /* mcbsp: master */
-	.pcr0 = CLKXP | CLKRP,  /* mcbsp: slave */
-};
-
-static struct omap_alsa_codec_config alsa_config = {
-	.name			= "OSK AIC23",
-	.mcbsp_regs_alsa	= &mcbsp_regs,
-	.codec_configure_dev	= NULL, /* aic23_configure, */
-	.codec_set_samplerate	= NULL, /* aic23_set_samplerate, */
-	.codec_clock_setup	= NULL, /* aic23_clock_setup, */
-	.codec_clock_on		= NULL, /* aic23_clock_on, */
-	.codec_clock_off	= NULL, /* aic23_clock_off, */
-	.get_default_samplerate	= NULL, /* aic23_get_default_samplerate, */
-};
-
-static struct platform_device osk5912_mcbsp1_device = {
-	.name	= "omap_alsa_mcbsp",
-	.id	= 1,
-	.dev = {
-		.platform_data	= &alsa_config,
-	},
-};
-
 static struct platform_device *osk5912_devices[] __initdata = {
 	&osk5912_flash_device,
 	&osk5912_smc91x_device,
 	&osk5912_cf_device,
-	&osk5912_mcbsp1_device,
 };
 
 static struct gpio_led tps_leds[] = {
-- 
1.5.6.3

Re: [PATCH] Removes unused platform device for osk5912

[Tony Lindgren]

* arunks@mistralsolutions.com <arunks@mistralsolutions.com> [081204 21:53]:
> From: Arun KS <arunks@mistralsolutions.com>
> 
> This patch removes platform device used my ALSA driver, which
> is now replaced with ASoC driver.

Thanks, I'll apply this to linux-omap tree. Will also expand it to
delete similar code from other board files for the mainline queue.
Some of the includes can disappear with this patch, BTW.

Tony

> Signed-off-by: Arun KS <arunks@mistralsolutions.com>
> ---
>  arch/arm/mach-omap1/board-osk.c |   37 -------------------------------------
>  1 files changed, 0 insertions(+), 37 deletions(-)
> 
> diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
> index 41e40d6..d2dfff5 100644
> --- a/arch/arm/mach-omap1/board-osk.c
> +++ b/arch/arm/mach-omap1/board-osk.c
> @@ -141,47 +141,10 @@ static struct platform_device osk5912_cf_device = {
>  	.resource	= osk5912_cf_resources,
>  };
>  
> -#define DEFAULT_BITPERSAMPLE 16
> -
> -static struct omap_mcbsp_reg_cfg mcbsp_regs = {
> -	.spcr2 = FREE | FRST | GRST | XRST | XINTM(3),
> -	.spcr1 = RINTM(3) | RRST,
> -	.rcr2 = RPHASE | RFRLEN2(OMAP_MCBSP_WORD_8) |
> -	    RWDLEN2(OMAP_MCBSP_WORD_16) | RDATDLY(0),
> -	.rcr1 = RFRLEN1(OMAP_MCBSP_WORD_8) | RWDLEN1(OMAP_MCBSP_WORD_16),
> -	.xcr2 = XPHASE | XFRLEN2(OMAP_MCBSP_WORD_8) |
> -	    XWDLEN2(OMAP_MCBSP_WORD_16) | XDATDLY(0) | XFIG,
> -	.xcr1 = XFRLEN1(OMAP_MCBSP_WORD_8) | XWDLEN1(OMAP_MCBSP_WORD_16),
> -	.srgr1 = FWID(DEFAULT_BITPERSAMPLE - 1),
> -	.srgr2 = GSYNC | CLKSP | FSGM | FPER(DEFAULT_BITPERSAMPLE * 2 - 1),
> -	/*.pcr0 = FSXM | FSRM | CLKXM | CLKRM | CLKXP | CLKRP,*/ /* mcbsp: master */
> -	.pcr0 = CLKXP | CLKRP,  /* mcbsp: slave */
> -};
> -
> -static struct omap_alsa_codec_config alsa_config = {
> -	.name			= "OSK AIC23",
> -	.mcbsp_regs_alsa	= &mcbsp_regs,
> -	.codec_configure_dev	= NULL, /* aic23_configure, */
> -	.codec_set_samplerate	= NULL, /* aic23_set_samplerate, */
> -	.codec_clock_setup	= NULL, /* aic23_clock_setup, */
> -	.codec_clock_on		= NULL, /* aic23_clock_on, */
> -	.codec_clock_off	= NULL, /* aic23_clock_off, */
> -	.get_default_samplerate	= NULL, /* aic23_get_default_samplerate, */
> -};
> -
> -static struct platform_device osk5912_mcbsp1_device = {
> -	.name	= "omap_alsa_mcbsp",
> -	.id	= 1,
> -	.dev = {
> -		.platform_data	= &alsa_config,
> -	},
> -};
> -
>  static struct platform_device *osk5912_devices[] __initdata = {
>  	&osk5912_flash_device,
>  	&osk5912_smc91x_device,
>  	&osk5912_cf_device,
> -	&osk5912_mcbsp1_device,
>  };
>  
>  static struct gpio_led tps_leds[] = {
> -- 
> 1.5.6.3
> 

Re: [PATCH] Removes unused platform device for osk5912

[David Brownell]

On Monday 08 December 2008, Tony Lindgren wrote:
> 
> > This patch removes platform device used my ALSA driver, which
> > is now replaced with ASoC driver.
> 
> Thanks, I'll apply this to linux-omap tree. Will also expand it to
> delete similar code from other board files for the mainline queue.
> Some of the includes can disappear with this patch, BTW.

Maybe drivers/i2c/chips/tlv320aic23.c should be removed too.
I think that's a remnant of now-removed OSS infrastructure;

- Dave

Re: [PATCH] Removes unused platform device for osk5912

[Tony Lindgren]

* David Brownell <david-b@pacbell.net> [081208 11:36]:
> On Monday 08 December 2008, Tony Lindgren wrote:
> > 
> > > This patch removes platform device used my ALSA driver, which
> > > is now replaced with ASoC driver.
> > 
> > Thanks, I'll apply this to linux-omap tree. Will also expand it to
> > delete similar code from other board files for the mainline queue.
> > Some of the includes can disappear with this patch, BTW.
> 
> Maybe drivers/i2c/chips/tlv320aic23.c should be removed too.
> I think that's a remnant of now-removed OSS infrastructure;

Great, done!

Tony