kernel/linux
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ synced 2026-10-22 19:14:51 +00:00
Code Issues Releases Packages Activity
linux/sound/soc
History
Arnd Bergmann d71cea8e09 ASoC: davinci: fix DM365_EVM codec selection 
commit f9a7ba3269 upstream.

An earlier bug fix of mine made the SND_DM365_VOICE_CODEC symbol
tristate to avoid creating an undefined reference from the
davinci-vcif.c driver to the davinci_soc_platform_register
function that may be in a module.

However, this may now lead to a different error on randconfig
kernels:

"warning: SND_DM365_VOICE_CODEC creates inconsistent choice state"

This happens because we now have a choice statement with
one bool and one tristate option, and the latter might not
support being set to 'y' because of dependencies.

This new change turns the other option into 'tristate' as well,
which avoids the problem.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 19926c6de0 ("ASoC: davinci: vcif must be a module if SND_DAVINCI_SOC is")
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
History 2015-03-06 14:52:46 -08:00
..
adi ASoC: axi-{spdif,i2s}: Remove SND_DMAENGINE_PCM_FLAG_NO_RESIDUE flag 2014-01-14 21:28:39 +00:00
atmel ASoC: atmel_ssc_dai: fix start event for I2S mode 2015-02-11 15:00:55 +08:00
au1x MIPS: Alchemy: remove au_read/write/sync 2014-07-30 13:56:34 +02:00
bcm ASoC: bcm: Remove obsoleted Kconfig dependency 2014-01-08 20:00:04 +00:00
blackfin ASoC: blackfin: use samples to set silence 2014-07-17 12:27:56 +01:00
cirrus Merge remote-tracking branch 'asoc/topic/cirrus' into asoc-next 2014-03-13 14:19:11 +00:00
codecs ASoC: rt5670: Set use_single_rw flag for regmap 2015-03-06 14:52:46 -08:00
davinci ASoC: davinci: fix DM365_EVM codec selection 2015-03-06 14:52:46 -08:00
dwc ASoC: dwc: Ensure FIFOs are flushed to prevent channel swap 2015-01-16 06:59:46 -08:00
fsl ASoC: fsl_esai: Fix incorrect xDC field width of xCCR registers 2015-02-05 22:36:02 -08:00
generic ASoC: simple-card: Fix crash in asoc_simple_card_unref() 2015-02-05 22:36:02 -08:00
intel ASoC: Intel: HSW/BDW only support S16 and S24 formats. 2014-10-16 16:48:05 +02:00
jz4740 Merge remote-tracking branches 'asoc/topic/headers', 'asoc/topic/intel', 'asoc/topic/jz4740', 'asoc/topic/max98090', 'asoc/topic/max98095', 'asoc/topic/mc13783' and 'asoc/topic/multicodec' into asoc-next 2014-05-22 00:23:54 +01:00
kirkwood ASoC: kirkwood: Remove ARCH_KIRKWOOD dependency 2014-07-29 20:35:23 +01:00
mxs Merge remote-tracking branches 'asoc/topic/adsp', 'asoc/topic/atmel', 'asoc/topic/bcm2835', 'asoc/topic/docs', 'asoc/topic/fsl', 'asoc/topic/generic', 'asoc/topic/kirkwood', 'asoc/topic/mc13783', 'asoc/topic/mxs', 'asoc/topic/nuc900', 'asoc/topic/sai', 'asoc/topic/sh', 'asoc/topic/ssm2602', 'asoc/topic/tlv320aic3x', 'asoc/topic/twl4030', 'asoc/topic/ux500', 'asoc/topic/width' and 'asoc/topic/x86' into for-tiwai 2014-01-16 12:44:01 +00:00
nuc900 ASoC: nuc900: export nuc900_ac97_data 2014-04-30 20:32:20 -07:00
omap ASoC: omap-mcbsp: Correct CBM_CFS dai format configuration 2015-02-05 22:36:03 -08:00
pxa ASoC: mioa701_wm9713: Fix speaker event 2015-03-06 14:52:46 -08:00
rockchip ASoC: rockchip-i2s: fix infinite loop in rockchip_snd_rxctrl 2014-10-29 10:17:25 +00:00
samsung ASoC: samsung: Add MODULE_DEVICE_TABLE for Snow 2014-11-05 17:09:17 +00:00
sh ASoC: rsnd: remove unsupported PAUSE flag 2014-10-29 11:02:50 +00:00
sirf ASoC: sirf: usp: Add bitclock inversion support 2014-08-16 17:06:42 -05:00
spear ASoC: Update email id of the author 2014-09-09 10:49:41 +01:00
tegra Merge remote-tracking branches 'asoc/topic/suspend', 'asoc/topic/tas2552', 'asoc/topic/tegra', 'asoc/topic/tlv320aic31xx' and 'asoc/topic/tlv320aic3x' into asoc-next 2014-10-06 12:49:07 +01:00
txx9 ASoC: txx9: Don't opencode DMAengine API calls 2014-08-19 11:44:18 -05:00
ux500 ASoC: mop500_ab8500: Replace instances of rtd->codec->card with rtd->card 2014-05-20 22:55:39 +01:00
Kconfig ASoC: s6000: remove driver 2014-10-20 11:03:52 +01:00
Makefile ASoC: s6000: remove driver 2014-10-20 11:03:52 +01:00
soc-cache.c ASoC: Move name and id from CODEC/platform to component 2014-06-21 21:04:24 +01:00
soc-compress.c ASoC: soc-compress.c: fix NULL dereference 2015-02-05 22:36:02 -08:00
soc-core.c ASoC: Fix snd_soc_find_dai() matching component by name 2014-10-29 20:51:30 +00:00
soc-dapm.c ASoC: soc-dapm: fix use after free 2014-10-07 13:11:35 +01:00
soc-devres.c ASoC: Export devm_snd_soc_register_platform() 2014-04-22 22:00:42 +01:00
soc-generic-dmaengine-pcm.c ASoC: Consolidate platform and CODEC probe/remove 2014-08-19 10:59:45 -05:00
soc-io.c ASoC: Automatically initialize regmap for all components 2014-08-19 10:59:47 -05:00
soc-jack.c ASoC: Move card field form platform/codec to component 2014-07-22 23:15:57 +01:00
soc-pcm.c ASoC: dpcm: Fix race between FE/BE updates and trigger 2014-11-04 17:18:32 +00:00
soc-utils.c Merge remote-tracking branch 'asoc/topic/dapm' into for-tiwai 2014-01-16 12:42:53 +00:00