tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

nau8325 build fixes

Merge series from Jaroslav Kysela <perex@perex.cz>:

Add missing build configuration and fix the i2c probe function to follow
latest i2c core interface.

Jaroslav Kysela (2):
ASoC: nau8325: use simple i2c probe function
ASoC: nau8325: add missing build config

sound/soc/codecs/Kconfig | 5 +++++
sound/soc/codecs/Makefile | 2 ++
sound/soc/codecs/nau8325.c | 3 +--
3 files changed, 8 insertions(+), 2 deletions(-)

--
2.51.1

Mark Brown 994a0b2e 9d3fcd0e

+8 -2
+5
sound/soc/codecs/Kconfig
··· 171 171 imply SND_SOC_MT6359 172 172 imply SND_SOC_MT6660 173 173 imply SND_SOC_NAU8315 174 + imply SND_SOC_NAU8325 174 175 imply SND_SOC_NAU8540 175 176 imply SND_SOC_NAU8810 176 177 imply SND_SOC_NAU8821 ··· 2759 2758 2760 2759 config SND_SOC_NAU8315 2761 2760 tristate "Nuvoton Technology Corporation NAU8315 CODEC" 2761 + 2762 + config SND_SOC_NAU8325 2763 + tristate "Nuvoton Technology Corporation NAU8325 CODEC" 2764 + depends on I2C 2762 2765 2763 2766 config SND_SOC_NAU8540 2764 2767 tristate "Nuvoton Technology Corporation NAU85L40 CODEC"
+2
sound/soc/codecs/Makefile
··· 193 193 snd-soc-mt6359-accdet-y := mt6359-accdet.o 194 194 snd-soc-mt6660-y := mt6660.o 195 195 snd-soc-nau8315-y := nau8315.o 196 + snd-soc-nau8325-y := nau8325.o 196 197 snd-soc-nau8540-y := nau8540.o 197 198 snd-soc-nau8810-y := nau8810.o 198 199 snd-soc-nau8821-y := nau8821.o ··· 621 620 obj-$(CONFIG_SND_SOC_MT6359_ACCDET) += mt6359-accdet.o 622 621 obj-$(CONFIG_SND_SOC_MT6660) += snd-soc-mt6660.o 623 622 obj-$(CONFIG_SND_SOC_NAU8315) += snd-soc-nau8315.o 623 + obj-$(CONFIG_SND_SOC_NAU8325) += snd-soc-nau8325.o 624 624 obj-$(CONFIG_SND_SOC_NAU8540) += snd-soc-nau8540.o 625 625 obj-$(CONFIG_SND_SOC_NAU8810) += snd-soc-nau8810.o 626 626 obj-$(CONFIG_SND_SOC_NAU8821) += snd-soc-nau8821.o
+1 -2
sound/soc/codecs/nau8325.c
··· 829 829 return 0; 830 830 } 831 831 832 - static int nau8325_i2c_probe(struct i2c_client *i2c, 833 - const struct i2c_device_id *id) 832 + static int nau8325_i2c_probe(struct i2c_client *i2c) 834 833 { 835 834 struct device *dev = &i2c->dev; 836 835 struct nau8325 *nau8325 = dev_get_platdata(dev);