diff options
| author | Takashi Iwai <tiwai@suse.de> | 2020-08-03 08:10:08 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-08-03 08:10:08 +0200 |
| commit | 3b5d1afd1f13bcab85eaa28223ad396694f929e3 (patch) | |
| tree | 02983e414b3d918114c15b8410ab46c245a07a29 /sound | |
| parent | f1ec5be17b9aafbc5f573da023850566b43d8e5e (diff) | |
| parent | 2ac82e20e2377fb0b63ce40bba56558f2df7cd3e (diff) | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound')
125 files changed, 1159 insertions, 2826 deletions
diff --git a/sound/aoa/Kconfig b/sound/aoa/Kconfig index d70ca0f33c67..c58308ae4dc1 100644 --- a/sound/aoa/Kconfig +++ b/sound/aoa/Kconfig @@ -3,7 +3,7 @@ menuconfig SND_AOA tristate "Apple Onboard Audio driver" depends on PPC_PMAC select SND_PCM - ---help--- + help This option enables the new driver for the various Apple Onboard Audio components. diff --git a/sound/aoa/codecs/Kconfig b/sound/aoa/codecs/Kconfig index 8ac13fdbcfe0..03f89dbcca75 100644 --- a/sound/aoa/codecs/Kconfig +++ b/sound/aoa/codecs/Kconfig @@ -3,7 +3,7 @@ config SND_AOA_ONYX tristate "support Onyx chip" select I2C select I2C_POWERMAC - ---help--- + help This option enables support for the Onyx (pcm3052) codec chip found in the latest Apple machines (most of those with digital audio output). @@ -12,14 +12,14 @@ config SND_AOA_TAS tristate "support TAS chips" select I2C select I2C_POWERMAC - ---help--- + help This option enables support for the tas chips found in a lot of Apple Machines, especially iBooks and PowerBooks without digital. config SND_AOA_TOONIE tristate "support Toonie chip" - ---help--- + help This option enables support for the toonie codec found in the Mac Mini. If you have a Mac Mini and want to hear sound, select this option. diff --git a/sound/aoa/fabrics/Kconfig b/sound/aoa/fabrics/Kconfig index 1d8a718e9c56..0fa2da247ad2 100644 --- a/sound/aoa/fabrics/Kconfig +++ b/sound/aoa/fabrics/Kconfig @@ -3,7 +3,7 @@ config SND_AOA_FABRIC_LAYOUT tristate "layout-id fabric" select SND_AOA_SOUNDBUS select SND_AOA_SOUNDBUS_I2S - ---help--- + help This enables the layout-id fabric for the Apple Onboard Audio driver, the module holding it all together based on the device-tree's layout-id property. diff --git a/sound/aoa/soundbus/Kconfig b/sound/aoa/soundbus/Kconfig index ac084df0f97b..00189aac8014 100644 --- a/sound/aoa/soundbus/Kconfig +++ b/sound/aoa/soundbus/Kconfig @@ -2,7 +2,7 @@ config SND_AOA_SOUNDBUS tristate "Apple Soundbus support" select SND_PCM - ---help--- + help This option enables the generic driver for the soundbus support on Apple machines. @@ -11,5 +11,5 @@ config SND_AOA_SOUNDBUS config SND_AOA_SOUNDBUS_I2S tristate "I2S bus support" depends on SND_AOA_SOUNDBUS && PCI - ---help--- + help This option enables support for Apple I2S busses. diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c index a1dce9725b98..1006458f7f85 100644 --- a/sound/atmel/ac97c.c +++ b/sound/atmel/ac97c.c @@ -219,7 +219,7 @@ static int atmel_ac97c_playback_prepare(struct snd_pcm_substream *substream) |