ASoC: cs42l42: Add SoundWire support
Subsystems (4)
v3 cover ASoC: cs42l42: Add SoundWire support
The CS42L42 has a SoundWire interface for control and audio. This chain of patches adds support for this.
Patches #1 .. #5 split out various changes to the existing code that are needed for adding Soundwire. These are mostly around clocking and supporting the separate probe and enumeration stages in SoundWire.
Patches #6 .. #8 actually adds the SoundWire handling.
Changes since v1:
- fixes for various review comments from v1
- add support for wakeup from clock stop using hardware interrupts
- use port_prep callback to prepare/deprepare codec
Changes since v2:
- fix various comments
- enable pm_runtime during probe
Richard Fitzgerald (6):
ASoC: cs42l42: Add SOFT_RESET_REBOOT register
ASoC: cs42l42: Ensure MCLKint is a multiple of the sample rate
ASoC: cs42l42: Separate ASP config from PLL config
ASoC: cs42l42: Export some functions for SoundWire
ASoC: cs42l42: Add SoundWire support
ASoC: cs42l42: Don't set idle_bias_on
Stefan Binding (2):
soundwire: stream: Add specific prep/deprep commands to port_prep
callback
ASoC: cs42l42: Wait for debounce interval after resume
drivers/soundwire/stream.c | 4 +- include/linux/soundwire/sdw.h | 8 +- include/sound/cs42l42.h | 5 + sound/soc/codecs/Kconfig | 8 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/cs42l42-sdw.c | 610 +++++++++++++++++++++++++++++++++ sound/soc/codecs/cs42l42.c | 133 ++++--- sound/soc/codecs/cs42l42.h | 9 +- 8 files changed, 729 insertions(+), 50 deletions(-) create mode 100644 sound/soc/codecs/cs42l42-sdw.c
Signature · 1 line
2.34.1
PATCH v3 5/8 ASoC: cs42l42: Export some functions for SoundWire
From: Richard Fitzgerald <[email protected]>
Export functions that will be needed by a SoundWire module.
--- sound/soc/codecs/cs42l42.c | 14 +++++++++----- sound/soc/codecs/cs42l42.h | 5 +++++ 2 files changed, 14 insertions(+), 5 deletions(-)
sound/soc/codecs/cs42l42.c +9 -5
@@ -653,8 +653,8 @@ static const struct cs42l42_pll_params pll_ratio_table[] = { { 24576000, 1, 0x03, 0x40, 0x000000, 0x03, 0x10, 12288000, 128, 1} }; -static int cs42l42_pll_config (struct snd_soc_component *component,unsigned int clk, -unsigned int sample_rate) +int cs42l42_pll_config (struct snd_soc_component *component,unsigned int clk, +unsigned int sample_rate) {struct cs42l42_private *cs42l42 =snd_soc_component_get_drvdata (component);int i;
@@ -740,8 +740,9 @@ static int cs42l42_pll_config(struct snd_soc_component *component, unsigned intreturn -EINVAL ; } +EXPORT_SYMBOL_NS_GPL (cs42l42_pll_config,SND_SOC_CS42L42_CORE ); -static void cs42l42_src_config (struct snd_soc_component *component,unsigned int sample_rate) +void cs42l42_src_config (struct snd_soc_component *component,unsigned int sample_rate) {struct cs42l42_private *cs42l42 =snd_soc_component_get_drvdata (component);unsigned int fs;
@@ -773,6 +774,7 @@ static void cs42l42_src_config(struct snd_soc_component *component, unsigned intCS42L42_CLK_OASRC_SEL_MASK , fs << CS42L42_CLK_OASRC_SEL_SHIFT); } +EXPORT_SYMBOL_NS_GPL (cs42l42_src_config,SND_SOC_CS42L42_CORE );static int cs42l42_asp_config (struct snd_soc_component *component,unsigned int sclk,unsigned int sample_rate)
@@ -1013,7 +1015,7 @@ static int cs42l42_set_bclk_ratio(struct snd_soc_dai *dai,return 0 ; } -static int cs42l42_mute_stream (struct snd_soc_dai *dai,int mute,int stream) +int cs42l42_mute_stream (struct snd_soc_dai *dai,int mute,int stream) {struct snd_soc_component *component = dai->component;struct cs42l42_private *cs42l42 =snd_soc_component_get_drvdata (component);
@@ -1106,6 +1108,7 @@ static int cs42l42_mute_stream(struct snd_soc_dai *dai, int mute, int stream)return 0 ; } +EXPORT_SYMBOL_NS_GPL (cs42l42_mute_stream,SND_SOC_CS42L42_CORE );#define CS42L42_FORMATS (SNDRV_PCM_FMTBIT_S16_LE |\ SNDRV_PCM_FMTBIT_S24_LE |\
@@ -1648,7 +1651,7 @@ static const struct cs42l42_irq_params irq_params_table[] = { CS42L42_TSRS_PLUG_VAL_MASK} }; -static irqreturn_t cs42l42_irq_thread (int irq,void *data) +irqreturn_t cs42l42_irq_thread (int irq,void *data) {struct cs42l42_private *cs42l42 = (struct cs42l42_private *)data;unsigned int stickies[12 ];
@@ -1765,6 +1768,7 @@ static irqreturn_t cs42l42_irq_thread(int irq, void *data)return IRQ_HANDLED ; } +EXPORT_SYMBOL_NS_GPL (cs42l42_irq_thread,SND_SOC_CS42L42_CORE );static void cs42l42_set_interrupt_masks (struct cs42l42_private *cs42l42) {
sound/soc/codecs/cs42l42.h +5 -0
@@ -61,6 +61,11 @@ extern struct snd_soc_dai_driver cs42l42_dai;bool cs42l42_readable_register (struct device *dev,unsigned int reg);bool cs42l42_volatile_register (struct device *dev,unsigned int reg); +int cs42l42_pll_config (struct snd_soc_component *component, +unsigned int clk,unsigned int sample_rate); +void cs42l42_src_config (struct snd_soc_component *component,unsigned int sample_rate); +int cs42l42_mute_stream (struct snd_soc_dai *dai,int mute,int stream); +irqreturn_t cs42l42_irq_thread (int irq,void *data);int cs42l42_suspend (struct device *dev);int cs42l42_resume (struct device *dev);void cs42l42_resume_restore (struct device *dev);
Signature · 1 line
2.34.1
PATCH v3 2/8 ASoC: cs42l42: Add SOFT_RESET_REBOOT register
In reply to Stefan BindingFrom: Richard Fitzgerald <[email protected]>
The SOFT_RESET_REBOOT register is needed to recover CS42L42 state after a Soundwire bus reset.
This is required to be set whenever there is severe/hard bus reset.
--- include/sound/cs42l42.h | 5 +++++ sound/soc/codecs/cs42l42.c | 2 ++ 2 files changed, 7 insertions(+)
include/sound/cs42l42.h +5 -0
@@ -34,6 +34,7 @@#define CS42L42_PAGE_24 0x2400#define CS42L42_PAGE_25 0x2500#define CS42L42_PAGE_26 0x2600 +#define CS42L42_PAGE_27 0x2700#define CS42L42_PAGE_28 0x2800#define CS42L42_PAGE_29 0x2900#define CS42L42_PAGE_2A 0x2A00
@@ -720,6 +721,10 @@#define CS42L42_SRC_SDOUT_FS (CS42L42_PAGE_26 + 0x09) +/* Page 0x27 DMA */ +#define CS42L42_SOFT_RESET_REBOOT (CS42L42_PAGE_27 + 0x01) +#define CS42L42_SFT_RST_REBOOT_MASK BIT(1) +/* Page 0x28 S/PDIF Registers */ #define CS42L42_SPDIF_CTL1 (CS42L42_PAGE_28 + 0x01)#define CS42L42_SPDIF_CTL2 (CS42L42_PAGE_28 + 0x02)
sound/soc/codecs/cs42l42.c +2 -0
@@ -293,6 +293,7 @@ bool cs42l42_readable_register(struct device *dev, unsigned int reg)case CS42L42_SPDIF_SW_CTL1 :case CS42L42_SRC_SDIN_FS :case CS42L42_SRC_SDOUT_FS : +case CS42L42_SOFT_RESET_REBOOT :case CS42L42_SPDIF_CTL1 :case CS42L42_SPDIF_CTL2 :case CS42L42_SPDIF_CTL3 :
@@ -358,6 +359,7 @@ bool cs42l42_volatile_register(struct device *dev, unsigned int reg)case CS42L42_LOAD_DET_DONE :case CS42L42_DET_STATUS1 :case CS42L42_DET_STATUS2 : +case CS42L42_SOFT_RESET_REBOOT :return true;default :return false;
Signature · 1 line
2.34.1
PATCH v3 3/8 ASoC: cs42l42: Ensure MCLKint is a multiple of the sample rate
In reply to Stefan BindingFrom: Richard Fitzgerald <[email protected]>
The chosen clocking configuration must give an internal MCLK (MCLKint) that is an integer multiple of the sample rate.
On I2S each of the supported bit clock frequencies can only be generated from one sample rate group (either the 44100 or the 48000) so the code could use only the bitclock to look up a PLL config.
The relationship between sample rate and bitclock frequency is more complex on Soundwire and so it is possible to set a frame shape to generate a bitclock from the "wrong" group. For example 2*147 with a 48000 sample rate would give a bitclock of 14112000 which on I2S could only be derived from a 44100 sample rate.
--- sound/soc/codecs/cs42l42.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
sound/soc/codecs/cs42l42.c +9 -3
@@ -653,7 +653,8 @@ static const struct cs42l42_pll_params pll_ratio_table[] = { { 24576000, 1, 0x03, 0x40, 0x000000, 0x03, 0x10, 12288000, 128, 1} }; -static int cs42l42_pll_config (struct snd_soc_component *component,unsigned int clk) +static int cs42l42_pll_config (struct snd_soc_component *component,unsigned int clk, +unsigned int sample_rate) {struct cs42l42_private *cs42l42 =snd_soc_component_get_drvdata (component);int i;
@@ -668,6 +669,10 @@ static int cs42l42_pll_config(struct snd_soc_component *component, unsigned int }for (i =0 ; i <ARRAY_SIZE (pll_ratio_table); i++) { +/* MCLKint must be a multiple of the sample rate */ +if (pll_ratio_table[i].mclk_int % sample_rate) +continue ; +if (pll_ratio_table[i].sclk == clk) { cs42l42->pll_config = i;
@@ -893,6 +898,7 @@ static int cs42l42_pcm_hw_params(struct snd_pcm_substream *substream,struct cs42l42_private *cs42l42 =snd_soc_component_get_drvdata (component);unsigned int channels =params_channels (params);unsigned int width = (params_width (params) /8 ) -1 ; +unsigned int sample_rate =params_rate (params);unsigned int slot_width =0 ;unsigned int val =0 ;unsigned int bclk;
@@ -956,11 +962,11 @@ static int cs42l42_pcm_hw_params(struct snd_pcm_substream *substream,break ; } - ret =cs42l42_pll_config (component, bclk); + ret =cs42l42_pll_config (component, bclk, sample_rate);if (ret)return ret; -cs42l42_src_config (component,params_rate (params)); +cs42l42_src_config (component, sample_rate);return 0 ; }
Signature · 1 line
2.34.1
PATCH v3 1/8 soundwire: stream: Add specific prep/deprep commands to port_prep callback
In reply to Stefan BindingCurrently, port_prep callback only has commands for PRE_PREP, PREP, and POST_PREP, which doesn't directly say whether this is for a prepare or deprepare call. Extend the command list enum to say whether the call is for prepare or deprepare aswell.
Also remove SDW_OPS_PORT_PREP from sdw_port_prep_ops as this is unused, and update this enum to be simpler and more consistent with enum sdw_clk_stop_type.
Note: Currently, the only users of SDW_OPS_PORT_POST_PREP are codec drivers sound/soc/codecs/wsa881x.c and sound/soc/codecs/wsa883x.c, both of which seem to assume that POST_PREP only occurs after a prepare, even though it would also have occurred after a deprepare. Since it doesn't make sense to mark the port prepared after a deprepare, changing the enum to separate PORT_DEPREP from PORT_PREP should make the check for PORT_PREP in those drivers be more logical.
--- drivers/soundwire/stream.c | 4 ++-- include/linux/soundwire/sdw.h | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-)
drivers/soundwire/stream.c +2 -2
@@ -469,7 +469,7 @@ static int sdw_prep_deprep_slave_ports(struct sdw_bus *bus, }/* Inform slave about the impending port prepare */ -sdw_do_port_prep (s_rt, prep_ch,SDW_OPS_PORT_PRE_PREP ); +sdw_do_port_prep (s_rt, prep_ch, prep ?SDW_OPS_PORT_PRE_PREP :SDW_OPS_PORT_PRE_DEPREP );/* Prepare Slave port implementing CP_SM */ if (!dpn_prop->simple_ch_prep_sm) {
@@ -501,7 +501,7 @@ static int sdw_prep_deprep_slave_ports(struct sdw_bus *bus, }/* Inform slaves about ports prepared */ -sdw_do_port_prep (s_rt, prep_ch,SDW_OPS_PORT_POST_PREP ); +sdw_do_port_prep (s_rt, prep_ch, prep ?SDW_OPS_PORT_POST_PREP :SDW_OPS_PORT_POST_DEPREP );/* Disable interrupt after Port de-prepare */ if (!prep && intr)
include/linux/soundwire/sdw.h +5 -3
@@ -569,13 +569,15 @@ struct sdw_prepare_ch {* enum sdw_port_prep_ops: Prepare operations for Data Port * * @SDW_OPS_PORT_PRE_PREP: Pre prepare operation for the Port -* @SDW_OPS_PORT_PREP: Prepare operation for the Port +* @SDW_OPS_PORT_PRE_DEPREP: Pre deprepare operation for the Port * @SDW_OPS_PORT_POST_PREP: Post prepare operation for the Port +* @SDW_OPS_PORT_POST_DEPREP: Post deprepare operation for the Port */ enum sdw_port_prep_ops {SDW_OPS_PORT_PRE_PREP =0 , -SDW_OPS_PORT_PREP =1 , -SDW_OPS_PORT_POST_PREP =2 , +SDW_OPS_PORT_PRE_DEPREP , +SDW_OPS_PORT_POST_PREP , +SDW_OPS_PORT_POST_DEPREP , };/**
Signature · 1 line
2.34.1
PATCH v3 4/8 ASoC: cs42l42: Separate ASP config from PLL config
In reply to Stefan BindingFrom: Richard Fitzgerald <[email protected]>
Setup of the ASP (audio serial port) was being done as a side-effect of cs42l42_pll_config() and forces a restriction on the ratio of sample_rate to bit_clock that is invalid for Soundwire.
Move the ASP setup into a dedicated function.
--- sound/soc/codecs/cs42l42.c | 81 +++++++++++++++++++++----------------- sound/soc/codecs/cs42l42.h | 1 - 2 files changed, 44 insertions(+), 38 deletions(-)
sound/soc/codecs/cs42l42.c +44 -37
@@ -658,7 +658,6 @@ static int cs42l42_pll_config(struct snd_soc_component *component, unsigned int {struct cs42l42_private *cs42l42 =snd_soc_component_get_drvdata (component);int i; -u32 fsync;/* Don't reconfigure if there is an audio stream running */ if (cs42l42->stream_use) {
@@ -684,40 +683,6 @@ static int cs42l42_pll_config(struct snd_soc_component *component, unsigned int (pll_ratio_table[i].mclk_int != 24000000)) << CS42L42_INTERNAL_FS_SHIFT); - -/* Set up the LRCLK */ - fsync = clk / cs42l42->srate; -if (((fsync * cs42l42->srate) != clk) - || ((fsync %2 ) !=0 )) { -dev_err (component->dev, -"Unsupported sclk %d/sample rate %d\n" , - clk, - cs42l42->srate); -return -EINVAL ; - } -/* Set the LRCLK period */ -snd_soc_component_update_bits (component, -CS42L42_FSYNC_P_LOWER , -CS42L42_FSYNC_PERIOD_MASK , -CS42L42_FRAC0_VAL (fsync -1 ) << -CS42L42_FSYNC_PERIOD_SHIFT ); -snd_soc_component_update_bits (component, -CS42L42_FSYNC_P_UPPER , -CS42L42_FSYNC_PERIOD_MASK , -CS42L42_FRAC1_VAL (fsync -1 ) << -CS42L42_FSYNC_PERIOD_SHIFT ); -/* Set the LRCLK to 50% duty cycle */ - fsync = fsync /2 ; -snd_soc_component_update_bits (component, -CS42L42_FSYNC_PW_LOWER , -CS42L42_FSYNC_PULSE_WIDTH_MASK , -CS42L42_FRAC0_VAL (fsync -1 ) << -CS42L42_FSYNC_PULSE_WIDTH_SHIFT ); -snd_soc_component_update_bits (component, -CS42L42_FSYNC_PW_UPPER , -CS42L42_FSYNC_PULSE_WIDTH_MASK , -CS42L42_FRAC1_VAL (fsync -1 ) << -CS42L42_FSYNC_PULSE_WIDTH_SHIFT );if (pll_ratio_table[i].mclk_src_sel ==0 ) {/* Pass the clock straight through */ snd_soc_component_update_bits(component,
@@ -809,6 +774,46 @@ static void cs42l42_src_config(struct snd_soc_component *component, unsigned int fs << CS42L42_CLK_OASRC_SEL_SHIFT); } +static int cs42l42_asp_config (struct snd_soc_component *component, +unsigned int sclk,unsigned int sample_rate) +{ +u32 fsync = sclk / sample_rate; + +/* Set up the LRCLK */ +if (((fsync * sample_rate) != sclk) || ((fsync %2 ) !=0 )) { +dev_err (component->dev, +"Unsupported sclk %d/sample rate %d\n" , + sclk, + sample_rate); +return -EINVAL ; + } +/* Set the LRCLK period */ +snd_soc_component_update_bits (component, +CS42L42_FSYNC_P_LOWER , +CS42L42_FSYNC_PERIOD_MASK , +CS42L42_FRAC0_VAL (fsync -1 ) << +CS42L42_FSYNC_PERIOD_SHIFT ); +snd_soc_component_update_bits (component, +CS42L42_FSYNC_P_UPPER , +CS42L42_FSYNC_PERIOD_MASK , +CS42L42_FRAC1_VAL (fsync -1 ) << +CS42L42_FSYNC_PERIOD_SHIFT ); +/* Set the LRCLK to 50% duty cycle */ + fsync = fsync /2 ; +snd_soc_component_update_bits (component, +CS42L42_FSYNC_PW_LOWER , +CS42L42_FSYNC_PULSE_WIDTH_MASK , +CS42L42_FRAC0_VAL (fsync -1 ) << +CS42L42_FSYNC_PULSE_WIDTH_SHIFT ); +snd_soc_component_update_bits (component, +CS42L42_FSYNC_PW_UPPER , +CS42L42_FSYNC_PULSE_WIDTH_MASK , +CS42L42_FRAC1_VAL (fsync -1 ) << +CS42L42_FSYNC_PULSE_WIDTH_SHIFT ); + +return 0 ; +} +static int cs42l42_set_dai_fmt (struct snd_soc_dai *codec_dai,unsigned int fmt) {struct snd_soc_component *component = codec_dai->component;
@@ -904,8 +909,6 @@ static int cs42l42_pcm_hw_params(struct snd_pcm_substream *substream,unsigned int bclk;int ret; - cs42l42->srate =params_rate (params); -if (cs42l42->bclk_ratio) {/* machine driver has set the BCLK/samp-rate ratio */ bclk = cs42l42->bclk_ratio *params_rate (params);
@@ -966,6 +969,10 @@ static int cs42l42_pcm_hw_params(struct snd_pcm_substream *substream,if (ret)return ret; + ret =cs42l42_asp_config (component, bclk, sample_rate); +if (ret) +return ret; +cs42l42_src_config (component, sample_rate);return 0 ;
sound/soc/codecs/cs42l42.h +0 -1
@@ -36,7 +36,6 @@ struct cs42l42_private {int pll_config;u32 sclk;u32 bclk_ratio; -u32 srate;u8 plug_state;u8 hs_type;u8 ts_inv;
Signature · 1 line
2.34.1
PATCH v3 7/8 ASoC: cs42l42: Don't set idle_bias_on
In reply to Stefan BindingFrom: Richard Fitzgerald <[email protected]>
idle_bias_on was set because cs42l42 has a "VMID" type pseudo-midrail supply (named FILT+), and these typically take a long time to charge. But the driver never enabled pm_runtime so it would never have powered- down the cs42l42 anyway.
In fact, FILT+ can charge to operating voltage within 12.5 milliseconds of enabling HP or ADC. This time is already covered by the startup delay of the HP/ADC.
The datasheet warning about FILT+ taking up to 1 second to charge only applies in the special cases that either the PLL is started or DETECT_MODE set to non-zero while both HP and ADC are off. The driver never does either of these.
Removing idle_bias_on allows the Soundwire host controller to suspend if there isn't a snd_soc_jack handler registered.
--- sound/soc/codecs/cs42l42.c | 1 - 1 file changed, 1 deletion(-)
sound/soc/codecs/cs42l42.c +0 -1
@@ -597,7 +597,6 @@ const struct snd_soc_component_driver cs42l42_soc_component = { .num_dapm_routes = ARRAY_SIZE(cs42l42_audio_map), .controls = cs42l42_snd_controls, .num_controls = ARRAY_SIZE(cs42l42_snd_controls), - .idle_bias_on = 1, .endianness = 1, };EXPORT_SYMBOL_NS_GPL (cs42l42_soc_component,SND_SOC_CS42L42_CORE );
Signature · 1 line
2.34.1
PATCH v3 8/8 ASoC: cs42l42: Wait for debounce interval after resume
In reply to Stefan BindingSince clock stop causes bus reset on Intel controllers, we need to wait for the debounce interval on resume, to ensure all the interrupt status registers are set correctly.
--- sound/soc/codecs/cs42l42-sdw.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
sound/soc/codecs/cs42l42-sdw.c +9 -1
@@ -447,7 +447,9 @@ static int __maybe_unused cs42l42_sdw_handle_unattach(struct cs42l42_private *csstatic int __maybe_unused cs42l42_sdw_runtime_resume (struct device *dev) { +static const unsigned int ts_dbnce_ms[] = {0 ,125 ,250 ,500 ,750 ,1000 ,1250 ,1500 };struct cs42l42_private *cs42l42 =dev_get_drvdata (dev); +unsigned int dbnce;int ret;dev_dbg (dev,"Runtime resume\n" );
@@ -456,8 +458,14 @@ static int __maybe_unused cs42l42_sdw_runtime_resume(struct device *dev)return 0 ; ret =cs42l42_sdw_handle_unattach (cs42l42); -if (ret <0 ) +if (ret <0 ) {return ret; + }else if (ret >0 ) { + dbnce =max (cs42l42->ts_dbnc_rise, cs42l42->ts_dbnc_fall); + +if (dbnce >0 ) +msleep (ts_dbnce_ms[dbnce]); + }regcache_cache_only (cs42l42->regmap, false);
Signature · 1 line
2.34.1
PATCH v3 6/8 ASoC: cs42l42: Add SoundWire support
In reply to Stefan BindingFrom: Richard Fitzgerald <[email protected]>
This adds support for using CS42L42 as a SoundWire device.
SoundWire-specifics are kept separate from the I2S implementation as much as possible, aiming to limit the risk of breaking the I2C+I2S support.
There are some important differences in the silicon behaviour between I2S and SoundWire mode that are reflected in the implementation:
- ASP (I2S) most not be used in SoundWire mode because the two interfaces share pins.
- The SoundWire capture (record) port only supports 1 channel. It does not have left-to-right duplication like the ASP.
- DP2 can only be prepared if the HP has powered-up. DP1 can only be prepared if the ADC has powered-up. (This ordering restriction does not exist for ASPs.) The SoundWire core port-prepare step is triggered by the DAI-link prepare(). This happens before the codec DAI prepare() or the DAPM sequence so these cannot be used to enable HP/ADC. Instead the HP/ADC enable/disable are done during the port_prep callback.
- The SRCs are an integral part of the audio chain but in silicon their power control is linked to the ASP. There is no equivalent power link to SoundWire DPs so the driver must take "manual" control of SRC power.
- The SoundWire control registers occupy the lower part of the SoundWire address space so cs42l42 registers are offset by 0x8000 (non-paged) in SoundWire mode.
- Register addresses are 8-bit paged in I2C mode but 16-bit unpaged in SoundWire.
- Special procedures are needed on register read/writes to (a) ensure that the previous internal bus transaction has completed, and
(b) handle delayed read results, when the read value could not be returned within the SoundWire read command.
There are also some differences in driver implementation between I2S and SoundWire operation:
- CS42L42 I2S does not runtime_suspend, but runtime_suspend/resume support has been added into the driver in SoundWire mode as the most convenient way to power-up the bus manager and to handle the unattach_request condition, though the CS42L42 chip does not itself suspend or resume.
- Intel SoundWire host controllers have a low-power clock-stop mode that requires resetting all peripherals when resuming. This means that the interrupt registers will be reset in between the interrupt being generated and the interrupt being handled, and since the interrupt status is debounced, these values may not be accurate immediately, and may cause spurious unplug events before settling.
- As in I2S mode, the PLL is only used while audio is active because of clocking quirks in the silicon. For SoundWire the cs42l42_pll_config() is deferred until the DAI prepare(), to allow the cs42l42_bus_config() callback to set the SCLK.
--- sound/soc/codecs/Kconfig | 8 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/cs42l42-sdw.c | 602 +++++++++++++++++++++++++++++++++ sound/soc/codecs/cs42l42.c | 27 ++ sound/soc/codecs/cs42l42.h | 3 + 5 files changed, 642 insertions(+) create mode 100644 sound/soc/codecs/cs42l42-sdw.c
sound/soc/codecs/Kconfig +8 -0
@@ -68,6 +68,7 @@ config SND_SOC_ALL_CODECS imply SND_SOC_CS35L45_I2C imply SND_SOC_CS35L45_SPI imply SND_SOC_CS42L42 + imply SND_SOC_CS42L42_SDW imply SND_SOC_CS42L51_I2C imply SND_SOC_CS42L52 imply SND_SOC_CS42L56
@@ -703,6 +704,13 @@ config SND_SOC_CS42L42 select REGMAP_I2C select SND_SOC_CS42L42_CORE +config SND_SOC_CS42L42_SDW + tristate "Cirrus Logic CS42L42 CODEC on Soundwire" + depends on SOUNDWIRE + select SND_SOC_CS42L42_CORE + help + Enable support for Cirrus Logic CS42L42 codec with Soundwire control + config SND_SOC_CS42L51 tristate
sound/soc/codecs/Makefile +2 -0
@@ -66,6 +66,7 @@ snd-soc-cs35l45-spi-objs := cs35l45-spi.o snd-soc-cs35l45-i2c-objs := cs35l45-i2c.o snd-soc-cs42l42-objs := cs42l42.o snd-soc-cs42l42-i2c-objs := cs42l42-i2c.o +snd-soc-cs42l42-sdw-objs := cs42l42-sdw.o snd-soc-cs42l51-objs := cs42l51.o snd-soc-cs42l51-i2c-objs := cs42l51-i2c.o snd-soc-cs42l52-objs := cs42l52.o
@@ -427,6 +428,7 @@ obj-$(CONFIG_SND_SOC_CS35L45_SPI) += snd-soc-cs35l45-spi.o obj-$(CONFIG_SND_SOC_CS35L45_I2C) += snd-soc-cs35l45-i2c.o obj-$(CONFIG_SND_SOC_CS42L42_CORE) += snd-soc-cs42l42.o obj-$(CONFIG_SND_SOC_CS42L42) += snd-soc-cs42l42-i2c.o +obj-$(CONFIG_SND_SOC_CS42L42_SDW) += snd-soc-cs42l42-sdw.o obj-$(CONFIG_SND_SOC_CS42L51) += snd-soc-cs42l51.o obj-$(CONFIG_SND_SOC_CS42L51_I2C) += snd-soc-cs42l51-i2c.o obj-$(CONFIG_SND_SOC_CS42L52) += snd-soc-cs42l52.o
sound/soc/codecs/cs42l42-sdw.c new file +602 -0
602 lines not on this page · raw message
sound/soc/codecs/cs42l42.c +27 -0
@@ -20,6 +20,7 @@#include <linux/slab.h> #include <linux/acpi.h> #include <linux/platform_device.h> +#include <linux/pm_runtime.h> #include <linux/property.h> #include <linux/regulator/consumer.h> #include <linux/gpio/consumer.h>
@@ -525,6 +526,10 @@ static const struct snd_soc_dapm_widget cs42l42_dapm_widgets[] = {/* Playback/Capture Requirements */ SND_SOC_DAPM_SUPPLY ("SCLK" ,CS42L42_ASP_CLK_CFG ,CS42L42_ASP_SCLK_EN_SHIFT ,0 ,NULL ,0 ), + +/* Soundwire SRC power control */ +SND_SOC_DAPM_PGA ("DACSRC" ,CS42L42_PWR_CTL2 ,CS42L42_DAC_SRC_PDNB_SHIFT ,0 ,NULL ,0 ), + SND_SOC_DAPM_PGA("ADCSRC", CS42L42_PWR_CTL2, CS42L42_ADC_SRC_PDNB_SHIFT, 0, NULL, 0), }; static const struct snd_soc_dapm_route cs42l42_audio_map[] = {
@@ -1660,9 +1665,11 @@ irqreturn_t cs42l42_irq_thread(int irq, void *data)unsigned int current_button_status;unsigned int i; +pm_runtime_get_sync (cs42l42->dev);mutex_lock (&cs42l42->irq_lock);if (cs42l42->suspended || !cs42l42->init_done) {mutex_unlock (&cs42l42->irq_lock); +pm_runtime_put_autosuspend (cs42l42->dev);return IRQ_NONE ; }
@@ -1765,6 +1772,8 @@ irqreturn_t cs42l42_irq_thread(int irq, void *data) }mutex_unlock (&cs42l42->irq_lock); +pm_runtime_mark_last_busy (cs42l42->dev); +pm_runtime_put_autosuspend (cs42l42->dev);return IRQ_HANDLED ; }
@@ -2144,6 +2153,9 @@ int cs42l42_suspend(struct device *dev)u8 save_regs[ARRAY_SIZE (cs42l42_shutdown_seq)];int i, ret; +if (!cs42l42->init_done) +return 0 ; +/* * Wait for threaded irq handler to be idle and stop it processing * future interrupts. This ensures a safe disable if the interrupt
@@ -2204,6 +2216,9 @@ int cs42l42_resume(struct device *dev)struct cs42l42_private *cs42l42 =dev_get_drvdata (dev);int ret; +if (!cs42l42->init_done) +return 0 ; +/* * If jack was unplugged and re-plugged during suspend it could * have changed type but the tip-sense state hasn't changed.
@@ -2388,6 +2403,18 @@ int cs42l42_init(struct cs42l42_private *cs42l42)if (ret !=0 ) goto err_shutdown; +/* +* SRC power is linked to ASP power so doesn't work in Soundwire mode. +* Override it and use DAPM to control SRC power for Soundwire. +*/ +if (cs42l42->sdw_peripheral) { +regmap_update_bits (cs42l42->regmap,CS42L42_PWR_CTL2 , +CS42L42_SRC_PDN_OVERRIDE_MASK | +CS42L42_DAC_SRC_PDNB_MASK | +CS42L42_ADC_SRC_PDNB_MASK , +CS42L42_SRC_PDN_OVERRIDE_MASK ); + } +/* Setup headset detection */ cs42l42_setup_hs_type_detect (cs42l42);
sound/soc/codecs/cs42l42.h +3 -0
@@ -18,6 +18,7 @@#include <linux/mutex.h> #include <linux/regmap.h> #include <linux/regulator/consumer.h> +#include <linux/soundwire/sdw.h> #include <sound/jack.h> #include <sound/cs42l42.h> #include <sound/soc-component.h>
@@ -30,11 +31,13 @@ struct cs42l42_private {struct gpio_desc *reset_gpio;struct completion pdn_done;struct snd_soc_jack *jack; +struct sdw_slave *sdw_peripheral;struct mutex irq_lock;int devid;int irq;int pll_config;u32 sclk; +u32 sample_rate;u32 bclk_ratio;u8 plug_state;u8 hs_type;
Signature · 1 line
2.34.1
Re: [PATCH v3 2/8] ASoC: cs42l42: Add SOFT_RESET_REBOOT register
In reply to Stefan BindingQuoted 9 lines · Stefan Binding
From: Richard Fitzgerald <[email protected]>
The
SOFT_RESET_REBOOTregister is needed to recover CS42L42 state after a Soundwire bus reset.This is required to be set whenever there is severe/hard bus reset.
Signed-off-by Richard Fitzgerald <[email protected]>Signed-off-by Stefan Binding <[email protected]>
Quoted 48 lines
--- include/sound/cs42l42.h | 5 +++++ sound/soc/codecs/cs42l42.c | 2 ++ 2 files changed, 7 insertions(+)include/sound/cs42l42.h +5
-0@@ -34,6 +34,7 @@#define CS42L42_PAGE_24 0x2400#define CS42L42_PAGE_25 0x2500#define CS42L42_PAGE_26 0x2600 +#define CS42L42_PAGE_27 0x2700#define CS42L42_PAGE_28 0x2800#define CS42L42_PAGE_29 0x2900#define CS42L42_PAGE_2A 0x2A00@@ -720,6 +721,10 @@#define CS42L42_SRC_SDOUT_FS (CS42L42_PAGE_26 + 0x09) +/* Page 0x27 DMA */ +#define CS42L42_SOFT_RESET_REBOOT (CS42L42_PAGE_27 + 0x01) +#define CS42L42_SFT_RST_REBOOT_MASK BIT(1) +/* Page 0x28 S/PDIF Registers */ #define CS42L42_SPDIF_CTL1 (CS42L42_PAGE_28 + 0x01)#define CS42L42_SPDIF_CTL2 (CS42L42_PAGE_28 + 0x02)sound/soc/codecs/cs42l42.c +2
-0@@ -293,6 +293,7 @@ bool cs42l42_readable_register(struct device *dev, unsigned int reg)case CS42L42_SPDIF_SW_CTL1 :case CS42L42_SRC_SDIN_FS :case CS42L42_SRC_SDOUT_FS : +case CS42L42_SOFT_RESET_REBOOT :case CS42L42_SPDIF_CTL1 :case CS42L42_SPDIF_CTL2 :case CS42L42_SPDIF_CTL3 :@@ -358,6 +359,7 @@ bool cs42l42_volatile_register(struct device *dev, unsigned int reg)case CS42L42_LOAD_DET_DONE :case CS42L42_DET_STATUS1 :case CS42L42_DET_STATUS2 : +case CS42L42_SOFT_RESET_REBOOT :return true;default :return false;
Re: [PATCH v3 5/8] ASoC: cs42l42: Export some functions for SoundWire
In reply to Stefan BindingQuoted 6 lines · Stefan Binding
From: Richard Fitzgerald <[email protected]>
Export functions that will be needed by a SoundWire module.
Signed-off-by Richard Fitzgerald <[email protected]>Signed-off-by Stefan Binding <[email protected]>
Re: [PATCH v3 4/8] ASoC: cs42l42: Separate ASP config from PLL config
In reply to Stefan BindingQuoted 10 lines · Stefan Binding
From: Richard Fitzgerald <[email protected]>
Setup of the ASP (audio serial port) was being done as a side-effect of
cs42l42_pll_config()and forces a restriction on the ratio ofsample_ratetobit_clockthat is invalid for Soundwire.Move the ASP setup into a dedicated function.
Signed-off-by Richard Fitzgerald <[email protected]>Signed-off-by Stefan Binding <[email protected]>
Quoted 137 lines
--- sound/soc/codecs/cs42l42.c | 81 +++++++++++++++++++++----------------- sound/soc/codecs/cs42l42.h | 1 - 2 files changed, 44 insertions(+), 38 deletions(-)sound/soc/codecs/cs42l42.c +44
-37@@ -658,7 +658,6 @@ static int cs42l42_pll_config(struct snd_soc_component *component, unsigned int {struct cs42l42_private *cs42l42 =snd_soc_component_get_drvdata (component);int i; -u32 fsync;/* Don't reconfigure if there is an audio stream running */ if (cs42l42->stream_use) {@@ -684,40 +683,6 @@ static int cs42l42_pll_config(struct snd_soc_component *component, unsigned int (pll_ratio_table[i].mclk_int != 24000000)) << CS42L42_INTERNAL_FS_SHIFT); - -/* Set up the LRCLK */ - fsync = clk / cs42l42->srate; -if (((fsync * cs42l42->srate) != clk) - || ((fsync %2 ) !=0 )) { -dev_err (component->dev, -"Unsupported sclk %d/sample rate %d\n" , - clk, - cs42l42->srate); -return -EINVAL ; - } -/* Set the LRCLK period */ -snd_soc_component_update_bits (component, -CS42L42_FSYNC_P_LOWER , -CS42L42_FSYNC_PERIOD_MASK , -CS42L42_FRAC0_VAL (fsync -1 ) << -CS42L42_FSYNC_PERIOD_SHIFT ); -snd_soc_component_update_bits (component, -CS42L42_FSYNC_P_UPPER , -CS42L42_FSYNC_PERIOD_MASK , -CS42L42_FRAC1_VAL (fsync -1 ) << -CS42L42_FSYNC_PERIOD_SHIFT ); -/* Set the LRCLK to 50% duty cycle */ - fsync = fsync /2 ; -snd_soc_component_update_bits (component, -CS42L42_FSYNC_PW_LOWER , -CS42L42_FSYNC_PULSE_WIDTH_MASK , -CS42L42_FRAC0_VAL (fsync -1 ) << -CS42L42_FSYNC_PULSE_WIDTH_SHIFT ); -snd_soc_component_update_bits (component, -CS42L42_FSYNC_PW_UPPER , -CS42L42_FSYNC_PULSE_WIDTH_MASK , -CS42L42_FRAC1_VAL (fsync -1 ) << -CS42L42_FSYNC_PULSE_WIDTH_SHIFT );if (pll_ratio_table[i].mclk_src_sel ==0 ) {/* Pass the clock straight through */ snd_soc_component_update_bits(component,@@ -809,6 +774,46 @@ static void cs42l42_src_config(struct snd_soc_component *component, unsigned int fs << CS42L42_CLK_OASRC_SEL_SHIFT); } +static int cs42l42_asp_config (struct snd_soc_component *component, +unsigned int sclk,unsigned int sample_rate) +{ +u32 fsync = sclk / sample_rate; + +/* Set up the LRCLK */ +if (((fsync * sample_rate) != sclk) || ((fsync %2 ) !=0 )) { +dev_err (component->dev, +"Unsupported sclk %d/sample rate %d\n" , + sclk, + sample_rate); +return -EINVAL ; + } +/* Set the LRCLK period */ +snd_soc_component_update_bits (component, +CS42L42_FSYNC_P_LOWER , +CS42L42_FSYNC_PERIOD_MASK , +CS42L42_FRAC0_VAL (fsync -1 ) << +CS42L42_FSYNC_PERIOD_SHIFT ); +snd_soc_component_update_bits (component, +CS42L42_FSYNC_P_UPPER , +CS42L42_FSYNC_PERIOD_MASK , +CS42L42_FRAC1_VAL (fsync -1 ) << +CS42L42_FSYNC_PERIOD_SHIFT ); +/* Set the LRCLK to 50% duty cycle */ + fsync = fsync /2 ; +snd_soc_component_update_bits (component, +CS42L42_FSYNC_PW_LOWER , +CS42L42_FSYNC_PULSE_WIDTH_MASK , +CS42L42_FRAC0_VAL (fsync -1 ) << +CS42L42_FSYNC_PULSE_WIDTH_SHIFT ); +snd_soc_component_update_bits (component, +CS42L42_FSYNC_PW_UPPER , +CS42L42_FSYNC_PULSE_WIDTH_MASK , +CS42L42_FRAC1_VAL (fsync -1 ) << +CS42L42_FSYNC_PULSE_WIDTH_SHIFT ); + +return 0 ; +} +static int cs42l42_set_dai_fmt (struct snd_soc_dai *codec_dai,unsigned int fmt) {struct snd_soc_component *component = codec_dai->component;@@ -904,8 +909,6 @@ static int cs42l42_pcm_hw_params(struct snd_pcm_substream *substream,unsigned int bclk;int ret; - cs42l42->srate =params_rate (params); -if (cs42l42->bclk_ratio) {/* machine driver has set the BCLK/samp-rate ratio */ bclk = cs42l42->bclk_ratio *params_rate (params);@@ -966,6 +969,10 @@ static int cs42l42_pcm_hw_params(struct snd_pcm_substream *substream,if (ret)return ret; + ret =cs42l42_asp_config (component, bclk, sample_rate); +if (ret) +return ret; +cs42l42_src_config (component, sample_rate);return 0 ;sound/soc/codecs/cs42l42.h +0
-1@@ -36,7 +36,6 @@ struct cs42l42_private {int pll_config;u32 sclk;u32 bclk_ratio; -u32 srate;u8 plug_state;u8 hs_type;u8 ts_inv;
Quoted 56 lines · Stefan Binding
From: Richard Fitzgerald <[email protected]>
This adds support for using CS42L42 as a SoundWire device.
SoundWire-specifics are kept separate from the I2S implementation as much as possible, aiming to limit the risk of breaking the I2C+I2S support.
There are some important differences in the silicon behaviour between I2S and SoundWire mode that are reflected in the implementation:
- ASP (I2S) most not be used in SoundWire mode because the two interfaces share pins.
- The SoundWire capture (record) port only supports 1 channel. It does not have left-to-right duplication like the ASP.
- DP2 can only be prepared if the HP has powered-up. DP1 can only be prepared if the ADC has powered-up. (This ordering restriction does not exist for ASPs.) The SoundWire core port-prepare step is triggered by the DAI-link
prepare(). This happens before the codec DAIprepare()or the DAPM sequence so these cannot be used to enable HP/ADC. Instead the HP/ADC enable/disable are done during theport_prepcallback.- The SRCs are an integral part of the audio chain but in silicon their power control is linked to the ASP. There is no equivalent power link to SoundWire DPs so the driver must take "manual" control of SRC power.
- The SoundWire control registers occupy the lower part of the SoundWire address space so cs42l42 registers are offset by
0x8000(non-paged) in SoundWire mode.- Register addresses are 8-bit paged in I2C mode but 16-bit unpaged in SoundWire.
- Special procedures are needed on register read/writes to (a) ensure that the previous internal bus transaction has completed, and
(b) handle delayed read results, when the read value could not be returned within the SoundWire read command.There are also some differences in driver implementation between I2S and SoundWire operation:
- CS42L42 I2S does not
runtime_suspend, but runtime_suspend/resume support has been added into the driver in SoundWire mode as the most convenient way to power-up the bus manager and to handle theunattach_requestcondition, though the CS42L42 chip does not itself suspend or resume.- Intel SoundWire host controllers have a low-power clock-stop mode that requires resetting all peripherals when resuming. This means that the interrupt registers will be reset in between the interrupt being generated and the interrupt being handled, and since the interrupt status is debounced, these values may not be accurate immediately, and may cause spurious unplug events before settling.
Quoted 7 lines
- As in I2S mode, the PLL is only used while audio is active because of clocking quirks in the silicon. For SoundWire the
cs42l42_pll_config()is deferred until the DAIprepare(), to allow thecs42l42_bus_config()callback to set the SCLK.Signed-off-by Richard Fitzgerald <[email protected]>Signed-off-by Stefan Binding <[email protected]>
sound/soc/codecs/cs42l42-sdw.c line 161
Quoted 10 lines
sound/soc/codecs/cs42l42-sdw.c new file +10
-0+static int cs42l42_sdw_dai_set_sdw_stream (struct snd_soc_dai *dai,void *sdw_stream, +int direction) +{ +if (!sdw_stream) +return 0 ; + +if (direction ==SNDRV_PCM_STREAM_PLAYBACK ) + dai->playback_dma_data = sdw_stream; +else + dai->capture_dma_data = sdw_stream;
This may need to be updated tosnd_soc_dai_dma_data_set(dai, direction, stream);
which is being introduced by Morimoto-san
To avoid dependencies this could be updated later.
Re: [PATCH v3 7/8] ASoC: cs42l42: Don't set idle_bias_on
In reply to Stefan BindingQuoted 16 lines · Stefan Binding
From: Richard Fitzgerald <[email protected]>
idle_bias_onwas set because cs42l42 has a "VMID" type pseudo-midrail supply (named FILT+), and these typically take a long time to charge. But the driver never enabledpm_runtimeso it would never have powered- down the cs42l42 anyway.In fact, FILT+ can charge to operating voltage within 12.5 milliseconds of enabling HP or ADC. This time is already covered by the startup delay of the HP/ADC.
The datasheet warning about FILT+ taking up to 1 second to charge only applies in the special cases that either the PLL is started or
DETECT_MODEset to non-zero while both HP and ADC are off. The driver never does either of these.
Quoted 5 lines
Removing
idle_bias_onallows the Soundwire host controller to suspend if there isn't asnd_soc_jackhandler registered.Signed-off-by Richard Fitzgerald <[email protected]>Signed-off-by Stefan Binding <[email protected]>
Quoted 16 lines
--- sound/soc/codecs/cs42l42.c | 1 - 1 file changed, 1 deletion(-)sound/soc/codecs/cs42l42.c +0
-1@@ -597,7 +597,6 @@ const struct snd_soc_component_driver cs42l42_soc_component = { .num_dapm_routes = ARRAY_SIZE(cs42l42_audio_map), .controls = cs42l42_snd_controls, .num_controls = ARRAY_SIZE(cs42l42_snd_controls), - .idle_bias_on = 1, .endianness = 1, };EXPORT_SYMBOL_NS_GPL (cs42l42_soc_component,SND_SOC_CS42L42_CORE );
Re: [PATCH v3 8/8] ASoC: cs42l42: Wait for debounce interval after resume
In reply to Stefan BindingQuoted 1 line · Stefan Binding
Since clock stop causes bus reset on Intel controllers, we need
nit-pick: It's more that the Intel controller has a power optimization where the context is lost when stopping the clock, which requires a bus reset and full re-enumeration/initialization when the clock resumes.
The rest of the patch is fine so
Quoted 4 lines
to wait for the debounce interval on resume, to ensure all the interrupt status registers are set correctly.
Signed-off-by Stefan Binding <[email protected]>
Richard Fitzgerald
maintainerQuoted 83 lines · Pierre-Louis Bossart
Quoted 56 lines · Stefan Binding
From: Richard Fitzgerald <[email protected]>
This adds support for using CS42L42 as a SoundWire device.
SoundWire-specifics are kept separate from the I2S implementation as much as possible, aiming to limit the risk of breaking the I2C+I2S support.
There are some important differences in the silicon behaviour between I2S and SoundWire mode that are reflected in the implementation:
- ASP (I2S) most not be used in SoundWire mode because the two interfaces share pins.
- The SoundWire capture (record) port only supports 1 channel. It does not have left-to-right duplication like the ASP.
- DP2 can only be prepared if the HP has powered-up. DP1 can only be prepared if the ADC has powered-up. (This ordering restriction does not exist for ASPs.) The SoundWire core port-prepare step is triggered by the DAI-link
prepare(). This happens before the codec DAIprepare()or the DAPM sequence so these cannot be used to enable HP/ADC. Instead the HP/ADC enable/disable are done during theport_prepcallback.- The SRCs are an integral part of the audio chain but in silicon their power control is linked to the ASP. There is no equivalent power link to SoundWire DPs so the driver must take "manual" control of SRC power.
- The SoundWire control registers occupy the lower part of the SoundWire address space so cs42l42 registers are offset by
0x8000(non-paged) in SoundWire mode.- Register addresses are 8-bit paged in I2C mode but 16-bit unpaged in SoundWire.
- Special procedures are needed on register read/writes to (a) ensure that the previous internal bus transaction has completed, and
(b) handle delayed read results, when the read value could not be returned within the SoundWire read command.There are also some differences in driver implementation between I2S and SoundWire operation:
- CS42L42 I2S does not
runtime_suspend, but runtime_suspend/resume support has been added into the driver in SoundWire mode as the most convenient way to power-up the bus manager and to handle theunattach_requestcondition, though the CS42L42 chip does not itself suspend or resume.- Intel SoundWire host controllers have a low-power clock-stop mode that requires resetting all peripherals when resuming. This means that the interrupt registers will be reset in between the interrupt being generated and the interrupt being handled, and since the interrupt status is debounced, these values may not be accurate immediately, and may cause spurious unplug events before settling.
Quoted 7 lines
- As in I2S mode, the PLL is only used while audio is active because of clocking quirks in the silicon. For SoundWire the
cs42l42_pll_config()is deferred until the DAIprepare(), to allow thecs42l42_bus_config()callback to set the SCLK.Signed-off-by Richard Fitzgerald <[email protected]>Signed-off-by Stefan Binding <[email protected]>Reviewed-by Pierre-Louis Bossart <[email protected]>sound/soc/codecs/cs42l42-sdw.c line 161
Quoted 10 lines
sound/soc/codecs/cs42l42-sdw.c new file +10
-0+static int cs42l42_sdw_dai_set_sdw_stream (struct snd_soc_dai *dai,void *sdw_stream, +int direction) +{ +if (!sdw_stream) +return 0 ; + +if (direction ==SNDRV_PCM_STREAM_PLAYBACK ) + dai->playback_dma_data = sdw_stream; +else + dai->capture_dma_data = sdw_stream;This may need to be updated to
snd_soc_dai_dma_data_set(dai, direction, stream);
Quoted 4 lines
which is being introduced by Morimoto-san
To avoid dependencies this could be updated later.
We'll do it later. As you say, to avoid dependencies.
I've thought a few times about making a function for this but couldn't decide what to call it to distinguish from the existing snd_soc_dai_set_dma_data().
My preference was to create a SoC function that does exactly the same as cs42l42_sdw_dai_set_sdw_stream() so if that's all you need you can point your snd_soc_dai_ops directly at it.
Re: [PATCH v3 1/8] soundwire: stream: Add specific prep/deprep commands to port_prep callback
In reply to Stefan BindingQuoted 9 lines · Stefan Binding
Currently,
port_prepcallback only has commands forPRE_PREP, PREP, andPOST_PREP, which doesn't directly say whether this is for a prepare or deprepare call. Extend the command list enum to say whether the call is for prepare or deprepare aswell.Also remove
SDW_OPS_PORT_PREPfromsdw_port_prep_opsas this is unused, and update this enum to be simpler and more consistent with enumsdw_clk_stop_type.
Quoted 7 lines
Note: Currently, the only users of
SDW_OPS_PORT_POST_PREPare codec driverssound/soc/codecs/wsa881x.candsound/soc/codecs/wsa883x.c, both of which seem to assume thatPOST_PREPonly occurs after a prepare, even though it would also have occurred after a deprepare. Since it doesn't make sense to mark the port prepared after a deprepare, changing the enum to separatePORT_DEPREPfromPORT_PREPshould make the check forPORT_PREPin those drivers be more logical.
Signature · 1 line
~Vinod
Richard Fitzgerald
maintainerRe: [PATCH v3 8/8] ASoC: cs42l42: Wait for debounce interval after resume
In reply to Pierre-Louis BossartQuoted 9 lines · Pierre-Louis Bossart
Quoted 1 line · Stefan Binding
Since clock stop causes bus reset on Intel controllers, we need
nit-pick: It's more that the Intel controller has a power optimization where the context is lost when stopping the clock, which requires a bus reset and full re-enumeration/initialization when the clock resumes.
Ok, it's true that clock stop doesn't _cause_ bus reset, bus reset is necessary when exiting clock stop. We can re-word if you want us to describe that accurately.
But from the codec driver's point of view, a clock stop causes a bus reset.
Quoted 8 lines
The rest of the patch is fine so
Reviewed-by Pierre-Louis Bossart <[email protected]>Quoted 4 lines
to wait for the debounce interval on resume, to ensure all the interrupt status registers are set correctly.
Signed-off-by Stefan Binding <[email protected]>
Mark Brown
maintainerQuoted 8 lines · Stefan Binding
The CS42L42 has a SoundWire interface for control and audio. This chain of patches adds support for this.
Patches #1 .. #5 split out various changes to the existing code that are needed for adding Soundwire. These are mostly around clocking and supporting the separate probe and enumeration stages in SoundWire.
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/8] soundwire: stream: Add specific prep/deprep commands to port_prep callback
commit: 43f1a7f905fcc796620c6488a7098068a05484ca
[2/8] ASoC: cs42l42: Add SOFT_RESET_REBOOT register
commit: b558c6fd08f59b78166828c342beb2a36258e9fe
[3/8] ASoC: cs42l42: Ensure MCLKint is a multiple of the sample rate
commit: 17cb563baef9c4f2d244035a95e361dd673941fa
[4/8] ASoC: cs42l42: Separate ASP config from PLL config
commit: 7209d5ebb34aff3fbdd504c7deeb9b74df632086
[5/8] ASoC: cs42l42: Export some functions for SoundWire
commit: 0998816ab2d85d67ebace9993b5a97e79a24d816
[6/8] ASoC: cs42l42: Add SoundWire support
commit: 98fda42a85b4324b6c404ec163940371c63625df
[7/8] ASoC: cs42l42: Don't set idle_bias_on
commit: e0bd53a4d1d5afa7d3a3bf46e2f0ec7940f94710
[8/8] ASoC: cs42l42: Wait for debounce interval after resume
commit: 16838bfbf6e70b7a3381ab302248bd18c085aba5All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Re: [PATCH v3 8/8] ASoC: cs42l42: Wait for debounce interval after resume
In reply to Richard FitzgeraldQuoted 11 lines · Richard Fitzgerald
Quoted 9 lines · Pierre-Louis Bossart
Quoted 1 line · Stefan Binding
Since clock stop causes bus reset on Intel controllers, we need
nit-pick: It's more that the Intel controller has a power optimization where the context is lost when stopping the clock, which requires a bus reset and full re-enumeration/initialization when the clock resumes.
Quoted 6 lines
Ok, it's true that clock stop doesn't _cause_ bus reset, bus reset is necessary when exiting clock stop. We can re-word if you want us to describe that accurately.
But from the codec driver's point of view, a clock stop causes a bus reset.
it's fine, we all agree here.
Quoted 8 lines
Quoted 8 lines
The rest of the patch is fine so
Reviewed-by Pierre-Louis Bossart <[email protected]>Quoted 4 lines
to wait for the debounce interval on resume, to ensure all the interrupt status registers are set correctly.
Signed-off-by Stefan Binding <[email protected]>