diff options
author | Scott Jiang <scott.jiang.linux@gmail.com> | 2014-07-31 04:36:25 -0400 |
---|---|---|
committer | Steven Miao <realmz6@gmail.com> | 2015-04-23 09:34:27 -0400 |
commit | 374feb1f049b0a9eed62ac1b865c93b35aaef7c6 (patch) | |
tree | 0ae38c4d62ffec17586a73dce3c38f61898febe9 /arch/blackfin | |
parent | a0f4207d03b40eee6338b51288849965ac2b94e2 (diff) |
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.c | 8 |
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 = { | |||
780 | }; | 780 | }; |
781 | #endif | 781 | #endif |
782 | 782 | ||
783 | #if IS_ENABLED(CONFIG_SND_BF5XX_I2S) | 783 | #if IS_ENABLED(CONFIG_SND_BF6XX_PCM) |
784 | static struct platform_device bfin_i2s_pcm = { | 784 | static struct platform_device bfin_pcm = { |
785 | .name = "bfin-i2s-pcm-audio", | 785 | .name = "bfin-i2s-pcm-audio", |
786 | .id = -1, | 786 | .id = -1, |
787 | }; | 787 | }; |
@@ -2023,8 +2023,8 @@ static struct platform_device *ezkit_devices[] __initdata = { | |||
2023 | #if IS_ENABLED(CONFIG_MTD_PHYSMAP) | 2023 | #if IS_ENABLED(CONFIG_MTD_PHYSMAP) |
2024 | &ezkit_flash_device, | 2024 | &ezkit_flash_device, |
2025 | #endif | 2025 | #endif |
2026 | #if IS_ENABLED(CONFIG_SND_BF5XX_I2S) | 2026 | #if IS_ENABLED(CONFIG_SND_BF6XX_PCM) |
2027 | &bfin_i2s_pcm, | 2027 | &bfin_pcm, |
2028 | #endif | 2028 | #endif |
2029 | #if IS_ENABLED(CONFIG_SND_BF6XX_SOC_I2S) | 2029 | #if IS_ENABLED(CONFIG_SND_BF6XX_SOC_I2S) |
2030 | &bfin_i2s, | 2030 | &bfin_i2s, |