Skip to content

Commit a5e0091

Browse files
Lucas Tanurebroonie
Lucas Tanure
authored and
broonie
committed
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: Lucas Tanure <tanureal@opensource.cirrus.com> Link: https://lore.kernel.org/r/20211125143501.7720-1-tanureal@opensource.cirrus.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 0b18939 commit a5e0091

7 files changed

Lines changed: 50 additions & 42 deletions

File tree

‎sound/soc/codecs/Kconfig‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -612,14 +612,19 @@ config SND_SOC_CS35L36
612612
tristate "Cirrus Logic CS35L36 CODEC"
613613
depends on I2C
614614

615+
config SND_SOC_CS35L41
616+
tristate
617+
615618
config SND_SOC_CS35L41_SPI
616619
tristate "Cirrus Logic CS35L41 CODEC (SPI)"
617620
depends on SPI_MASTER
621+
select SND_SOC_CS35L41
618622
select REGMAP_SPI
619623

620624
config SND_SOC_CS35L41_I2C
621625
tristate "Cirrus Logic CS35L41 CODEC (I2C)"
622626
depends on I2C
627+
select SND_SOC_CS35L41
623628
select REGMAP_I2C
624629

625630
config SND_SOC_CS42L42

‎sound/soc/codecs/Makefile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,9 @@ snd-soc-cs35l33-objs := cs35l33.o
5454
snd-soc-cs35l34-objs := cs35l34.o
5555
snd-soc-cs35l35-objs := cs35l35.o
5656
snd-soc-cs35l36-objs := cs35l36.o
57-
snd-soc-cs35l41-spi-objs := cs35l41-spi.o cs35l41.o cs35l41-tables.o
58-
snd-soc-cs35l41-i2c-objs := cs35l41-i2c.o cs35l41.o cs35l41-tables.o
57+
snd-soc-cs35l41-objs := cs35l41.o cs35l41-tables.o
58+
snd-soc-cs35l41-spi-objs := cs35l41-spi.o
59+
snd-soc-cs35l41-i2c-objs := cs35l41-i2c.o
5960
snd-soc-cs42l42-objs := cs42l42.o
6061
snd-soc-cs42l51-objs := cs42l51.o
6162
snd-soc-cs42l51-i2c-objs := cs42l51-i2c.o
@@ -391,6 +392,7 @@ obj-$(CONFIG_SND_SOC_CS35L33) += snd-soc-cs35l33.o
391392
obj-$(CONFIG_SND_SOC_CS35L34) += snd-soc-cs35l34.o
392393
obj-$(CONFIG_SND_SOC_CS35L35) += snd-soc-cs35l35.o
393394
obj-$(CONFIG_SND_SOC_CS35L36) += snd-soc-cs35l36.o
395+
obj-$(CONFIG_SND_SOC_CS35L41) += snd-soc-cs35l41.o
394396
obj-$(CONFIG_SND_SOC_CS35L41_SPI) += snd-soc-cs35l41-spi.o
395397
obj-$(CONFIG_SND_SOC_CS35L41_I2C) += snd-soc-cs35l41-i2c.o
396398
obj-$(CONFIG_SND_SOC_CS42L42) += snd-soc-cs42l42.o

‎sound/soc/codecs/cs35l41-i2c.c‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,6 @@
2020
#include <sound/cs35l41.h>
2121
#include "cs35l41.h"
2222

