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

Commit 2b6678c5 authored by Scott Jiang's avatar Scott Jiang Committed by Mike Frysinger
Browse files

Blackfin: boards: fix pcm device name 



The pcm driver name has been changed, but the device name has not.

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

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

+28 −5
Original line number Original line Diff line number Diff line
@@ -539,9 +539,25 @@ static struct resource bfin_snd_resources[][4] = { 
	BFIN_SND_RES(0),

	BFIN_SND_RES(0),

	BFIN_SND_RES(1),

	BFIN_SND_RES(1),

};

};

#endif



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

static struct platform_device bfin_i2s_pcm = {

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

	.id = -1,

};

#endif





static struct platform_device bfin_pcm = {

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

	.name = "bfin-pcm-audio",

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",

	.id = -1,

	.id = -1,

};

};

#endif

#endif
@@ -1217,9 +1233,16 @@ 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) || \

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

	defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE)

	&bfin_i2s_pcm,

	&bfin_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

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

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

+28 −6
Original line number Original line Diff line number Diff line
@@ -2517,9 +2517,25 @@ static struct resource bfin_snd_resources[][4] = { 
	BFIN_SND_RES(0),

	BFIN_SND_RES(0),

	BFIN_SND_RES(1),

	BFIN_SND_RES(1),

};

};

#endif



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

static struct platform_device bfin_i2s_pcm = {

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

	.id = -1,

};

#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





static struct platform_device bfin_pcm = {

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

	.name = "bfin-pcm-audio",

static struct platform_device bfin_ac97_pcm = {

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

	.id = -1,

	.id = -1,

};

};

#endif

#endif
@@ -2754,10 +2770,16 @@ 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) || \

	&bfin_i2s_pcm,

	defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)

#endif

	&bfin_pcm,



#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

#endif





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

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