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

Commit 6f53dbbb authored by Scott Jiang's avatar Scott Jiang Committed by Mike Frysinger
Browse files

Blackfin: boards: update ASoC resources after machine driver overhaul 



Now that the Blackfin machine drivers have been updated to the
multicomponent support, update the resources to match.  The pin
settings are now a board issue and removed from the driver.

Signed-off-by: default avatarScott Jiang <scott.jiang@analog.com>
Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
parent f9691bb9

arch/blackfin/include/asm/bfin_sport.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -100,6 +100,10 @@ struct sport_register { 
};

};

#undef __BFP

#undef __BFP





struct bfin_snd_platform_data {

	const unsigned short *pin_req;

};



#define bfin_read_sport_rx32(base) \

#define bfin_read_sport_rx32(base) \

({ \

({ \

	struct sport_register *__mmrs = (void *)base; \

	struct sport_register *__mmrs = (void *)base; \

arch/blackfin/mach-bf527/boards/ezkit.c

+72 −2
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <asm/portmux.h>

#include <asm/portmux.h>

#include <asm/dpmc.h>

#include <asm/dpmc.h>

#include <linux/spi/ad7877.h>

#include <linux/spi/ad7877.h>

#include <asm/bfin_sport.h>





/*

/*

 * Name the Board for the /proc/cpuinfo

 * Name the Board for the /proc/cpuinfo
@@ -526,11 +527,69 @@ static struct bfin5xx_spi_chip spidev_chip_info = { 
};

};

#endif

#endif





#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) || \

	defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE)



static const u16 bfin_snd_pin[][7] = {

	{P_SPORT0_DTPRI, P_SPORT0_TSCLK, P_SPORT0_RFS,

		P_SPORT0_DRPRI, P_SPORT0_RSCLK, 0, 0},

	{P_SPORT1_DTPRI, P_SPORT1_TSCLK, P_SPORT1_RFS,

		P_SPORT1_DRPRI, P_SPORT1_RSCLK, P_SPORT1_TFS, 0},

};



static struct bfin_snd_platform_data bfin_snd_data[] = {

	{

		.pin_req = &bfin_snd_pin[0][0],

	},

	{

		.pin_req = &bfin_snd_pin[1][0],

	},

};



#define BFIN_SND_RES(x) \

	[x] = { \

		{ \

			.start = SPORT##x##_TCR1, \

			.end = SPORT##x##_TCR1, \

			.flags = IORESOURCE_MEM \

		}, \

		{ \

			.start = CH_SPORT##x##_RX, \

			.end = CH_SPORT##x##_RX, \

			.flags = IORESOURCE_DMA, \

		}, \

		{ \

			.start = CH_SPORT##x##_TX, \

			.end = CH_SPORT##x##_TX, \

			.flags = IORESOURCE_DMA, \

		}, \

		{ \

			.start = IRQ_SPORT##x##_ERROR, \

			.end = IRQ_SPORT##x##_ERROR, \

			.flags = IORESOURCE_IRQ, \

		} \

	}



static struct resource bfin_snd_resources[][4] = {

	BFIN_SND_RES(0),

	BFIN_SND_RES(1),

};



static struct platform_device bfin_pcm = {

	.name = "bfin-pcm-audio",

	.id = -1,

};

#endif



#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)

#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)

static struct platform_device bfin_i2s = {

static struct platform_device bfin_i2s = {

	.name = "bfin-i2s",

	.name = "bfin-i2s",

	.id = CONFIG_SND_BF5XX_SPORT_NUM,

	.id = CONFIG_SND_BF5XX_SPORT_NUM,

	/* TODO: add platform data here */

	.num_resources = ARRAY_SIZE(bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM]),

	.resource = bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM],

	.dev = {

		.platform_data = &bfin_snd_data[CONFIG_SND_BF5XX_SPORT_NUM],

	},

};

};

#endif

#endif
@@ -538,7 +597,11 @@ static struct platform_device bfin_i2s = { 
static struct platform_device bfin_tdm = {

static struct platform_device bfin_tdm = {

	.name = "bfin-tdm",

	.name = "bfin-tdm",

	.id = CONFIG_SND_BF5XX_SPORT_NUM,

	.id = CONFIG_SND_BF5XX_SPORT_NUM,

	/* TODO: add platform data here */

	.num_resources = ARRAY_SIZE(bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM]),

	.resource = bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM],

	.dev = {

		.platform_data = &bfin_snd_data[CONFIG_SND_BF5XX_SPORT_NUM],

	},

};

};

