OSDN Git Service

bf609: use new SND_BF6XX_PCM to choose audio pcm driver
authorScott Jiang <scott.jiang.linux@gmail.com>
Thu, 31 Jul 2014 08:36:25 +0000 (16:36 +0800)
committerSteven Miao <realmz6@gmail.com>
Thu, 23 Apr 2015 13:34:27 +0000 (21:34 +0800)
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>
arch/blackfin/mach-bf609/boards/ezkit.c

index 7f9fc27..68cd895 100644 (file)
@@ -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,