Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e999bbe7 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP: Remove unused platform devices, v3 



This patch removes old platform devices. Alsa should now
be using the ASoC driver. For boards not yet using ASoC,
please see sound/soc/omap/osk5912.c.

Add dummy aic23_power_up and aic23_power_down functions for 770
to keep things compiling.

Remove references to omap_gpio_switch, and unused h2_nand_dev_ready
function.

This patch is based on an earlier patch by Arun KS.

Cc: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: default avatarArun KS <arunks@mistralsolutions.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 3127f8f8

arch/arm/mach-omap1/board-h2.c

+1 −44
Original line number Diff line number Diff line
@@ -37,16 +37,14 @@ 
#include <asm/mach/flash.h>

#include <asm/mach/map.h>



#include <mach/gpio-switch.h>

#include <mach/mux.h>

#include <mach/dma.h>

#include <mach/tc.h>

#include <mach/nand.h>

#include <mach/irda.h>

#include <mach/usb.h>

#include <mach/keypad.h>

#include <mach/common.h>

#include <mach/mcbsp.h>

#include <mach/omap-alsa.h>



static int h2_keymap[] = {

	KEY(0, 0, KEY_LEFT),
@@ -292,41 +290,6 @@ static struct platform_device h2_lcd_device = { 
	.id		= -1,

};



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(1),

	.rcr1  = RFRLEN1(OMAP_MCBSP_WORD_8) | RWDLEN1(OMAP_MCBSP_WORD_16),

	.xcr2  = XPHASE | XFRLEN2(OMAP_MCBSP_WORD_8) |

                XWDLEN2(OMAP_MCBSP_WORD_16) | XDATDLY(1) | XFIG,

	.xcr1  = XFRLEN1(OMAP_MCBSP_WORD_8) | XWDLEN1(OMAP_MCBSP_WORD_16),

	.srgr1 = FWID(15),

	.srgr2 = GSYNC | CLKSP | FSGM | FPER(31),



	.pcr0  = CLKXM | CLKRM | FSXP | FSRP | CLKXP | CLKRP,

	/*.pcr0 = CLKXP | CLKRP,*/        /* mcbsp: slave */

};



static struct omap_alsa_codec_config alsa_config = {

	.name                   = "H2 TSC2101",

	.mcbsp_regs_alsa        = &mcbsp_regs,

	.codec_configure_dev    = NULL, /* tsc2101_configure, */

	.codec_set_samplerate   = NULL, /* tsc2101_set_samplerate, */

	.codec_clock_setup      = NULL, /* tsc2101_clock_setup, */

	.codec_clock_on         = NULL, /* tsc2101_clock_on, */

	.codec_clock_off        = NULL, /* tsc2101_clock_off, */

	.get_default_samplerate = NULL, /* tsc2101_get_default_samplerate, */

};



static struct platform_device h2_mcbsp1_device = {

	.name	= "omap_alsa_mcbsp",

	.id	= 1,

	.dev = {

		.platform_data	= &alsa_config,

	},

};



static struct platform_device *h2_devices[] __initdata = {

	&h2_nor_device,

