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

Commit 87fd83fd authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/blackfin' into asoc-next

parents 06b753d6 9cda8ad5

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

+0 −12
Original line number Diff line number Diff line
@@ -283,14 +283,6 @@ static struct platform_device bfin_i2s = { 
};

#endif



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

static struct platform_device bfin_tdm = {

	.name = "bfin-tdm",

	.id = CONFIG_SND_BF5XX_SPORT_NUM,

	/* TODO: add platform data here */

};

#endif



static struct spi_board_info bfin_spi_board_info[] __initdata = {

#if defined(CONFIG_MTD_M25P80) \

	|| defined(CONFIG_MTD_M25P80_MODULE)
@@ -800,10 +792,6 @@ static struct platform_device *stamp_devices[] __initdata = { 
#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)

	&bfin_i2s,

#endif



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

	&bfin_tdm,

#endif

};



static int __init ad7160eval_init(void)

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

+2 −30
Original line number Diff line number Diff line
@@ -493,8 +493,7 @@ static const struct ad7879_platform_data bfin_ad7879_ts_info = { 
};

#endif



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

	defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE)

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



static const u16 bfin_snd_pin[][7] = {

	{P_SPORT0_DTPRI, P_SPORT0_TSCLK, P_SPORT0_RFS,
@@ -549,13 +548,6 @@ static struct platform_device bfin_i2s_pcm = { 
};

#endif



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

static struct platform_device bfin_tdm_pcm = {

	.name = "bfin-tdm-pcm-audio",

	.id = -1,

};

#endif



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

static struct platform_device bfin_ac97_pcm = {

	.name = "bfin-ac97-pcm-audio",
@@ -575,22 +567,10 @@ static struct platform_device bfin_i2s = { 
};

#endif



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

static struct platform_device bfin_tdm = {

	.name = "bfin-tdm",

	.id = CONFIG_SND_BF5XX_SPORT_NUM,

	.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



#if defined(CONFIG_SND_BF5XX_SOC_AD1836) \

	        || defined(CONFIG_SND_BF5XX_SOC_AD1836_MODULE)

static const char * const ad1836_link[] = {

	"bfin-tdm.0",

	"bfin-i2s.0",

	"spi0.4",

};

static struct platform_device bfin_ad1836_machine = {
@@ -1269,10 +1249,6 @@ static struct platform_device *stamp_devices[] __initdata = { 
	&bfin_i2s_pcm,

#endif



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

	&bfin_tdm_pcm,

#endif



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

	&bfin_ac97_pcm,

#endif
@@ -1281,10 +1257,6 @@ static struct platform_device *stamp_devices[] __initdata = { 
	&bfin_i2s,

#endif



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

	&bfin_tdm,

#endif



#if defined(CONFIG_SND_BF5XX_SOC_AD1836) || \

	defined(CONFIG_SND_BF5XX_SOC_AD1836_MODULE)

	&bfin_ad1836_machine,

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

+0 −12
Original line number Diff line number Diff line
@@ -450,14 +450,6 @@ static struct platform_device bfin_i2s = { 
};

#endif



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

static struct platform_device bfin_tdm = {

	.name = "bfin-tdm",

	.id = CONFIG_SND_BF5XX_SPORT_NUM,

	/* TODO: add platform data here */

};

#endif



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

static struct platform_device bfin_ac97 = {

	.name = "bfin-ac97",
@@ -516,10 +508,6 @@ static struct platform_device *ezkit_devices[] __initdata = { 
	&bfin_i2s,

#endif



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

	&bfin_tdm,

#endif



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

	&bfin_ac97,

#endif

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

+2 −33
Original line number Diff line number Diff line
@@ -542,8 +542,7 @@ static struct platform_device bfin_dpmc = { 
};



#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) || \

	defined(CONFIG_SND_BF5XX_AC97_MODULE)



#include <asm/bfin_sport.h>
@@ -603,13 +602,6 @@ static struct platform_device bfin_i2s_pcm = { 
};

#endif



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

static struct platform_device bfin_tdm_pcm = {

	.name = "bfin-tdm-pcm-audio",

	.id = -1,

};

#endif



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

static struct platform_device bfin_ac97_pcm = {

	.name = "bfin-ac97-pcm-audio",
@@ -620,7 +612,7 @@ static struct platform_device bfin_ac97_pcm = { 
#if defined(CONFIG_SND_BF5XX_SOC_AD1836) \

	        || defined(CONFIG_SND_BF5XX_SOC_AD1836_MODULE)

static const char * const ad1836_link[] = {

	"bfin-tdm.0",

	"bfin-i2s.0",

	"spi0.4",

};

static struct platform_device bfin_ad1836_machine = {
@@ -675,20 +667,6 @@ static struct platform_device bfin_i2s = { 
};

#endif



#if defined(CONFIG_SND_BF5XX_SOC_TDM) || \

	defined(CONFIG_SND_BF5XX_SOC_TDM_MODULE)

static struct platform_device bfin_tdm = {

	.name = "bfin-tdm",

	.id = CONFIG_SND_BF5XX_SPORT_NUM,

	.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



#if defined(CONFIG_SND_BF5XX_SOC_AC97) || \

	defined(CONFIG_SND_BF5XX_SOC_AC97_MODULE)

static struct platform_device bfin_ac97 = {
@@ -761,10 +739,6 @@ static struct platform_device *stamp_devices[] __initdata = { 
	&bfin_i2s_pcm,

#endif



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

	&bfin_tdm_pcm,

#endif



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

	&bfin_ac97_pcm,

#endif
@@ -792,11 +766,6 @@ static struct platform_device *stamp_devices[] __initdata = { 
	&bfin_i2s,

#endif



#if defined(CONFIG_SND_BF5XX_SOC_TDM) || \

	defined(CONFIG_SND_BF5XX_SOC_TDM_MODULE)

	&bfin_tdm,

#endif



#if defined(CONFIG_SND_BF5XX_SOC_AC97) || \

	defined(CONFIG_SND_BF5XX_SOC_AC97_MODULE)

	&bfin_ac97,

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

+1 −29
Original line number Diff line number Diff line
@@ -2570,7 +2570,6 @@ static struct platform_device bfin_dpmc = { 
};



#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) \
@@ -2628,13 +2627,6 @@ static struct platform_device bfin_i2s_pcm = { 
};

#endif



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

static struct platform_device bfin_tdm_pcm = {

	.name = "bfin-tdm-pcm-audio",

	.id = -1,

};

#endif



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

static struct platform_device bfin_ac97_pcm = {

	.name = "bfin-ac97-pcm-audio",
@@ -2645,7 +2637,7 @@ static struct platform_device bfin_ac97_pcm = { 
#if defined(CONFIG_SND_BF5XX_SOC_AD1836) \

	        || defined(CONFIG_SND_BF5XX_SOC_AD1836_MODULE)

static const char * const ad1836_link[] = {

	"bfin-tdm.0",

	"bfin-i2s.0",

	"spi0.4",

};

static struct platform_device bfin_ad1836_machine = {
@@ -2699,18 +2691,6 @@ static struct platform_device bfin_i2s = { 
};

#endif



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

static struct platform_device bfin_tdm = {

	.name = "bfin-tdm",

	.id = CONFIG_SND_BF5XX_SPORT_NUM,

	.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



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

static struct platform_device bfin_ac97 = {

	.name = "bfin-ac97",
@@ -2935,10 +2915,6 @@ static struct platform_device *stamp_devices[] __initdata = { 
	&bfin_i2s_pcm,

#endif



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

	&bfin_tdm_pcm,

#endif



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

	&bfin_ac97_pcm,

#endif
@@ -2961,10 +2937,6 @@ static struct platform_device *stamp_devices[] __initdata = { 
	&bfin_i2s,

#endif



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

	&bfin_tdm,

#endif



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

	&bfin_ac97,

#endif