Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95d67c7f authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/samsung' into asoc-linus

parents c6eb1fa4 014c4d63

sound/soc/samsung/Kconfig

+5 −5
Original line number Original line Diff line number Diff line
@@ -174,7 +174,7 @@ config SND_SOC_SMDK_WM8994_PCM 




config SND_SOC_SPEYSIDE

config SND_SOC_SPEYSIDE

	tristate "Audio support for Wolfson Speyside"

	tristate "Audio support for Wolfson Speyside"

	depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410

	depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 && I2C && SPI_MASTER

	select SND_SAMSUNG_I2S

	select SND_SAMSUNG_I2S

	select SND_SOC_WM8996

	select SND_SOC_WM8996

	select SND_SOC_WM9081

	select SND_SOC_WM9081
@@ -189,7 +189,7 @@ config SND_SOC_TOBERMORY 




config SND_SOC_BELLS

config SND_SOC_BELLS

	tristate "Audio support for Wolfson Bells"

	tristate "Audio support for Wolfson Bells"

	depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 && MFD_ARIZONA

	depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 && MFD_ARIZONA && I2C && SPI_MASTER

	select SND_SAMSUNG_I2S

	select SND_SAMSUNG_I2S

	select SND_SOC_WM5102

	select SND_SOC_WM5102

	select SND_SOC_WM5110

	select SND_SOC_WM5110
@@ -206,7 +206,7 @@ config SND_SOC_LOWLAND 




config SND_SOC_LITTLEMILL

config SND_SOC_LITTLEMILL

	tristate "Audio support for Wolfson Littlemill"

	tristate "Audio support for Wolfson Littlemill"

	depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410

	depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 && I2C

	select SND_SAMSUNG_I2S

	select SND_SAMSUNG_I2S

	select MFD_WM8994

	select MFD_WM8994

	select SND_SOC_WM8994

	select SND_SOC_WM8994
@@ -223,7 +223,7 @@ config SND_SOC_SNOW 




config SND_SOC_ODROIDX2

config SND_SOC_ODROIDX2

	tristate "Audio support for Odroid-X2 and Odroid-U3"

	tristate "Audio support for Odroid-X2 and Odroid-U3"

	depends on SND_SOC_SAMSUNG

	depends on SND_SOC_SAMSUNG && I2C

	select SND_SOC_MAX98090

	select SND_SOC_MAX98090

	select SND_SAMSUNG_I2S

	select SND_SAMSUNG_I2S

	help

	help
@@ -231,6 +231,6 @@ config SND_SOC_ODROIDX2 




config SND_SOC_ARNDALE_RT5631_ALC5631

config SND_SOC_ARNDALE_RT5631_ALC5631

        tristate "Audio support for RT5631(ALC5631) on Arndale Board"

        tristate "Audio support for RT5631(ALC5631) on Arndale Board"

        depends on SND_SOC_SAMSUNG

        depends on SND_SOC_SAMSUNG && I2C

        select SND_SAMSUNG_I2S

        select SND_SAMSUNG_I2S

        select SND_SOC_RT5631
 
        select SND_SOC_RT5631