Unverified Commit a5e0091d authored by Lucas Tanure's avatar Lucas Tanure Committed by Mark Brown
Browse files

ASoC: cs35l41: Fix link problem 



Can't link I2C and SPI to the same binary, better
to move CS35L41 to 3 modules approach.
And instead of exposing cs35l41_reg, volatile_reg,
readable_reg and precious_reg arrays, move
cs35l41_regmap_i2c/spi to new module and expose it.

Signed-off-by: default avatarLucas Tanure <tanureal@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20211125143501.7720-1-tanureal@opensource.cirrus.com


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

sound/soc/codecs/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -612,14 +612,19 @@ config SND_SOC_CS35L36 
	tristate "Cirrus Logic CS35L36 CODEC"

	depends on I2C



config SND_SOC_CS35L41

	tristate



config SND_SOC_CS35L41_SPI

	tristate "Cirrus Logic CS35L41 CODEC (SPI)"

	depends on SPI_MASTER

	select SND_SOC_CS35L41

	select REGMAP_SPI



config SND_SOC_CS35L41_I2C

	tristate "Cirrus Logic CS35L41 CODEC (I2C)"

	depends on I2C

	select SND_SOC_CS35L41

	select REGMAP_I2C



config SND_SOC_CS42L42

sound/soc/codecs/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -54,8 +54,9 @@ snd-soc-cs35l33-objs := cs35l33.o 
snd-soc-cs35l34-objs := cs35l34.o

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

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

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

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

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

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

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

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

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

snd-soc-cs42l51-i2c-objs := cs42l51-i2c.o
@@ -391,6 +392,7 @@ obj-$(CONFIG_SND_SOC_CS35L33) += snd-soc-cs35l33.o 
obj-$(CONFIG_SND_SOC_CS35L34)	+= snd-soc-cs35l34.o

obj-$(CONFIG_SND_SOC_CS35L35)	+= snd-soc-cs35l35.o

obj-$(CONFIG_SND_SOC_CS35L36)	+= snd-soc-cs35l36.o

obj-$(CONFIG_SND_SOC_CS35L41)	+= snd-soc-cs35l41.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_CS42L42)	+= snd-soc-cs42l42.o

sound/soc/codecs/cs35l41-i2c.c

+0 −15
Original line number Diff line number Diff line
@@ -20,21 +20,6 @@ 
#include <sound/cs35l41.h>

#include "cs35l41.h"



static struct regmap_config cs35l41_regmap_i2c = {

	.reg_bits = 32,

	.val_bits = 32,

	.reg_stride = CS35L41_REGSTRIDE,

	.reg_format_endian = REGMAP_ENDIAN_BIG,

	.val_format_endian = REGMAP_ENDIAN_BIG,

	.max_register = CS35L41_LASTREG,

	.reg_defaults = cs35l41_reg,

	.num_reg_defaults = ARRAY_SIZE(cs35l41_reg),

	.volatile_reg = cs35l41_volatile_reg,

	.readable_reg = cs35l41_readable_reg,

	.precious_reg = cs35l41_precious_reg,

	.cache_type = REGCACHE_RBTREE,

};



