Merge branch 'topic/owner' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-ssm4567

Conflicts: sound/soc/codecs/ssm4567.c
2026-11-10 20:48:12 +00:00 · 2015-07-24 16:11:47 +01:00 · 2015-07-24 16:11:47 +01:00 · beb8962210
commit beb8962210
parent eeffd4b442 1c07a4de5b
106 changed files with 1566 additions and 111 deletions
--- a/include/sound/rt298.h
+++ b/include/sound/rt298.h
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
--- a/sound/soc/codecs/adau1373.c
+++ b/sound/soc/codecs/adau1373.c
--- a/sound/soc/codecs/adau1701.c
+++ b/sound/soc/codecs/adau1701.c
--- a/sound/soc/codecs/adau1761-i2c.c
+++ b/sound/soc/codecs/adau1761-i2c.c
--- a/sound/soc/codecs/adau1781-i2c.c
+++ b/sound/soc/codecs/adau1781-i2c.c
--- a/sound/soc/codecs/adau1977-i2c.c
+++ b/sound/soc/codecs/adau1977-i2c.c
--- a/sound/soc/codecs/adav803.c
+++ b/sound/soc/codecs/adav803.c
--- a/sound/soc/codecs/ak4535.c
+++ b/sound/soc/codecs/ak4535.c
--- a/sound/soc/codecs/ak4641.c
+++ b/sound/soc/codecs/ak4641.c
--- a/sound/soc/codecs/ak4642.c
+++ b/sound/soc/codecs/ak4642.c
--- a/sound/soc/codecs/ak4671.c
+++ b/sound/soc/codecs/ak4671.c
--- a/sound/soc/codecs/alc5623.c
+++ b/sound/soc/codecs/alc5623.c
--- a/sound/soc/codecs/alc5632.c
+++ b/sound/soc/codecs/alc5632.c
--- a/sound/soc/codecs/cs35l32.c
+++ b/sound/soc/codecs/cs35l32.c
--- a/sound/soc/codecs/cs4265.c
+++ b/sound/soc/codecs/cs4265.c
--- a/sound/soc/codecs/cs4270.c
+++ b/sound/soc/codecs/cs4270.c
--- a/sound/soc/codecs/cs4271-i2c.c
+++ b/sound/soc/codecs/cs4271-i2c.c
--- a/sound/soc/codecs/cs42l51-i2c.c
+++ b/sound/soc/codecs/cs42l51-i2c.c
--- a/sound/soc/codecs/cs42l52.c
+++ b/sound/soc/codecs/cs42l52.c
--- a/sound/soc/codecs/cs42l56.c
+++ b/sound/soc/codecs/cs42l56.c
--- a/sound/soc/codecs/cs42l73.c
+++ b/sound/soc/codecs/cs42l73.c
--- a/sound/soc/codecs/cs42xx8-i2c.c
+++ b/sound/soc/codecs/cs42xx8-i2c.c
--- a/sound/soc/codecs/cs42xx8.c
+++ b/sound/soc/codecs/cs42xx8.c
--- a/sound/soc/codecs/cs42xx8.h
+++ b/sound/soc/codecs/cs42xx8.h
--- a/sound/soc/codecs/da7210.c
+++ b/sound/soc/codecs/da7210.c
--- a/sound/soc/codecs/da7213.c
+++ b/sound/soc/codecs/da7213.c
--- a/sound/soc/codecs/da732x.c
+++ b/sound/soc/codecs/da732x.c
--- a/sound/soc/codecs/da9055.c
+++ b/sound/soc/codecs/da9055.c
--- a/sound/soc/codecs/isabelle.c
+++ b/sound/soc/codecs/isabelle.c
--- a/sound/soc/codecs/lm4857.c
+++ b/sound/soc/codecs/lm4857.c
--- a/sound/soc/codecs/lm49453.c
+++ b/sound/soc/codecs/lm49453.c
--- a/sound/soc/codecs/max9768.c
+++ b/sound/soc/codecs/max9768.c
--- a/sound/soc/codecs/max98088.c
+++ b/sound/soc/codecs/max98088.c
--- a/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
--- a/sound/soc/codecs/max98095.c
+++ b/sound/soc/codecs/max98095.c
--- a/sound/soc/codecs/max9850.c
+++ b/sound/soc/codecs/max9850.c
--- a/sound/soc/codecs/max9877.c
+++ b/sound/soc/codecs/max9877.c
--- a/sound/soc/codecs/max98925.c
+++ b/sound/soc/codecs/max98925.c
--- a/sound/soc/codecs/ml26124.c
+++ b/sound/soc/codecs/ml26124.c
--- a/sound/soc/codecs/pcm1681.c
+++ b/sound/soc/codecs/pcm1681.c
--- a/sound/soc/codecs/pcm512x-i2c.c
+++ b/sound/soc/codecs/pcm512x-i2c.c
--- a/sound/soc/codecs/rt286.c
+++ b/sound/soc/codecs/rt286.c
--- a/sound/soc/codecs/rt298.c
+++ b/sound/soc/codecs/rt298.c
--- a/sound/soc/codecs/rt298.h
+++ b/sound/soc/codecs/rt298.h
--- a/sound/soc/codecs/rt5631.c
+++ b/sound/soc/codecs/rt5631.c
--- a/sound/soc/codecs/rt5640.c
+++ b/sound/soc/codecs/rt5640.c
--- a/sound/soc/codecs/rt5645.c
+++ b/sound/soc/codecs/rt5645.c
--- a/sound/soc/codecs/rt5651.c
+++ b/sound/soc/codecs/rt5651.c
--- a/sound/soc/codecs/rt5670.c
+++ b/sound/soc/codecs/rt5670.c
--- a/sound/soc/codecs/rt5677.c
+++ b/sound/soc/codecs/rt5677.c
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
--- a/sound/soc/codecs/ssm2518.c
+++ b/sound/soc/codecs/ssm2518.c
--- a/sound/soc/codecs/ssm2602-i2c.c
+++ b/sound/soc/codecs/ssm2602-i2c.c
--- a/sound/soc/codecs/ssm4567.c
+++ b/sound/soc/codecs/ssm4567.c
--- a/sound/soc/codecs/sta32x.c
+++ b/sound/soc/codecs/sta32x.c
--- a/sound/soc/codecs/sta350.c
+++ b/sound/soc/codecs/sta350.c
--- a/sound/soc/codecs/sta529.c
+++ b/sound/soc/codecs/sta529.c
--- a/sound/soc/codecs/tas2552.c
+++ b/sound/soc/codecs/tas2552.c
--- a/sound/soc/codecs/tas5086.c
+++ b/sound/soc/codecs/tas5086.c
--- a/sound/soc/codecs/tfa9879.c
+++ b/sound/soc/codecs/tfa9879.c
--- a/sound/soc/codecs/tlv320aic31xx.c
+++ b/sound/soc/codecs/tlv320aic31xx.c
--- a/sound/soc/codecs/tlv320aic32x4.c
+++ b/sound/soc/codecs/tlv320aic32x4.c
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
--- a/sound/soc/codecs/tlv320dac33.c
+++ b/sound/soc/codecs/tlv320dac33.c
--- a/sound/soc/codecs/tpa6130a2.c
+++ b/sound/soc/codecs/tpa6130a2.c
--- a/sound/soc/codecs/ts3a227e.c
+++ b/sound/soc/codecs/ts3a227e.c
--- a/sound/soc/codecs/uda1380.c
+++ b/sound/soc/codecs/uda1380.c
--- a/sound/soc/codecs/wm1250-ev1.c
+++ b/sound/soc/codecs/wm1250-ev1.c
--- a/sound/soc/codecs/wm2000.c
+++ b/sound/soc/codecs/wm2000.c
--- a/sound/soc/codecs/wm2200.c
+++ b/sound/soc/codecs/wm2200.c
--- a/sound/soc/codecs/wm5100.c
+++ b/sound/soc/codecs/wm5100.c
--- a/sound/soc/codecs/wm8510.c
+++ b/sound/soc/codecs/wm8510.c
--- a/sound/soc/codecs/wm8523.c
+++ b/sound/soc/codecs/wm8523.c
--- a/sound/soc/codecs/wm8580.c
+++ b/sound/soc/codecs/wm8580.c
--- a/sound/soc/codecs/wm8711.c
+++ b/sound/soc/codecs/wm8711.c
--- a/sound/soc/codecs/wm8728.c
+++ b/sound/soc/codecs/wm8728.c
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
--- a/sound/soc/codecs/wm8737.c
+++ b/sound/soc/codecs/wm8737.c
--- a/sound/soc/codecs/wm8741.c
+++ b/sound/soc/codecs/wm8741.c
--- a/sound/soc/codecs/wm8750.c
+++ b/sound/soc/codecs/wm8750.c
--- a/sound/soc/codecs/wm8753.c
+++ b/sound/soc/codecs/wm8753.c
--- a/sound/soc/codecs/wm8776.c
+++ b/sound/soc/codecs/wm8776.c
--- a/sound/soc/codecs/wm8804-i2c.c
+++ b/sound/soc/codecs/wm8804-i2c.c
--- a/sound/soc/codecs/wm8900.c
+++ b/sound/soc/codecs/wm8900.c
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
--- a/sound/soc/codecs/wm8940.c
+++ b/sound/soc/codecs/wm8940.c
--- a/sound/soc/codecs/wm8955.c
+++ b/sound/soc/codecs/wm8955.c
--- a/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
--- a/sound/soc/codecs/wm8961.c
+++ b/sound/soc/codecs/wm8961.c
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
--- a/sound/soc/codecs/wm8971.c
+++ b/sound/soc/codecs/wm8971.c
--- a/sound/soc/codecs/wm8974.c
+++ b/sound/soc/codecs/wm8974.c
--- a/sound/soc/codecs/wm8978.c
+++ b/sound/soc/codecs/wm8978.c
--- a/sound/soc/codecs/wm8983.c
+++ b/sound/soc/codecs/wm8983.c
--- a/sound/soc/codecs/wm8985.c
+++ b/sound/soc/codecs/wm8985.c
--- a/sound/soc/codecs/wm8988.c
+++ b/sound/soc/codecs/wm8988.c
--- a/sound/soc/codecs/wm8990.c
+++ b/sound/soc/codecs/wm8990.c
--- a/Show more
+++ b/Show more