summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2023-04-18 19:08:24 +0100
committerMark Brown <broonie@kernel.org>2023-04-18 19:08:24 +0100
commitcd3beeb8c62473ac5ffee8ad7a8890f0363cf1f0 (patch)
tree82907ff733998afd51651a20fb613a64ccedf77f /include
parent60ba2fda5280528e70fa26b44e36d1530f6d1d7e (diff)
parentd29a966b72fb370128096393961f2c456ff24e3d (diff)
ASoC: cs35l56: Updates for B0 silicon
Merge series from Richard Fitzgerald <rf@opensource.cirrus.com>: These patches make some small changes to align with the B0 silicon revision.
Diffstat (limited to 'include')
-rw-r--r--include/sound/cs35l56.h10
1 files changed, 3 insertions, 7 deletions
diff --git a/include/sound/cs35l56.h b/include/sound/cs35l56.h
index b3300bce74f4..002042b1c73c 100644
--- a/include/sound/cs35l56.h
+++ b/include/sound/cs35l56.h
@@ -43,8 +43,6 @@
#define CS35L56_SWIRE_DP3_CH2_INPUT 0x0004C74
#define CS35L56_SWIRE_DP3_CH3_INPUT 0x0004C78
#define CS35L56_SWIRE_DP3_CH4_INPUT 0x0004C7C
-#define CS35L56_SWIRE_DP3_CH5_INPUT 0x0004C80
-#define CS35L56_SWIRE_DP3_CH6_INPUT 0x0004C84
#define CS35L56_IRQ1_CFG 0x000E000
#define CS35L56_IRQ1_STATUS 0x000E004
#define CS35L56_IRQ1_EINT_1 0x000E010
@@ -181,12 +179,11 @@
#define CS35L56_INPUT_SRC_DSP1TX8 0x39
#define CS35L56_INPUT_SRC_TEMPMON 0x3A
#define CS35L56_INPUT_SRC_INTERPOLATOR 0x40
-#define CS35L56_INPUT_SRC_SWIRE_RX1 0x44
-#define CS35L56_INPUT_SRC_SWIRE_RX2 0x45
-#define CS35L56_INPUT_SRC_SWIRE_RX3 0x46
+#define CS35L56_INPUT_SRC_SWIRE_DP1_CHANNEL1 0x44
+#define CS35L56_INPUT_SRC_SWIRE_DP1_CHANNEL2 0x45
#define CS35L56_INPUT_MASK 0x7F
-#define CS35L56_NUM_INPUT_SRC 22
+#define CS35L56_NUM_INPUT_SRC 21
/* ASP formats */
#define CS35L56_ASP_FMT_DSP_A 0
@@ -262,7 +259,6 @@ extern const struct cs_dsp_region cs35l56_dsp1_regions[CS35L56_NUM_DSP_REGIONS];
extern const char * const cs35l56_tx_input_texts[CS35L56_NUM_INPUT_SRC];
extern const unsigned int cs35l56_tx_input_values[CS35L56_NUM_INPUT_SRC];
-void cs35l56_patch(struct device *dev, struct regmap *regmap, u8 revid);
void cs35l56_reread_firmware_registers(struct device *dev, struct regmap *regmap);
int cs35l56_get_bclk_freq_id(unsigned int freq);
void cs35l56_fill_supply_names(struct regulator_bulk_data *data);