diff options
| author | Simon Glass <sjg@chromium.org> | 2019-01-11 18:37:10 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2019-02-09 12:50:22 -0700 |
| commit | 8d135f5c6f6b52c3a3de4512d8f838a9dbb2f6b5 (patch) | |
| tree | bca112fd5774df296a42a86d7bc96645a6138304 | |
| parent | 9a7210f6a4ca0fe2cf6231ae812cae60e54f0fad (diff) | |
| download | u-boot-8d135f5c6f6b52c3a3de4512d8f838a9dbb2f6b5.tar.gz u-boot-8d135f5c6f6b52c3a3de4512d8f838a9dbb2f6b5.tar.bz2 u-boot-8d135f5c6f6b52c3a3de4512d8f838a9dbb2f6b5.zip | |
spring: Update sound to use max98088 codec
Update the spring settings to use this codec, which is what it actually
shipped with.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
| -rw-r--r-- | arch/arm/dts/exynos5250-spring.dts | 36 | ||||
| -rw-r--r-- | configs/spring_defconfig | 1 |
2 files changed, 19 insertions, 18 deletions
diff --git a/arch/arm/dts/exynos5250-spring.dts b/arch/arm/dts/exynos5250-spring.dts index 191e12af6a..942f502775 100644 --- a/arch/arm/dts/exynos5250-spring.dts +++ b/arch/arm/dts/exynos5250-spring.dts @@ -93,6 +93,22 @@ samsung,vbus-gpio = <&gpx2 7 GPIO_ACTIVE_HIGH>; }; + sound { + compatible = "google,spring-audio-max98088"; + + samsung,model = "Spring-I2S-MAX98088"; + samsung,audio-codec = <&max98088>; + codec-enable-gpio = <&gpx1 7 0>; + + cpu { + sound-dai = <&i2s1 0>; + }; + + codec { + sound-dai = <&max98088 0>; + }; + }; + spi@12d30000 { spi-max-frequency = <50000000>; firmware_storage_spi: flash@0 { @@ -638,27 +654,11 @@ }; }; - max98095: soundcodec@10 { + max98088: soundcodec@10 { reg = <0x10>; - compatible = "maxim,max98095"; + compatible = "maxim,max98088"; #sound-dai-cells = <1>; }; - - sound { - compatible = "google,spring-audio-max98095"; - - samsung,model = "Spring-I2S-MAX98095"; - samsung,audio-codec = <&max98095>; - - cpu { - sound-dai = <&i2s0 0>; - }; - - codec { - sound-dai = <&max98095 0>; - }; - }; - }; #include "cros-ec-keyboard.dtsi" diff --git a/configs/spring_defconfig b/configs/spring_defconfig index 5c5569acd2..c0084289d9 100644 --- a/configs/spring_defconfig +++ b/configs/spring_defconfig @@ -62,6 +62,7 @@ CONFIG_DEBUG_UART_S5P=y CONFIG_SOUND=y CONFIG_I2S=y CONFIG_I2S_SAMSUNG=y +CONFIG_SOUND_MAX98088=y CONFIG_SOUND_MAX98095=y CONFIG_SOUND_WM8994=y CONFIG_EXYNOS_SPI=y |