	&h2_nand_device,
@@ -334,7 +297,6 @@ static struct platform_device *h2_devices[] __initdata = { 
	&h2_irda_device,

	&h2_kp_device,

	&h2_lcd_device,

	&h2_mcbsp1_device,

};



static void __init h2_init_smc91x(void)
@@ -409,11 +371,6 @@ static struct omap_board_config_kernel h2_config[] __initdata = { 


#define H2_NAND_RB_GPIO_PIN	62



static int h2_nand_dev_ready(struct omap_nand_platform_data *data)

{

	return gpio_get_value(H2_NAND_RB_GPIO_PIN);

}



static void __init h2_init(void)

{

	/* Here we assume the NOR boot config:  NOR on CS3 (possibly swapped

arch/arm/mach-omap1/board-h3.c

+0 −50
Original line number Diff line number Diff line
@@ -49,8 +49,6 @@ 
#include <mach/keypad.h>

#include <mach/dma.h>

#include <mach/common.h>

#include <mach/mcbsp.h>

#include <mach/omap-alsa.h>



#define H3_TS_GPIO	48
@@ -387,41 +385,6 @@ static struct spi_board_info h3_spi_board_info[] __initdata = { 
	},

};



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(1),

	.rcr1  = RFRLEN1(OMAP_MCBSP_WORD_8) | RWDLEN1(OMAP_MCBSP_WORD_16),

	.xcr2  = XPHASE | XFRLEN2(OMAP_MCBSP_WORD_8) |

                XWDLEN2(OMAP_MCBSP_WORD_16) | XDATDLY(1) | XFIG,

	.xcr1  = XFRLEN1(OMAP_MCBSP_WORD_8) | XWDLEN1(OMAP_MCBSP_WORD_16),

	.srgr1 = FWID(15),

	.srgr2 = GSYNC | CLKSP | FSGM | FPER(31),



	.pcr0  = CLKRM | SCLKME | FSXP | FSRP | CLKXP | CLKRP,

	/*.pcr0 = CLKXP | CLKRP,*/        /* mcbsp: slave */

};



static struct omap_alsa_codec_config alsa_config = {

	.name                   = "H3 TSC2101",

	.mcbsp_regs_alsa        = &mcbsp_regs,

	.codec_configure_dev    = NULL, /* tsc2101_configure, */

	.codec_set_samplerate   = NULL, /* tsc2101_set_samplerate, */

	.codec_clock_setup      = NULL, /* tsc2101_clock_setup, */

	.codec_clock_on         = NULL, /* tsc2101_clock_on, */

	.codec_clock_off        = NULL, /* tsc2101_clock_off, */

	.get_default_samplerate = NULL, /* tsc2101_get_default_samplerate, */

};



static struct platform_device h3_mcbsp1_device = {

	.name	= "omap_alsa_mcbsp",

	.id	= 1,

	.dev = {

		.platform_data	= &alsa_config,

	},

};



static struct platform_device *devices[] __initdata = {

	&nor_device,

	&nand_device,
@@ -430,7 +393,6 @@ static struct platform_device *devices[] __initdata = { 
	&h3_irda_device,

	&h3_kp_device,

	&h3_lcd_device,

	&h3_mcbsp1_device,

};



static struct omap_usb_config h3_usb_config __initdata = {
@@ -472,18 +434,6 @@ static struct i2c_board_info __initdata h3_i2c_board_info[] = { 
	},

};



static struct omap_gpio_switch h3_gpio_switches[] __initdata = {

	{

		.name			= "mmc_slot",

		.gpio                   = OMAP_MPUIO(1),

		.type                   = OMAP_GPIO_SWITCH_TYPE_COVER,

		.debounce_rising        = 100,

		.debounce_falling       = 0,

		.notify                 = h3_mmc_slot_cover_handler,

		.notify_data            = NULL,

	},

};



#define H3_NAND_RB_GPIO_PIN	10



static int nand_dev_ready(struct omap_nand_platform_data *data)

arch/arm/mach-omap1/board-innovator.c

+0 −39
Original line number Diff line number Diff line
@@ -37,8 +37,6 @@ 
#include <mach/usb.h>

#include <mach/keypad.h>

#include <mach/common.h>

#include <mach/mcbsp.h>

#include <mach/omap-alsa.h>

#include <mach/mmc.h>



static int innovator_keymap[] = {
@@ -115,42 +113,6 @@ static struct platform_device innovator_flash_device = { 
	.resource	= &innovator_flash_resource,

};



#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			= "OMAP Innovator 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 innovator_mcbsp1_device = {

	.name	= "omap_alsa_mcbsp",

 	.id	= 1,

	.dev = {

		.platform_data	= &alsa_config,

	},

};



static struct resource innovator_kp_resources[] = {

	[0] = {

		.start	= INT_KEYBOARD,
@@ -227,7 +189,6 @@ static struct platform_device innovator1510_spi_device = { 
static struct platform_device *innovator1510_devices[] __initdata = {

	&innovator_flash_device,

	&innovator1510_smc91x_device,

	&innovator_mcbsp1_device,

	&innovator_kp_device,

	&innovator1510_lcd_device,

	&innovator1510_spi_device,

arch/arm/mach-omap1/board-nokia770.c

+7 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include <mach/keypad.h>

#include <mach/common.h>

#include <mach/dsp_common.h>

#include <mach/aic23.h>

#include <mach/omapfb.h>

#include <mach/lcd_mipid.h>

#include <mach/mmc.h>
@@ -261,6 +260,13 @@ static DEFINE_MUTEX(audio_pwr_lock); 
 */

static int audio_pwr_state = -1;



static inline void aic23_power_up(void)

{

}

static inline void aic23_power_down(void)

{

}



/*

 * audio_pwr_up / down should be called under audio_pwr_lock

 */

arch/arm/mach-omap1/board-osk.c

+0 −39
Original line number Diff line number Diff line
@@ -51,8 +51,6 @@ 
#include <mach/mux.h>

#include <mach/tc.h>

#include <mach/common.h>

#include <mach/mcbsp.h>

#include <mach/omap-alsa.h>



static struct mtd_partition osk_partitions[] = {

	/* bootloader (U-Boot, etc) in first sector */
@@ -141,47 +139,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[] = {