Unverified Commit 4dac6f5a authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: cs35l45: Remove separate tables module 



There is no reason to have a separate module for the tables file it just
holds regmap callbacks and register patches used by the main part of the
driver. Remove the separate module and merge it into the main driver
module.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20230215105818.3315925-1-ckeepax@opensource.cirrus.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 3ee0d39c

sound/soc/codecs/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -688,9 +688,6 @@ config SND_SOC_CS35L41_I2C 
	select SND_SOC_CS35L41

	select REGMAP_I2C



config SND_SOC_CS35L45_TABLES

	tristate



config SND_SOC_CS35L45

	tristate
@@ -699,7 +696,6 @@ config SND_SOC_CS35L45_SPI 
	depends on SPI_MASTER

	select REGMAP

	select REGMAP_SPI

	select SND_SOC_CS35L45_TABLES

	select SND_SOC_CS35L45

	help

	  Enable support for Cirrus Logic CS35L45 smart speaker amplifier
@@ -710,7 +706,6 @@ config SND_SOC_CS35L45_I2C 
	depends on I2C

	select REGMAP

	select REGMAP_I2C

	select SND_SOC_CS35L45_TABLES

	select SND_SOC_CS35L45

	help

	  Enable support for Cirrus Logic CS35L45 smart speaker amplifier

sound/soc/codecs/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -63,8 +63,7 @@ snd-soc-cs35l41-lib-objs := cs35l41-lib.o 
snd-soc-cs35l41-objs := cs35l41.o

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

snd-soc-cs35l41-i2c-objs := cs35l41-i2c.o

snd-soc-cs35l45-tables-objs := cs35l45-tables.o

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

snd-soc-cs35l45-objs := cs35l45.o cs35l45-tables.o

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

snd-soc-cs35l45-i2c-objs := cs35l45-i2c.o

snd-soc-cs42l42-objs := cs42l42.o
@@ -431,7 +430,6 @@ obj-$(CONFIG_SND_SOC_CS35L41) += snd-soc-cs35l41.o 
obj-$(CONFIG_SND_SOC_CS35L41_LIB)	+= snd-soc-cs35l41-lib.o

obj-$(CONFIG_SND_SOC_CS35L41_SPI)	+= snd-soc-cs35l41-spi.o

obj-$(CONFIG_SND_SOC_CS35L41_I2C)	+= snd-soc-cs35l41-i2c.o

obj-$(CONFIG_SND_SOC_CS35L45_TABLES)	+= snd-soc-cs35l45-tables.o

obj-$(CONFIG_SND_SOC_CS35L45)	+= snd-soc-cs35l45.o

obj-$(CONFIG_SND_SOC_CS35L45_SPI)	+= snd-soc-cs35l45-spi.o

obj-$(CONFIG_SND_SOC_CS35L45_I2C)	+= snd-soc-cs35l45-i2c.o

sound/soc/codecs/cs35l45-tables.c

+0 −4
Original line number Diff line number Diff line
@@ -196,7 +196,3 @@ unsigned int cs35l45_get_clk_freq_id(unsigned int freq) 
	return -EINVAL;

}

EXPORT_SYMBOL_NS_GPL(cs35l45_get_clk_freq_id, SND_SOC_CS35L45_TABLES);
 


MODULE_DESCRIPTION("ASoC CS35L45 driver tables");

MODULE_AUTHOR("James Schulman, Cirrus Logic Inc, <james.schulman@cirrus.com>");

MODULE_LICENSE("Dual BSD/GPL");