Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e29bee09 authored by Ben Zhang's avatar Ben Zhang Committed by Mark Brown
Browse files

ASoC: rt5677: fix rt5677 spi driver build 



Create a separate module for rt5677 spi driver. Without
this patch, the build fails due to multiple defs of
'init_module' and 'cleanup_module'. module_spi_driver()
defines its own module, so it can't be part of the rt5677
module.

Signed-off-by: default avatarBen Zhang <benzh@chromium.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 2d27deb4

sound/soc/codecs/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -504,6 +504,10 @@ config SND_SOC_RT5670 
config SND_SOC_RT5677

	tristate



config SND_SOC_RT5677_SPI

	tristate

	default SND_SOC_RT5677



#Freescale sgtl5000 codec

config SND_SOC_SGTL5000

	tristate "Freescale SGTL5000 CODEC"

sound/soc/codecs/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -79,7 +79,8 @@ snd-soc-rt5640-objs := rt5640.o 
snd-soc-rt5645-objs := rt5645.o

snd-soc-rt5651-objs := rt5651.o

snd-soc-rt5670-objs := rt5670.o

snd-soc-rt5677-objs := rt5677.o rt5677-spi.o

snd-soc-rt5677-objs := rt5677.o

snd-soc-rt5677-spi-objs := rt5677-spi.o

snd-soc-sgtl5000-objs := sgtl5000.o

snd-soc-alc5623-objs := alc5623.o

snd-soc-alc5632-objs := alc5632.o
@@ -256,6 +257,7 @@ obj-$(CONFIG_SND_SOC_RT5645) += snd-soc-rt5645.o 
obj-$(CONFIG_SND_SOC_RT5651)	+= snd-soc-rt5651.o

obj-$(CONFIG_SND_SOC_RT5670)	+= snd-soc-rt5670.o

obj-$(CONFIG_SND_SOC_RT5677)	+= snd-soc-rt5677.o

obj-$(CONFIG_SND_SOC_RT5677_SPI)	+= snd-soc-rt5677-spi.o

obj-$(CONFIG_SND_SOC_SGTL5000)  += snd-soc-sgtl5000.o

obj-$(CONFIG_SND_SOC_SIGMADSP)	+= snd-soc-sigmadsp.o

obj-$(CONFIG_SND_SOC_SIGMADSP_I2C)	+= snd-soc-sigmadsp-i2c.o

sound/soc/codecs/rt5677-spi.c

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ int rt5677_spi_write(u8 *txbuf, size_t len) 


	return status;

}

EXPORT_SYMBOL_GPL(rt5677_spi_write);



/**

 * rt5677_spi_burst_write - Write data to SPI by rt5677 dsp memory address.
@@ -107,6 +108,7 @@ int rt5677_spi_burst_write(u32 addr, const struct firmware *fw) 


	return 0;

}

EXPORT_SYMBOL_GPL(rt5677_spi_burst_write);



static int rt5677_spi_probe(struct spi_device *spi)

{