#endif

#endif
@@ -583,7 +646,9 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { 
		.max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */

		.max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */

		.bus_num = 0,

		.bus_num = 0,

		.chip_select = 4,

		.chip_select = 4,

		.platform_data = "ad1836",

		.controller_data = &ad1836_spi_chip_info,

		.controller_data = &ad1836_spi_chip_info,

		.mode = SPI_MODE_3,

	},

	},

#endif

#endif

#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)

#if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
@@ -1211,6 +1276,11 @@ static struct platform_device *stamp_devices[] __initdata = { 
	&ezkit_flash_device,

	&ezkit_flash_device,

#endif

#endif





#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) || \

	defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE)

	&bfin_pcm,

#endif



#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)

#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)

	&bfin_i2s,

	&bfin_i2s,

#endif

#endif

arch/blackfin/mach-bf537/boards/stamp.c

+97 −9
Original line number Original line Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <asm/reboot.h>

#include <asm/reboot.h>

#include <asm/portmux.h>

#include <asm/portmux.h>

#include <asm/dpmc.h>

#include <asm/dpmc.h>

#include <asm/bfin_sport.h>

#ifdef CONFIG_REGULATOR_FIXED_VOLTAGE

#ifdef CONFIG_REGULATOR_FIXED_VOLTAGE

#include <linux/regulator/fixed.h>

#include <linux/regulator/fixed.h>

#endif

#endif
@@ -2585,27 +2586,103 @@ static struct platform_device bfin_dpmc = { 
	},

	},

};

};





#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)

#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) || \

	defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) || \

	defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)



#define SPORT_REQ(x) \

	[x] = {P_SPORT##x##_TFS, P_SPORT##x##_DTPRI, P_SPORT##x##_TSCLK, \

		P_SPORT##x##_RFS, P_SPORT##x##_DRPRI, P_SPORT##x##_RSCLK, 0}



static const u16 bfin_snd_pin[][7] = {

	SPORT_REQ(0),

	SPORT_REQ(1),

};



static struct bfin_snd_platform_data bfin_snd_data[] = {

	{

		.pin_req = &bfin_snd_pin[0][0],

	},

	{

		.pin_req = &bfin_snd_pin[1][0],

	},

};



#define BFIN_SND_RES(x) \

	[x] = { \

		{ \

			.start = SPORT##x##_TCR1, \

			.end = SPORT##x##_TCR1, \

			.flags = IORESOURCE_MEM \

		}, \

		{ \

			.start = CH_SPORT##x##_RX, \

			.end = CH_SPORT##x##_RX, \

			.flags = IORESOURCE_DMA, \

		}, \

		{ \

			.start = CH_SPORT##x##_TX, \

			.end = CH_SPORT##x##_TX, \

			.flags = IORESOURCE_DMA, \

		}, \

		{ \

			.start = IRQ_SPORT##x##_ERROR, \

			.end = IRQ_SPORT##x##_ERROR, \

			.flags = IORESOURCE_IRQ, \

		} \

	}



static struct resource bfin_snd_resources[][4] = {

	BFIN_SND_RES(0),

	BFIN_SND_RES(1),

};



static struct platform_device bfin_pcm = {

	.name = "bfin-pcm-audio",

	.id = -1,

};

#endif



#if defined(CONFIG_SND_BF5XX_SOC_AD73311) || defined(CONFIG_SND_BF5XX_SOC_AD73311_MODULE)

static struct platform_device bfin_ad73311_codec_device = {

	.name = "ad73311",

	.id = -1,

};

#endif



#if defined(CONFIG_SND_BF5XX_SOC_I2S) || defined(CONFIG_SND_BF5XX_SOC_I2S_MODULE)

static struct platform_device bfin_i2s = {

static struct platform_device bfin_i2s = {

	.name = "bfin-i2s",

	.name = "bfin-i2s",

	.id = CONFIG_SND_BF5XX_SPORT_NUM,

	.id = CONFIG_SND_BF5XX_SPORT_NUM,

	/* TODO: add platform data here */

	.num_resources = ARRAY_SIZE(bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM]),

	.resource = bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM],

	.dev = {

		.platform_data = &bfin_snd_data[CONFIG_SND_BF5XX_SPORT_NUM],

	},

};

};

#endif

#endif





#if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE)

#if defined(CONFIG_SND_BF5XX_SOC_TDM) || defined(CONFIG_SND_BF5XX_SOC_TDM_MODULE)

