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
This commit is contained in:
@@ -171,6 +171,7 @@ config SND_SOC_ALL_CODECS
|
||||
imply SND_SOC_MT6359
|
||||
imply SND_SOC_MT6660
|
||||
imply SND_SOC_NAU8315
|
||||
imply SND_SOC_NAU8325
|
||||
imply SND_SOC_NAU8540
|
||||
imply SND_SOC_NAU8810
|
||||
imply SND_SOC_NAU8821
|
||||
@@ -2759,6 +2760,10 @@ config SND_SOC_MT6660
|
||||
config SND_SOC_NAU8315
|
||||
tristate "Nuvoton Technology Corporation NAU8315 CODEC"
|
||||
|
||||
config SND_SOC_NAU8325
|
||||
tristate "Nuvoton Technology Corporation NAU8325 CODEC"
|
||||
depends on I2C
|
||||
|
||||
config SND_SOC_NAU8540
|
||||
tristate "Nuvoton Technology Corporation NAU85L40 CODEC"
|
||||
depends on I2C
|
||||
|
||||
@@ -193,6 +193,7 @@ snd-soc-mt6359-y := mt6359.o
|
||||
snd-soc-mt6359-accdet-y := mt6359-accdet.o
|
||||
snd-soc-mt6660-y := mt6660.o
|
||||
snd-soc-nau8315-y := nau8315.o
|
||||
snd-soc-nau8325-y := nau8325.o
|
||||
snd-soc-nau8540-y := nau8540.o
|
||||
snd-soc-nau8810-y := nau8810.o
|
||||
snd-soc-nau8821-y := nau8821.o
|
||||
@@ -620,6 +621,7 @@ obj-$(CONFIG_SND_SOC_MT6359) += snd-soc-mt6359.o
|
||||
obj-$(CONFIG_SND_SOC_MT6359_ACCDET) += mt6359-accdet.o
|
||||
obj-$(CONFIG_SND_SOC_MT6660) += snd-soc-mt6660.o
|
||||
obj-$(CONFIG_SND_SOC_NAU8315) += snd-soc-nau8315.o
|
||||
obj-$(CONFIG_SND_SOC_NAU8325) += snd-soc-nau8325.o
|
||||
obj-$(CONFIG_SND_SOC_NAU8540) += snd-soc-nau8540.o
|
||||
obj-$(CONFIG_SND_SOC_NAU8810) += snd-soc-nau8810.o
|
||||
obj-$(CONFIG_SND_SOC_NAU8821) += snd-soc-nau8821.o
|
||||
|
||||
@@ -829,8 +829,7 @@ static int nau8325_read_device_properties(struct device *dev,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int nau8325_i2c_probe(struct i2c_client *i2c,
|
||||
const struct i2c_device_id *id)
|
||||
static int nau8325_i2c_probe(struct i2c_client *i2c)
|
||||
{
|
||||
struct device *dev = &i2c->dev;
|
||||
struct nau8325 *nau8325 = dev_get_platdata(dev);
|
||||
|
||||
Reference in New Issue
Block a user