Merge tag 'dm-pull-10feb19' of git://git.denx.de/u-boot-dm

[oweals/u-boot.git] / drivers / sound / Kconfig

diff --git a/drivers/sound/Kconfig b/drivers/sound/Kconfig
index 93f6c36af32ca94b23460dde2c9a53706cddc83b..40f4f7598aae4e1b6c9798e4de1226b02188790f 100644 (file)
--- a/drivers/sound/Kconfig
+++ b/drivers/sound/Kconfig
@@ -12,12 +12,6 @@ config SOUND
          audio codecs are called from the sound-i2s code. This could be
          converted to driver model.
 
-config DM_SOUND
-       bool "Use driver model for sound"
-       help
-         Enable this option to use driver model for sound devices. This is a
-         migration option and will be removed.
-
 config I2S
        bool "Enable I2S support"
        depends on SOUND
@@ -27,9 +21,18 @@ config I2S
          I2S. It calls either of the two supported codecs (no use is made
          of driver model at present).
 
+config I2S_ROCKCHIP
+       bool "Enable I2S support for Rockchip SoCs"
+       depends on I2S
+       help
+         Rockchip SoCs support an I2S interface for sending audio data to an
+         audio codec. This option enables support for this, using one of the
+         available audio codec drivers. This driver does not make use of
+         DMA, but writes each word directly to the hardware.
+
 config I2S_SAMSUNG
        bool "Enable I2C support for Samsung SoCs"
-       depends on SOUND
+       depends on I2S
        help
          Samsung Exynos SoCs support an I2S interface for sending audio
          data to an audio codec. This option enables support for this,
@@ -37,9 +40,25 @@ config I2S_SAMSUNG
          option provides an implementation for sound_init() and
          sound_play().
 
+config SOUND_MAX98088
+       bool "Support Maxim max98088 audio codec"
+       depends on I2S
+       help
+         Enable the max98088 audio codec. This is connected via I2S for
+         audio data and I2C for codec control. At present it only works
+         with the Samsung I2S driver.
+
+config SOUND_MAX98090
+       bool "Support Maxim max98090 audio codec"
+       depends on I2S
+       help
+         Enable the max98090 audio codec. This is connected via I2S for
+         audio data and I2C for codec control. At present it only works
+         with the Samsung I2S driver.
+
 config SOUND_MAX98095
        bool "Support Maxim max98095 audio codec"
-       depends on I2S_SAMSUNG
+       depends on I2S
        help
          Enable the max98095 audio codec. This is connected via I2S for
          audio data and I2C for codec control. At present it only works