| Message ID | 1425673154-28383-14-git-send-email-sjg@chromium.org |
|---|---|
| State | Accepted |
| Delegated to: | Simon Glass |
| Headers | show |
On 6 March 2015 at 13:19, Simon Glass <sjg@chromium.org> wrote: > Move this over to Kconfig and tidy up. > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > configs/snow_defconfig | 1 + > drivers/sound/Kconfig | 8 ++++++++ > include/configs/exynos5250-common.h | 5 ----- > 3 files changed, 9 insertions(+), 5 deletions(-) Applied to u-boot-dm/next.
diff --git a/configs/snow_defconfig b/configs/snow_defconfig index 70c2b22..7641ec5 100644 --- a/configs/snow_defconfig +++ b/configs/snow_defconfig @@ -12,3 +12,4 @@ CONFIG_SOUND=y CONFIG_CMD_SOUND=y CONFIG_I2S=y CONFIG_I2S_SAMSUNG=y +CONFIG_SOUND_MAX98095=y diff --git a/drivers/sound/Kconfig b/drivers/sound/Kconfig index cfc75cb..a1c950b 100644 --- a/drivers/sound/Kconfig +++ b/drivers/sound/Kconfig @@ -36,3 +36,11 @@ config SOUND_MAX98095 Enable the max98095 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_WM8994 + bool "Support Wolfson Micro wm8994 audio codec" + depends on I2S_SAMSUNG + help + Enable the wm8994 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. diff --git a/include/configs/exynos5250-common.h b/include/configs/exynos5250-common.h index 79a7adf..95e96ec 100644 --- a/include/configs/exynos5250-common.h +++ b/include/configs/exynos5250-common.h @@ -28,11 +28,6 @@ #define CONFIG_SYS_INIT_SP_ADDR CONFIG_IRAM_STACK -/* Sound */ -#ifdef CONFIG_CMD_SOUND -#define CONFIG_SOUND_WM8994 -#endif - /* I2C */ #define CONFIG_MAX_I2C_NUM 8
Move this over to Kconfig and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org> --- configs/snow_defconfig | 1 + drivers/sound/Kconfig | 8 ++++++++ include/configs/exynos5250-common.h | 5 ----- 3 files changed, 9 insertions(+), 5 deletions(-)