diff options
| -rw-r--r-- | sound/soc/blackfin/Kconfig | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sound/soc/blackfin/Kconfig b/sound/soc/blackfin/Kconfig index 54f74f8cbb75..4544d8eb1452 100644 --- a/sound/soc/blackfin/Kconfig +++ b/sound/soc/blackfin/Kconfig | |||
| @@ -11,7 +11,7 @@ config SND_BF5XX_I2S | |||
| 11 | 11 | ||
| 12 | config SND_BF5XX_SOC_SSM2602 | 12 | config SND_BF5XX_SOC_SSM2602 |
| 13 | tristate "SoC SSM2602 Audio Codec Add-On Card support" | 13 | tristate "SoC SSM2602 Audio Codec Add-On Card support" |
| 14 | depends on SND_BF5XX_I2S && (SPI_MASTER || I2C) | 14 | depends on SND_BF5XX_I2S && SND_SOC_I2C_AND_SPI |
| 15 | select SND_BF5XX_SOC_I2S if !BF60x | 15 | select SND_BF5XX_SOC_I2S if !BF60x |
| 16 | select SND_BF6XX_SOC_I2S if BF60x | 16 | select SND_BF6XX_SOC_I2S if BF60x |
| 17 | select SND_SOC_SSM2602 | 17 | select SND_SOC_SSM2602 |
| @@ -21,10 +21,9 @@ config SND_BF5XX_SOC_SSM2602 | |||
| 21 | 21 | ||
| 22 | config SND_SOC_BFIN_EVAL_ADAU1701 | 22 | config SND_SOC_BFIN_EVAL_ADAU1701 |
| 23 | tristate "Support for the EVAL-ADAU1701MINIZ board on Blackfin eval boards" | 23 | tristate "Support for the EVAL-ADAU1701MINIZ board on Blackfin eval boards" |
| 24 | depends on SND_BF5XX_I2S | 24 | depends on SND_BF5XX_I2S && I2C |
| 25 | select SND_BF5XX_SOC_I2S | 25 | select SND_BF5XX_SOC_I2S |
| 26 | select SND_SOC_ADAU1701 | 26 | select SND_SOC_ADAU1701 |
| 27 | select I2C | ||
| 28 | help | 27 | help |
| 29 | Say Y if you want to add support for the Analog Devices EVAL-ADAU1701MINIZ | 28 | Say Y if you want to add support for the Analog Devices EVAL-ADAU1701MINIZ |
| 30 | board connected to one of the Blackfin evaluation boards like the | 29 | board connected to one of the Blackfin evaluation boards like the |
| @@ -45,7 +44,7 @@ config SND_SOC_BFIN_EVAL_ADAU1373 | |||
| 45 | 44 | ||
| 46 | config SND_SOC_BFIN_EVAL_ADAV80X | 45 | config SND_SOC_BFIN_EVAL_ADAV80X |
| 47 | tristate "Support for the EVAL-ADAV80X boards on Blackfin eval boards" | 46 | tristate "Support for the EVAL-ADAV80X boards on Blackfin eval boards" |
| 48 | depends on SND_BF5XX_I2S && (SPI_MASTER || I2C) | 47 | depends on SND_BF5XX_I2S && SND_SOC_I2C_AND_SPI |
| 49 | select SND_BF5XX_SOC_I2S | 48 | select SND_BF5XX_SOC_I2S |
| 50 | select SND_SOC_ADAV80X | 49 | select SND_SOC_ADAV80X |
| 51 | help | 50 | help |
| @@ -58,7 +57,7 @@ config SND_SOC_BFIN_EVAL_ADAV80X | |||
| 58 | 57 | ||
| 59 | config SND_BF5XX_SOC_AD1836 | 58 | config SND_BF5XX_SOC_AD1836 |
| 60 | tristate "SoC AD1836 Audio support for BF5xx" | 59 | tristate "SoC AD1836 Audio support for BF5xx" |
| 61 | depends on SND_BF5XX_I2S | 60 | depends on SND_BF5XX_I2S && SPI_MASTER |
| 62 | select SND_BF5XX_SOC_I2S | 61 | select SND_BF5XX_SOC_I2S |
| 63 | select SND_SOC_AD1836 | 62 | select SND_SOC_AD1836 |
| 64 | help | 63 | help |
| @@ -66,7 +65,7 @@ config SND_BF5XX_SOC_AD1836 | |||
| 66 | 65 | ||
| 67 | config SND_BF5XX_SOC_AD193X | 66 | config SND_BF5XX_SOC_AD193X |
| 68 | tristate "SoC AD193X Audio support for Blackfin" | 67 | tristate "SoC AD193X Audio support for Blackfin" |
| 69 | depends on SND_BF5XX_I2S | 68 | depends on SND_BF5XX_I2S && SND_SOC_I2C_AND_SPI |
| 70 | select SND_BF5XX_SOC_I2S | 69 | select SND_BF5XX_SOC_I2S |
| 71 | select SND_SOC_AD193X | 70 | select SND_SOC_AD193X |
| 72 | help | 71 | help |