static struct platform_device bfin_tdm = {

static struct platform_device bfin_tdm = {

	.name = "bfin-tdm",

	.name = "bfin-tdm",

	.id = CONFIG_SND_BF5XX_SPORT_NUM,

	.id = CONFIG_SND_BF5XX_SPORT_NUM,

	/* TODO: add platform data here */

	.num_resources = ARRAY_SIZE(bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM]),

	.resource = bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM],

	.dev = {

		.platform_data = &bfin_snd_data[CONFIG_SND_BF5XX_SPORT_NUM],

	},

};

};

#endif

#endif





#if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)

#if defined(CONFIG_SND_BF5XX_SOC_AC97) || defined(CONFIG_SND_BF5XX_SOC_AC97_MODULE)

static struct platform_device bfin_ac97 = {

static struct platform_device bfin_ac97 = {

	.name = "bfin-ac97",

	.name = "bfin-ac97",

	.id = CONFIG_SND_BF5XX_SPORT_NUM,

	.id = CONFIG_SND_BF5XX_SPORT_NUM,

	/* TODO: add platform data here */

	.num_resources = ARRAY_SIZE(bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM]),

	.resource = bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM],

	.dev = {

		.platform_data = &bfin_snd_data[CONFIG_SND_BF5XX_SPORT_NUM],

	},

};

};

#endif

#endif
@@ -2796,17 +2873,28 @@ static struct platform_device *stamp_devices[] __initdata = { 
	&stamp_flash_device,

	&stamp_flash_device,

#endif

#endif





#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)

#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) || \

	defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) || \

	defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)

	&bfin_pcm,

#endif



#if defined(CONFIG_SND_BF5XX_SOC_AD73311) || defined(CONFIG_SND_BF5XX_SOC_AD73311_MODULE)

	&bfin_ad73311_codec_device,

#endif



#if defined(CONFIG_SND_BF5XX_SOC_I2S) || defined(CONFIG_SND_BF5XX_SOC_I2S_MODULE)

	&bfin_i2s,

	&bfin_i2s,

#endif

#endif





#if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE)

#if defined(CONFIG_SND_BF5XX_SOC_TDM) || defined(CONFIG_SND_BF5XX_SOC_TDM_MODULE)

	&bfin_tdm,

	&bfin_tdm,

#endif

#endif





#if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)

#if defined(CONFIG_SND_BF5XX_SOC_AC97) || defined(CONFIG_SND_BF5XX_SOC_AC97_MODULE)

	&bfin_ac97,

	&bfin_ac97,

#endif

#endif



#if defined(CONFIG_REGULATOR_AD5398) || defined(CONFIG_REGULATOR_AD5398_MODULE)

#if defined(CONFIG_REGULATOR_AD5398) || defined(CONFIG_REGULATOR_AD5398_MODULE)

#if defined(CONFIG_REGULATOR_VIRTUAL_CONSUMER) || \

#if defined(CONFIG_REGULATOR_VIRTUAL_CONSUMER) || \

	defined(CONFIG_REGULATOR_VIRTUAL_CONSUMER_MODULE)

	defined(CONFIG_REGULATOR_VIRTUAL_CONSUMER_MODULE)

arch/blackfin/mach-bf548/boards/ezkit.c

+100 −6
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <asm/gpio.h>

#include <asm/gpio.h>

#include <asm/nand.h>

#include <asm/nand.h>

#include <asm/dpmc.h>

#include <asm/dpmc.h>

#include <asm/bfin_sport.h>

#include <asm/portmux.h>

#include <asm/portmux.h>

#include <asm/bfin_sdh.h>

#include <asm/bfin_sdh.h>

#include <mach/bf54x_keys.h>

#include <mach/bf54x_keys.h>
@@ -1320,27 +1321,110 @@ static struct platform_device bfin_dpmc = { 
	},

	},

};

};





#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)

#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) || \

	defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) || \

	defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)



