| Message ID | 20200217064250.15516-9-samuel@sholland.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | sun8i-codec fixes and new features | expand |
On Mon, Feb 17, 2020 at 2:43 PM Samuel Holland <samuel@sholland.org> wrote: > > The naming convention for AIFs in this codec is to call the "DAC" the > path from the AIF into the codec, and the ADC the path from the codec > back to the AIF, regardless of if there is any analog path involved. > > The output from AIF 1 used for capture should be declared as such. > > Cc: stable@kernel.org > Fixes: eda85d1fee05 ("ASoC: sun8i-codec: Add ADC support for a33") > Signed-off-by: Samuel Holland <samuel@sholland.org> Acked-by: Chen-Yu Tsai <wens@csie.org>
On Mon, Feb 17, 2020 at 12:42:24AM -0600, Samuel Holland wrote: > The naming convention for AIFs in this codec is to call the "DAC" the > path from the AIF into the codec, and the ADC the path from the codec > back to the AIF, regardless of if there is any analog path involved. This renames widgets but does not update any DAPM routes from those widgets which will break things if this patch is applied. > Cc: stable@kernel.org Why is this suitable for stable? It's a random textual cleanup.
On 2/17/20 9:09 AM, Mark Brown wrote: > On Mon, Feb 17, 2020 at 12:42:24AM -0600, Samuel Holland wrote: >> The naming convention for AIFs in this codec is to call the "DAC" the >> path from the AIF into the codec, and the ADC the path from the codec >> back to the AIF, regardless of if there is any analog path involved. > > This renames widgets but does not update any DAPM routes from those > widgets which will break things if this patch is applied. This commit doesn't change the widget name, only the widget type. My commit message did not make that clear. >> Cc: stable@kernel.org > > Why is this suitable for stable? It's a random textual cleanup. This was one of the first patches I wrote. Now that I understand DAPM better, I realize that it has no functional impact, and this shouldn't go to stable. (snd_soc_dapm_aif_in and snd_soc_dapm_aif_out are handled exactly the same, so fixing the widget type is, as you say, just a textual cleanup.)
diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c index 0eca75d22f13..83c812742cc1 100644 --- a/sound/soc/sunxi/sun8i-codec.c +++ b/sound/soc/sunxi/sun8i-codec.c @@ -399,12 +399,12 @@ static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = { SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0), /* Analog ADC AIF */ - SND_SOC_DAPM_AIF_IN("AIF1 Slot 0 Left ADC", "Capture", 0, - SUN8I_AIF1_ADCDAT_CTRL, - SUN8I_AIF1_ADCDAT_CTRL_AIF1_DA0L_ENA, 0), - SND_SOC_DAPM_AIF_IN("AIF1 Slot 0 Right ADC", "Capture", 0, - SUN8I_AIF1_ADCDAT_CTRL, - SUN8I_AIF1_ADCDAT_CTRL_AIF1_DA0R_ENA, 0), + SND_SOC_DAPM_AIF_OUT("AIF1 Slot 0 Left ADC", "Capture", 0, + SUN8I_AIF1_ADCDAT_CTRL, + SUN8I_AIF1_ADCDAT_CTRL_AIF1_DA0L_ENA, 0), + SND_SOC_DAPM_AIF_OUT("AIF1 Slot 0 Right ADC", "Capture", 0, + SUN8I_AIF1_ADCDAT_CTRL, + SUN8I_AIF1_ADCDAT_CTRL_AIF1_DA0R_ENA, 0), /* DAC and ADC Mixers */ SOC_MIXER_ARRAY("Left Digital DAC Mixer", SND_SOC_NOPM, 0, 0,
The naming convention for AIFs in this codec is to call the "DAC" the path from the AIF into the codec, and the ADC the path from the codec back to the AIF, regardless of if there is any analog path involved. The output from AIF 1 used for capture should be declared as such. Cc: stable@kernel.org Fixes: eda85d1fee05 ("ASoC: sun8i-codec: Add ADC support for a33") Signed-off-by: Samuel Holland <samuel@sholland.org> --- sound/soc/sunxi/sun8i-codec.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)