commit: http://blackfin.uclinux.org/git/?p=linux-kernel;a=commitdiff;h=a39a17ec580ae153926ae619fa388d871d6f3a64 branch: http://blackfin.uclinux.org/git/?p=linux-kernel;a=shortlog;h=refs/heads/2012R1
It's the same for both bf5xx and bf6xx soc. Signed-off-by: Scott Jiang <[email protected]> --- sound/soc/blackfin/Kconfig | 36 ++++++++++++++---------------------- sound/soc/blackfin/Makefile | 2 -- sound/soc/blackfin/bf6xx-i2s.c | 13 +------------ sound/soc/blackfin/bf6xx-sport.c | 2 +- 4 files changed, 16 insertions(+), 37 deletions(-) diff --git a/sound/soc/blackfin/Kconfig b/sound/soc/blackfin/Kconfig index 9ad4e52..31ef11b 100644 --- a/sound/soc/blackfin/Kconfig +++ b/sound/soc/blackfin/Kconfig @@ -1,17 +1,8 @@ config SND_BF5XX_I2S - tristate "SoC I2S Audio for the ADI BF5xx chip" - depends on BLACKFIN && !BF60x - select SND_BF5XX_SOC_SPORT - help - Say Y or M if you want to add support for codecs attached to - the Blackfin SPORT (synchronous serial ports) interface in I2S - mode (supports single stereo In/Out). - You will also need to select the audio interfaces to support below. - -config SND_BF6XX_I2S - tristate "SoC I2S Audio for the ADI BF6xx chip" - depends on BLACKFIN && BF60x - select SND_BF6XX_SOC_SPORT + tristate "SoC I2S Audio for the ADI Blackfin chip" + depends on BLACKFIN + select SND_BF5XX_SOC_SPORT if !BF60x + select SND_BF6XX_SOC_SPORT if BF60x help Say Y or M if you want to add support for codecs attached to the Blackfin SPORT (synchronous serial ports) interface in I2S @@ -19,13 +10,14 @@ config SND_BF6XX_I2S You will also need to select the audio interfaces to support below. config SND_BF5XX_SOC_SSM2602 - tristate "SoC SSM2602 Audio support for BF52x ezkit" - depends on (SND_BF5XX_I2S || SND_BF6XX_I2S) && (SPI_MASTER || I2C) - select SND_BF5XX_SOC_I2S if SND_BF5XX_I2S - select SND_BF6XX_SOC_I2S if SND_BF6XX_I2S + tristate "SoC SSM2602 Audio Codec Add-On Card support" + depends on SND_BF5XX_I2S && (SPI_MASTER || I2C) + select SND_BF5XX_SOC_I2S if !BF60x + select SND_BF6XX_SOC_I2S if BF60x select SND_SOC_SSM2602 help - Say Y if you want to add support for SoC audio on BF527-EZKIT. + Say Y if you want to add support for the Analog Devices + SSM2602 Audio Codec Add-On Card. config SND_SOC_BFIN_EVAL_ADAU1701 tristate "Support for the EVAL-ADAU1701MINIZ board on Blackfin eval boards" @@ -53,9 +45,9 @@ config SND_SOC_BFIN_EVAL_ADAU1373 config SND_SOC_BFIN_EVAL_ADAU1X61 tristate "Support for the EVAL-ADAU1X61 board on Blackfin eval boards" - depends on (SND_BF5XX_I2S || SND_BF6XX_I2S) && I2C - select SND_BF5XX_SOC_I2S if SND_BF5XX_I2S - select SND_BF6XX_SOC_I2S if SND_BF6XX_I2S + depends on SND_BF5XX_I2S && I2C + select SND_BF5XX_SOC_I2S if !BF60x + select SND_BF6XX_SOC_I2S if BF60x select SND_SOC_ADAU1761 help Say Y if you want to add support for the Analog Devices EVAL-ADAU1X61 @@ -235,7 +227,7 @@ config SND_BF5XX_SOC_AC97 config SND_BF5XX_SPORT_NUM int "Set a SPORT for Sound chip" - depends on (BLACKFIN && SND_SOC) + depends on (SND_BF5XX_SOC_SPORT || SND_BF6XX_SOC_SPORT) range 0 3 if BF54x range 0 1 if !BF54x default 0 diff --git a/sound/soc/blackfin/Makefile b/sound/soc/blackfin/Makefile index 70cc7e2..42aa56b 100644 --- a/sound/soc/blackfin/Makefile +++ b/sound/soc/blackfin/Makefile @@ -1,7 +1,6 @@ # Blackfin Platform Support snd-bf5xx-ac97-objs := bf5xx-ac97-pcm.o snd-bf5xx-i2s-objs := bf5xx-i2s-pcm.o -snd-bf6xx-i2s-objs := bf6xx-i2s-pcm.o snd-bf5xx-tdm-objs := bf5xx-tdm-pcm.o snd-soc-bf5xx-sport-objs := bf5xx-sport.o snd-soc-bf6xx-sport-objs := bf6xx-sport.o @@ -12,7 +11,6 @@ snd-soc-bf5xx-tdm-objs := bf5xx-tdm.o obj-$(CONFIG_SND_BF5XX_AC97) += snd-bf5xx-ac97.o obj-$(CONFIG_SND_BF5XX_I2S) += snd-bf5xx-i2s.o -obj-$(CONFIG_SND_BF6XX_I2S) += snd-bf6xx-i2s.o obj-$(CONFIG_SND_BF5XX_TDM) += snd-bf5xx-tdm.o obj-$(CONFIG_SND_BF5XX_SOC_SPORT) += snd-soc-bf5xx-sport.o obj-$(CONFIG_SND_BF6XX_SOC_SPORT) += snd-soc-bf6xx-sport.o diff --git a/sound/soc/blackfin/bf6xx-i2s.c b/sound/soc/blackfin/bf6xx-i2s.c index c4a5499..c3c2466 100644 --- a/sound/soc/blackfin/bf6xx-i2s.c +++ b/sound/soc/blackfin/bf6xx-i2s.c @@ -227,18 +227,7 @@ static struct platform_driver bfin_i2s_driver = { }, }; -static int __init bfin_i2s_init(void) -{ - return platform_driver_register(&bfin_i2s_driver); -} - -static void __exit bfin_i2s_exit(void) -{ - platform_driver_unregister(&bfin_i2s_driver); -} - -module_init(bfin_i2s_init); -module_exit(bfin_i2s_exit); +module_platform_driver(bfin_i2s_driver); MODULE_DESCRIPTION("Analog Devices BF6XX i2s interface driver"); MODULE_AUTHOR("Scott Jiang <[email protected]>"); diff --git a/sound/soc/blackfin/bf6xx-sport.c b/sound/soc/blackfin/bf6xx-sport.c index ea4b844..f19a72b 100644 --- a/sound/soc/blackfin/bf6xx-sport.c +++ b/sound/soc/blackfin/bf6xx-sport.c @@ -406,7 +406,7 @@ struct sport_device *sport_create(struct platform_device *pdev) return NULL; } - dev_info(dev, "SPORT create success\n"); + dev_dbg(dev, "SPORT create success\n"); return sport; } EXPORT_SYMBOL(sport_create);
_______________________________________________ Linux-kernel-commits mailing list [email protected] https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