#define SPORT_REQ(x) \

	[x] = {P_SPORT##x##_TFS, P_SPORT##x##_DTPRI, P_SPORT##x##_TSCLK, \

		P_SPORT##x##_RFS, P_SPORT##x##_DRPRI, P_SPORT##x##_RSCLK, 0}



static const u16 bfin_snd_pin[][7] = {

	SPORT_REQ(0),

	SPORT_REQ(1),

};



static struct bfin_snd_platform_data bfin_snd_data[] = {

	{

		.pin_req = &bfin_snd_pin[0][0],

	},

	{

		.pin_req = &bfin_snd_pin[1][0],

	},

};



#define BFIN_SND_RES(x) \

	[x] = { \

		{ \

			.start = SPORT##x##_TCR1, \

			.end = SPORT##x##_TCR1, \

			.flags = IORESOURCE_MEM \

		}, \

		{ \

			.start = CH_SPORT##x##_RX, \

			.end = CH_SPORT##x##_RX, \

			.flags = IORESOURCE_DMA, \

		}, \

		{ \

			.start = CH_SPORT##x##_TX, \

			.end = CH_SPORT##x##_TX, \

			.flags = IORESOURCE_DMA, \

		}, \

		{ \

			.start = IRQ_SPORT##x##_ERROR, \

			.end = IRQ_SPORT##x##_ERROR, \

			.flags = IORESOURCE_IRQ, \

		} \

	}



static struct resource bfin_snd_resources[][4] = {

	BFIN_SND_RES(0),

	BFIN_SND_RES(1),

};



static struct platform_device bfin_pcm = {

	.name = "bfin-pcm-audio",

	.id = -1,

};

#endif



#if defined(CONFIG_SND_BF5XX_SOC_AD73311) || defined(CONFIG_SND_BF5XX_SOC_AD73311_MODULE)

static struct platform_device bfin_ad73311_codec_device = {

	.name = "ad73311",

	.id = -1,

};

#endif



#if defined(CONFIG_SND_BF5XX_SOC_AD1980) || defined(CONFIG_SND_BF5XX_SOC_AD1980_MODULE)

static struct platform_device bfin_ad1980_codec_device = {

	.name = "ad1980",

	.id = -1,

};

#endif



#if defined(CONFIG_SND_BF5XX_SOC_I2S) || defined(CONFIG_SND_BF5XX_SOC_I2S_MODULE)

static struct platform_device bfin_i2s = {

static struct platform_device bfin_i2s = {

	.name = "bfin-i2s",

	.name = "bfin-i2s",

	.id = CONFIG_SND_BF5XX_SPORT_NUM,

	.id = CONFIG_SND_BF5XX_SPORT_NUM,

	/* TODO: add platform data here */

	.num_resources = ARRAY_SIZE(bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM]),

	.resource = bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM],

	.dev = {

		.platform_data = &bfin_snd_data[CONFIG_SND_BF5XX_SPORT_NUM],

	},

};

};

#endif

#endif





#if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE)

#if defined(CONFIG_SND_BF5XX_SOC_TDM) || defined(CONFIG_SND_BF5XX_SOC_TDM_MODULE)

static struct platform_device bfin_tdm = {

static struct platform_device bfin_tdm = {

	.name = "bfin-tdm",

	.name = "bfin-tdm",

	.id = CONFIG_SND_BF5XX_SPORT_NUM,

	.id = CONFIG_SND_BF5XX_SPORT_NUM,

	/* TODO: add platform data here */

	.num_resources = ARRAY_SIZE(bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM]),

	.resource = bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM],

	.dev = {

		.platform_data = &bfin_snd_data[CONFIG_SND_BF5XX_SPORT_NUM],

	},

};

};

#endif

#endif





#if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)

#if defined(CONFIG_SND_BF5XX_SOC_AC97) || defined(CONFIG_SND_BF5XX_SOC_AC97_MODULE)

static struct platform_device bfin_ac97 = {

static struct platform_device bfin_ac97 = {

	.name = "bfin-ac97",

	.name = "bfin-ac97",

	.id = CONFIG_SND_BF5XX_SPORT_NUM,

	.id = CONFIG_SND_BF5XX_SPORT_NUM,

	/* TODO: add platform data here */

	.num_resources = ARRAY_SIZE(bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM]),

	.resource = bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM],

	.dev = {

		.platform_data = &bfin_snd_data[CONFIG_SND_BF5XX_SPORT_NUM],

	},

};

};

#endif

#endif
@@ -1458,6 +1542,16 @@ static struct platform_device *ezkit_devices[] __initdata = { 
	&ezkit_flash_device,

	&ezkit_flash_device,

#endif

#endif





#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) || \

	defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) || \

	defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)

	&bfin_pcm,

#endif



#if defined(CONFIG_SND_BF5XX_SOC_AD1980) || defined(CONFIG_SND_BF5XX_SOC_AD1980_MODULE)

	&bfin_ad1980_codec_device,

#endif



#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)

#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)

	&bfin_i2s,

	&bfin_i2s,

#endif

#endif