static const struct i2c_device_id cs35l41_id_i2c[] = {

	{ "cs35l40", 0 },

	{ "cs35l41", 0 },

sound/soc/codecs/cs35l41-spi.c

+0 −16
Original line number Diff line number Diff line
@@ -18,22 +18,6 @@ 
#include <sound/cs35l41.h>

#include "cs35l41.h"



static struct regmap_config cs35l41_regmap_spi = {

	.reg_bits = 32,

	.val_bits = 32,

	.pad_bits = 16,

	.reg_stride = CS35L41_REGSTRIDE,

	.reg_format_endian = REGMAP_ENDIAN_BIG,

	.val_format_endian = REGMAP_ENDIAN_BIG,

	.max_register = CS35L41_LASTREG,

	.reg_defaults = cs35l41_reg,

	.num_reg_defaults = ARRAY_SIZE(cs35l41_reg),

	.volatile_reg = cs35l41_volatile_reg,

	.readable_reg = cs35l41_readable_reg,

	.precious_reg = cs35l41_precious_reg,

	.cache_type = REGCACHE_RBTREE,

};



static const struct spi_device_id cs35l41_id_spi[] = {

	{ "cs35l40", 0 },

	{ "cs35l41", 0 },

sound/soc/codecs/cs35l41-tables.c

+37 −4
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


#include "cs35l41.h"



const struct reg_default cs35l41_reg[CS35L41_MAX_CACHE_REG] = {

static const struct reg_default cs35l41_reg[] = {

	{ CS35L41_PWR_CTRL1,			0x00000000 },

	{ CS35L41_PWR_CTRL3,			0x01000010 },

	{ CS35L41_GPIO_PAD_CONTROL,		0x00000000 },
@@ -47,7 +47,7 @@ const struct reg_default cs35l41_reg[CS35L41_MAX_CACHE_REG] = { 
	{ CS35L41_MIXER_NGATE_CH2_CFG,		0x00000303 },

};



bool cs35l41_readable_reg(struct device *dev, unsigned int reg)

static bool cs35l41_readable_reg(struct device *dev, unsigned int reg)

{

	switch (reg) {

	case CS35L41_DEVID:
@@ -331,7 +331,7 @@ bool cs35l41_readable_reg(struct device *dev, unsigned int reg) 
	}

}



bool cs35l41_precious_reg(struct device *dev, unsigned int reg)

static bool cs35l41_precious_reg(struct device *dev, unsigned int reg)

{

	switch (reg) {

	case CS35L41_OTP_MEM0 ... CS35L41_OTP_MEM31:
@@ -344,7 +344,7 @@ bool cs35l41_precious_reg(struct device *dev, unsigned int reg) 
	}

}



bool cs35l41_volatile_reg(struct device *dev, unsigned int reg)

static bool cs35l41_volatile_reg(struct device *dev, unsigned int reg)

{

	switch (reg) {

	case CS35L41_DEVID:
@@ -688,3 +688,36 @@ const struct cs35l41_otp_map_element_t cs35l41_otp_map_map[CS35L41_NUM_OTP_MAPS] 
		.word_offset = 2,

	},

};



struct regmap_config cs35l41_regmap_i2c = {

	.reg_bits = 32,

	.val_bits = 32,

	.reg_stride = CS35L41_REGSTRIDE,

	.reg_format_endian = REGMAP_ENDIAN_BIG,

	.val_format_endian = REGMAP_ENDIAN_BIG,

	.max_register = CS35L41_LASTREG,

	.reg_defaults = cs35l41_reg,

	.num_reg_defaults = ARRAY_SIZE(cs35l41_reg),

	.volatile_reg = cs35l41_volatile_reg,

	.readable_reg = cs35l41_readable_reg,

	.precious_reg = cs35l41_precious_reg,

	.cache_type = REGCACHE_RBTREE,

};

EXPORT_SYMBOL_GPL(cs35l41_regmap_i2c);



struct regmap_config cs35l41_regmap_spi = {

	.reg_bits = 32,

	.val_bits = 32,

	.pad_bits = 16,

	.reg_stride = CS35L41_REGSTRIDE,

	.reg_format_endian = REGMAP_ENDIAN_BIG,

	.val_format_endian = REGMAP_ENDIAN_BIG,

	.max_register = CS35L41_LASTREG,

	.reg_defaults = cs35l41_reg,

	.num_reg_defaults = ARRAY_SIZE(cs35l41_reg),

	.volatile_reg = cs35l41_volatile_reg,

	.readable_reg = cs35l41_readable_reg,

	.precious_reg = cs35l41_precious_reg,

	.cache_type = REGCACHE_RBTREE,

};

EXPORT_SYMBOL_GPL(cs35l41_regmap_spi);