23-
static struct regmap_config cs35l41_regmap_i2c = {
24-
.reg_bits = 32,
25-
.val_bits = 32,
26-
.reg_stride = CS35L41_REGSTRIDE,
27-
.reg_format_endian = REGMAP_ENDIAN_BIG,
28-
.val_format_endian = REGMAP_ENDIAN_BIG,
29-
.max_register = CS35L41_LASTREG,
30-
.reg_defaults = cs35l41_reg,
31-
.num_reg_defaults = ARRAY_SIZE(cs35l41_reg),
32-
.volatile_reg = cs35l41_volatile_reg,
33-
.readable_reg = cs35l41_readable_reg,
34-
.precious_reg = cs35l41_precious_reg,
35-
.cache_type = REGCACHE_RBTREE,
36-
};
37-
3823
static const struct i2c_device_id cs35l41_id_i2c[] = {
3924
{ "cs35l40", 0 },
4025
{ "cs35l41", 0 },

‎sound/soc/codecs/cs35l41-spi.c‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,6 @@
1818
#include <sound/cs35l41.h>
1919
#include "cs35l41.h"
2020

21-
static struct regmap_config cs35l41_regmap_spi = {
22-
.reg_bits = 32,
23-
.val_bits = 32,
24-
.pad_bits = 16,
25-
.reg_stride = CS35L41_REGSTRIDE,
26-
.reg_format_endian = REGMAP_ENDIAN_BIG,
27-
.val_format_endian = REGMAP_ENDIAN_BIG,
28-
.max_register = CS35L41_LASTREG,
29-
.reg_defaults = cs35l41_reg,
30-
.num_reg_defaults = ARRAY_SIZE(cs35l41_reg),
31-
.volatile_reg = cs35l41_volatile_reg,
32-
.readable_reg = cs35l41_readable_reg,
33-
.precious_reg = cs35l41_precious_reg,
34-
.cache_type = REGCACHE_RBTREE,
35-
};
36-
3721
static const struct spi_device_id cs35l41_id_spi[] = {
3822
{ "cs35l40", 0 },
3923
{ "cs35l41", 0 },

‎sound/soc/codecs/cs35l41-tables.c‎

Lines changed: 37 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include "cs35l41.h"
1010

11-
const struct reg_default cs35l41_reg[CS35L41_MAX_CACHE_REG] = {
11+
static const struct reg_default cs35l41_reg[] = {
1212
{ CS35L41_PWR_CTRL1, 0x00000000 },
1313
{ CS35L41_PWR_CTRL3, 0x01000010 },
1414
{ CS35L41_GPIO_PAD_CONTROL, 0x00000000 },
@@ -47,7 +47,7 @@ const struct reg_default cs35l41_reg[CS35L41_MAX_CACHE_REG] = {
4747
{ CS35L41_MIXER_NGATE_CH2_CFG, 0x00000303 },
4848
};
4949

50-
bool cs35l41_readable_reg(struct device *dev, unsigned int reg)
50+
static bool cs35l41_readable_reg(struct device *dev, unsigned int reg)
5151
{
5252
switch (reg) {
5353
case CS35L41_DEVID:
@@ -331,7 +331,7 @@ bool cs35l41_readable_reg(struct device *dev, unsigned int reg)
331331
}
332332
}
333333

334-
bool cs35l41_precious_reg(struct device *dev, unsigned int reg)
334+
static bool cs35l41_precious_reg(struct device *dev, unsigned int reg)
335335
{
336336
switch (reg) {
337337
case CS35L41_OTP_MEM0 ... CS35L41_OTP_MEM31:
@@ -344,7 +344,7 @@ bool cs35l41_precious_reg(struct device *dev, unsigned int reg)
344344
}
345345
}
346346

347-
bool cs35l41_volatile_reg(struct device *dev, unsigned int reg)
347+
static bool cs35l41_volatile_reg(struct device *dev, unsigned int reg)
348348
{
349349
switch (reg) {
350350
case CS35L41_DEVID:
@@ -688,3 +688,36 @@ const struct cs35l41_otp_map_element_t cs35l41_otp_map_map[CS35L41_NUM_OTP_MAPS]
688688
.word_offset = 2,
689689
},
690690
};
691+
692+
struct regmap_config cs35l41_regmap_i2c = {
693+
.reg_bits = 32,
694+
.val_bits = 32,
695+
.reg_stride = CS35L41_REGSTRIDE,
696+
.reg_format_endian = REGMAP_ENDIAN_BIG,
697+
.val_format_endian = REGMAP_ENDIAN_BIG,
698+
.max_register = CS35L41_LASTREG,
699+
.reg_defaults = cs35l41_reg,
700+
.num_reg_defaults = ARRAY_SIZE(cs35l41_reg),
701+
.volatile_reg = cs35l41_volatile_reg,
702+
.readable_reg = cs35l41_readable_reg,
703+
.precious_reg = cs35l41_precious_reg,
704+
.cache_type = REGCACHE_RBTREE,
705+
};
706+
EXPORT_SYMBOL_GPL(cs35l41_regmap_i2c);
707+
708+
struct regmap_config cs35l41_regmap_spi = {
709+
.reg_bits = 32,
710+
.val_bits = 32,
711+
.pad_bits = 16,
712+
.reg_stride = CS35L41_REGSTRIDE,
713+
.reg_format_endian = REGMAP_ENDIAN_BIG,
714+
.val_format_endian = REGMAP_ENDIAN_BIG,
715+
.max_register = CS35L41_LASTREG,
716+
.reg_defaults = cs35l41_reg,
717+
.num_reg_defaults = ARRAY_SIZE(cs35l41_reg),
718+
.volatile_reg = cs35l41_volatile_reg,
719+
.readable_reg = cs35l41_readable_reg,
720+
.precious_reg = cs35l41_precious_reg,
721+
.cache_type = REGCACHE_RBTREE,
722+
};
723+
EXPORT_SYMBOL_GPL(cs35l41_regmap_spi);

‎sound/soc/codecs/cs35l41.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1731,6 +1731,7 @@ int cs35l41_probe(struct cs35l41_private *cs35l41,
17311731

17321732
return ret;
17331733
}
1734+
EXPORT_SYMBOL_GPL(cs35l41_probe);
17341735

17351736
void cs35l41_remove(struct cs35l41_private *cs35l41)
17361737
{
@@ -1739,6 +1740,7 @@ void cs35l41_remove(struct cs35l41_private *cs35l41)
17391740
regulator_bulk_disable(CS35L41_NUM_SUPPLIES, cs35l41->supplies);
17401741
gpiod_set_value_cansleep(cs35l41->reset_gpio, 0);
17411742
}
1743+
EXPORT_SYMBOL_GPL(cs35l41_remove);
17421744

17431745
MODULE_DESCRIPTION("ASoC CS35L41 driver");
17441746
MODULE_AUTHOR("David Rhodes, Cirrus Logic Inc, <david.rhodes@cirrus.com>");

‎sound/soc/codecs/cs35l41.h‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,6 @@
538538
#define CS35L41_OTP_TRIM_35 0x0000400C
539539
#define CS35L41_OTP_TRIM_36 0x00002030
540540

541-
#define CS35L41_MAX_CACHE_REG 36
542541
#define CS35L41_OTP_SIZE_WORDS 32
543542
#define CS35L41_NUM_OTP_ELEM 100
544543
#define CS35L41_NUM_OTP_MAPS 5
@@ -734,9 +733,8 @@
734733
#define CS35L41_RX_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE)
735734
#define CS35L41_TX_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE)
736735

737-
bool cs35l41_readable_reg(struct device *dev, unsigned int reg);
738-
bool cs35l41_precious_reg(struct device *dev, unsigned int reg);
739-
bool cs35l41_volatile_reg(struct device *dev, unsigned int reg);
736+
extern struct regmap_config cs35l41_regmap_i2c;
737+
extern struct regmap_config cs35l41_regmap_spi;
740738

741739
struct cs35l41_otp_packed_element_t {
742740
u32 reg;
@@ -752,7 +750,6 @@ struct cs35l41_otp_map_element_t {
752750
u32 word_offset;
753751
};
754752

755-
extern const struct reg_default cs35l41_reg[CS35L41_MAX_CACHE_REG];
756753
extern const struct cs35l41_otp_map_element_t
757754
cs35l41_otp_map_map[CS35L41_NUM_OTP_MAPS];
758755

0 commit comments

Comments
 (0)