summaryrefslogtreecommitdiffstats
path: root/arch/blackfin
diff options
context:
space:
mode:
authorScott Jiang <scott.jiang.linux@gmail.com>2014-07-31 10:36:25 +0200
committerSteven Miao <realmz6@gmail.com>2015-04-23 15:34:27 +0200
commit374feb1f049b0a9eed62ac1b865c93b35aaef7c6 (patch)
tree0ae38c4d62ffec17586a73dce3c38f61898febe9 /arch/blackfin
parentbug[220] kgdb: change the smp cross core function entry (diff)
downloadlinux-374feb1f049b0a9eed62ac1b865c93b35aaef7c6.tar.xz
linux-374feb1f049b0a9eed62ac1b865c93b35aaef7c6.zip
bf609: use new SND_BF6XX_PCM to choose audio pcm driver
There is a new bf6xx audio dma driver, so we don't reuse bf5xx i2s pcm driver again. Signed-off-by: Scott Jiang <scott.jiang.linux@gmail.com>
Diffstat (limited to 'arch/blackfin')
-rw-r--r--arch/blackfin/mach-bf609/boards/ezkit.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/blackfin/mach-bf609/boards/ezkit.c b/arch/blackfin/mach-bf609/boards/ezkit.c
index 7f9fc272ec30..68cd89544a6a 100644
--- a/arch/blackfin/mach-bf609/boards/ezkit.c
+++ b/arch/blackfin/mach-bf609/boards/ezkit.c
@@ -780,8 +780,8 @@ static struct adi_spi3_chip spidev_chip_info = {
};
#endif
-#if IS_ENABLED(CONFIG_SND_BF5XX_I2S)
-static struct platform_device bfin_i2s_pcm = {
+#if IS_ENABLED(CONFIG_SND_BF6XX_PCM)
+static struct platform_device bfin_pcm = {
.name = "bfin-i2s-pcm-audio",
.id = -1,
};
@@ -2023,8 +2023,8 @@ static struct platform_device *ezkit_devices[] __initdata = {
#if IS_ENABLED(CONFIG_MTD_PHYSMAP)
&ezkit_flash_device,
#endif
-#if IS_ENABLED(CONFIG_SND_BF5XX_I2S)
- &bfin_i2s_pcm,
+#if IS_ENABLED(CONFIG_SND_BF6XX_PCM)
+ &bfin_pcm,
#endif
#if IS_ENABLED(CONFIG_SND_BF6XX_SOC_I2S)
&bfin_i2s,