aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-01-18 11:55:44 +0000
committerMark Brown <broonie@kernel.org>2018-01-18 11:55:44 +0000
commit9a2fef7c414ce6e7971c099751a293f2df33d1a6 (patch)
treefdac6a0b132948ba7952469777415e77cbd4e21d /sound
parentMerge remote-tracking branches 'asoc/topic/88pm860x', 'asoc/topic/amd', 'asoc/topic/atmel', 'asoc/topic/au1x' and 'asoc/topic/bcm2835' into asoc-next (diff)
parentASoC: codecs: dmic: Make number of channels configurable (diff)
parentASoC: don't use rtd->codec on snd_soc_new_compress() (diff)
parentASoC: use snd_soc_component_init_regmap() on cq93vc (diff)
downloadlinux-dev-9a2fef7c414ce6e7971c099751a293f2df33d1a6.tar.xz
linux-dev-9a2fef7c414ce6e7971c099751a293f2df33d1a6.zip
Merge remote-tracking branches 'asoc/topic/codecs', 'asoc/topic/compress' and 'asoc/topic/cq93vc' into asoc-next