diff options
| author | Mark Brown <broonie@kernel.org> | 2024-09-29 23:34:33 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-09-29 23:34:33 +0100 |
| commit | 46f2dd5ce5723a2c07051d332f8f1c4c4ce548f3 (patch) | |
| tree | fd9936eb06ef6d9f0383247afad3fc878187d4d8 /sound/soc/codecs | |
| parent | 9852d85ec9d492ebef56dc5f229416c925758edc (diff) | |
| parent | e249786b2188107a7c50e7174d35f955a60988a1 (diff) | |
| download | linux-next-46f2dd5ce5723a2c07051d332f8f1c4c4ce548f3.tar.gz linux-next-46f2dd5ce5723a2c07051d332f8f1c4c4ce548f3.zip | |
Merge existing fixes from asoc/for-6.12 into new branch
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/cs35l45-tables.c | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/cs35l45.h | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/lpass-rx-macro.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/cs35l45-tables.c b/sound/soc/codecs/cs35l45-tables.c index e1cebb9e4dc6..405dab137b3b 100644 --- a/sound/soc/codecs/cs35l45-tables.c +++ b/sound/soc/codecs/cs35l45-tables.c @@ -315,7 +315,7 @@ static const struct { { 0x3B, 24576000 }, }; -unsigned int cs35l45_get_clk_freq_id(unsigned int freq) +int cs35l45_get_clk_freq_id(unsigned int freq) { int i; diff --git a/sound/soc/codecs/cs35l45.h b/sound/soc/codecs/cs35l45.h index e2ebcf58d7e0..7a790d2acac7 100644 --- a/sound/soc/codecs/cs35l45.h +++ b/sound/soc/codecs/cs35l45.h @@ -507,7 +507,7 @@ extern const struct dev_pm_ops cs35l45_pm_ops; extern const struct regmap_config cs35l45_i2c_regmap; extern const struct regmap_config cs35l45_spi_regmap; int cs35l45_apply_patch(struct cs35l45_private *cs35l45); -unsigned int cs35l45_get_clk_freq_id(unsigned int freq); +int cs35l45_get_clk_freq_id(unsigned int freq); int cs35l45_probe(struct cs35l45_private *cs35l45); void cs35l45_remove(struct cs35l45_private *cs35l45); diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c index 71e0d3bffd3f..ef7a70fa6966 100644 --- a/sound/soc/codecs/lpass-rx-macro.c +++ b/sound/soc/codecs/lpass-rx-macro.c @@ -958,7 +958,7 @@ static const struct reg_default rx_defaults[] = { { CDC_RX_BCL_VBAT_PK_EST2, 0x01 }, { CDC_RX_BCL_VBAT_PK_EST3, 0x40 }, { CDC_RX_BCL_VBAT_RF_PROC1, 0x2A }, - { CDC_RX_BCL_VBAT_RF_PROC1, 0x00 }, + { CDC_RX_BCL_VBAT_RF_PROC2, 0x00 }, { CDC_RX_BCL_VBAT_TAC1, 0x00 }, { CDC_RX_BCL_VBAT_TAC2, 0x18 }, { CDC_RX_BCL_VBAT_TAC3, 0x18 }, |