mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
Merge remote-tracking branch 'asoc/fix/samsung' into asoc-linus
This commit is contained in:
commit
95d67c7fc2
1 changed files with 5 additions and 5 deletions
|
@ -174,7 +174,7 @@ config SND_SOC_SMDK_WM8994_PCM
|
|||
|
||||
config SND_SOC_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_SOC_WM8996
|
||||
select SND_SOC_WM9081
|
||||
|
@ -189,7 +189,7 @@ config SND_SOC_TOBERMORY
|
|||
|
||||
config SND_SOC_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_SOC_WM5102
|
||||
select SND_SOC_WM5110
|
||||
|
@ -206,7 +206,7 @@ config SND_SOC_LOWLAND
|
|||
|
||||
config SND_SOC_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 MFD_WM8994
|
||||
select SND_SOC_WM8994
|
||||
|
@ -223,7 +223,7 @@ config SND_SOC_SNOW
|
|||
|
||||
config SND_SOC_ODROIDX2
|
||||
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_SAMSUNG_I2S
|
||||
help
|
||||
|
@ -231,6 +231,6 @@ config SND_SOC_ODROIDX2
|
|||
|
||||
config SND_SOC_ARNDALE_RT5631_ALC5631
|
||||
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_SOC_RT5631
|
||||
|
|
Loading…
Reference in a new issue