lkml.org 
[lkml]   [2020]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 065/124] ASoC: q6afe-dai: mark all widgets registers as SND_SOC_NOPM
    Date
    From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

    [ Upstream commit 56235e4bc5ae58cb8fcd9314dba4e9ab077ddda8 ]

    Looks like the q6afe-dai dapm widget registers are set as "0",
    which is a not correct.

    As this registers will be read by ASoC core during startup
    which will throw up errors, Fix this by making the registers
    as SND_SOC_NOPM as these should be never used.

    With recent changes to ASoC core, every register read/write
    failures are reported very verbosely. Prior to this fails to reads
    are totally ignored, so we never saw any error messages.

    Fixes: 24c4cbcfac09 ("ASoC: qdsp6: q6afe: Add q6afe dai driver")
    Reported-by: John Stultz <john.stultz@linaro.org>
    Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
    Link: https://lore.kernel.org/r/20200811120205.21805-1-srinivas.kandagatla@linaro.org
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/qcom/qdsp6/q6afe-dai.c | 210 +++++++++++++++----------------
    1 file changed, 105 insertions(+), 105 deletions(-)

    diff --git a/sound/soc/qcom/qdsp6/q6afe-dai.c b/sound/soc/qcom/qdsp6/q6afe-dai.c
    index 2a5302f1db98a..0168af8492727 100644
    --- a/sound/soc/qcom/qdsp6/q6afe-dai.c
    +++ b/sound/soc/qcom/qdsp6/q6afe-dai.c
    @@ -1150,206 +1150,206 @@ static int q6afe_of_xlate_dai_name(struct snd_soc_component *component,
    }

    static const struct snd_soc_dapm_widget q6afe_dai_widgets[] = {
    - SND_SOC_DAPM_AIF_IN("HDMI_RX", NULL, 0, 0, 0, 0),
    - SND_SOC_DAPM_AIF_IN("SLIMBUS_0_RX", NULL, 0, 0, 0, 0),
    - SND_SOC_DAPM_AIF_IN("SLIMBUS_1_RX", NULL, 0, 0, 0, 0),
    - SND_SOC_DAPM_AIF_IN("SLIMBUS_2_RX", NULL, 0, 0, 0, 0),
    - SND_SOC_DAPM_AIF_IN("SLIMBUS_3_RX", NULL, 0, 0, 0, 0),
    - SND_SOC_DAPM_AIF_IN("SLIMBUS_4_RX", NULL, 0, 0, 0, 0),
    - SND_SOC_DAPM_AIF_IN("SLIMBUS_5_RX", NULL, 0, 0, 0, 0),
    - SND_SOC_DAPM_AIF_IN("SLIMBUS_6_RX", NULL, 0, 0, 0, 0),
    - SND_SOC_DAPM_AIF_OUT("SLIMBUS_0_TX", NULL, 0, 0, 0, 0),
    - SND_SOC_DAPM_AIF_OUT("SLIMBUS_1_TX", NULL, 0, 0, 0, 0),
    - SND_SOC_DAPM_AIF_OUT("SLIMBUS_2_TX", NULL, 0, 0, 0, 0),
    - SND_SOC_DAPM_AIF_OUT("SLIMBUS_3_TX", NULL, 0, 0, 0, 0),
    - SND_SOC_DAPM_AIF_OUT("SLIMBUS_4_TX", NULL, 0, 0, 0, 0),
    - SND_SOC_DAPM_AIF_OUT("SLIMBUS_5_TX", NULL, 0, 0, 0, 0),
    - SND_SOC_DAPM_AIF_OUT("SLIMBUS_6_TX", NULL, 0, 0, 0, 0),
    + SND_SOC_DAPM_AIF_IN("HDMI_RX", NULL, 0, SND_SOC_NOPM, 0, 0),
    + SND_SOC_DAPM_AIF_IN("SLIMBUS_0_RX", NULL, 0, SND_SOC_NOPM, 0, 0),
    + SND_SOC_DAPM_AIF_IN("SLIMBUS_1_RX", NULL, 0, SND_SOC_NOPM, 0, 0),
    + SND_SOC_DAPM_AIF_IN("SLIMBUS_2_RX", NULL, 0, SND_SOC_NOPM, 0, 0),
    + SND_SOC_DAPM_AIF_IN("SLIMBUS_3_RX", NULL, 0, SND_SOC_NOPM, 0, 0),
    + SND_SOC_DAPM_AIF_IN("SLIMBUS_4_RX", NULL, 0, SND_SOC_NOPM, 0, 0),
    + SND_SOC_DAPM_AIF_IN("SLIMBUS_5_RX", NULL, 0, SND_SOC_NOPM, 0, 0),
    + SND_SOC_DAPM_AIF_IN("SLIMBUS_6_RX", NULL, 0, SND_SOC_NOPM, 0, 0),
    + SND_SOC_DAPM_AIF_OUT("SLIMBUS_0_TX", NULL, 0, SND_SOC_NOPM, 0, 0),
    + SND_SOC_DAPM_AIF_OUT("SLIMBUS_1_TX", NULL, 0, SND_SOC_NOPM, 0, 0),
    + SND_SOC_DAPM_AIF_OUT("SLIMBUS_2_TX", NULL, 0, SND_SOC_NOPM, 0, 0),
    + SND_SOC_DAPM_AIF_OUT("SLIMBUS_3_TX", NULL, 0, SND_SOC_NOPM, 0, 0),
    + SND_SOC_DAPM_AIF_OUT("SLIMBUS_4_TX", NULL, 0, SND_SOC_NOPM, 0, 0),
    + SND_SOC_DAPM_AIF_OUT("SLIMBUS_5_TX", NULL, 0, SND_SOC_NOPM, 0, 0),
    + SND_SOC_DAPM_AIF_OUT("SLIMBUS_6_TX", NULL, 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("QUAT_MI2S_RX", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("QUAT_MI2S_TX", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("TERT_MI2S_RX", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("TERT_MI2S_TX", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("SEC_MI2S_RX", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("SEC_MI2S_TX", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("SEC_MI2S_RX_SD1",
    "Secondary MI2S Playback SD1",
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("PRI_MI2S_RX", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("PRI_MI2S_TX", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),

    SND_SOC_DAPM_AIF_IN("PRIMARY_TDM_RX_0", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("PRIMARY_TDM_RX_1", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("PRIMARY_TDM_RX_2", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("PRIMARY_TDM_RX_3", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("PRIMARY_TDM_RX_4", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("PRIMARY_TDM_RX_5", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("PRIMARY_TDM_RX_6", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("PRIMARY_TDM_RX_7", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("PRIMARY_TDM_TX_0", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("PRIMARY_TDM_TX_1", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("PRIMARY_TDM_TX_2", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("PRIMARY_TDM_TX_3", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("PRIMARY_TDM_TX_4", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("PRIMARY_TDM_TX_5", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("PRIMARY_TDM_TX_6", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("PRIMARY_TDM_TX_7", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),

    SND_SOC_DAPM_AIF_IN("SEC_TDM_RX_0", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("SEC_TDM_RX_1", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("SEC_TDM_RX_2", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("SEC_TDM_RX_3", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("SEC_TDM_RX_4", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("SEC_TDM_RX_5", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("SEC_TDM_RX_6", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("SEC_TDM_RX_7", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("SEC_TDM_TX_0", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("SEC_TDM_TX_1", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("SEC_TDM_TX_2", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("SEC_TDM_TX_3", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("SEC_TDM_TX_4", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("SEC_TDM_TX_5", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("SEC_TDM_TX_6", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("SEC_TDM_TX_7", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),

    SND_SOC_DAPM_AIF_IN("TERT_TDM_RX_0", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("TERT_TDM_RX_1", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("TERT_TDM_RX_2", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("TERT_TDM_RX_3", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("TERT_TDM_RX_4", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("TERT_TDM_RX_5", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("TERT_TDM_RX_6", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("TERT_TDM_RX_7", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("TERT_TDM_TX_0", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("TERT_TDM_TX_1", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("TERT_TDM_TX_2", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("TERT_TDM_TX_3", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("TERT_TDM_TX_4", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("TERT_TDM_TX_5", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("TERT_TDM_TX_6", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("TERT_TDM_TX_7", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),

    SND_SOC_DAPM_AIF_IN("QUAT_TDM_RX_0", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("QUAT_TDM_RX_1", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("QUAT_TDM_RX_2", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("QUAT_TDM_RX_3", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("QUAT_TDM_RX_4", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("QUAT_TDM_RX_5", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("QUAT_TDM_RX_6", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("QUAT_TDM_RX_7", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("QUAT_TDM_TX_0", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("QUAT_TDM_TX_1", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("QUAT_TDM_TX_2", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("QUAT_TDM_TX_3", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("QUAT_TDM_TX_4", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("QUAT_TDM_TX_5", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("QUAT_TDM_TX_6", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("QUAT_TDM_TX_7", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),

    SND_SOC_DAPM_AIF_IN("QUIN_TDM_RX_0", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("QUIN_TDM_RX_1", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("QUIN_TDM_RX_2", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("QUIN_TDM_RX_3", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("QUIN_TDM_RX_4", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("QUIN_TDM_RX_5", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("QUIN_TDM_RX_6", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("QUIN_TDM_RX_7", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("QUIN_TDM_TX_0", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("QUIN_TDM_TX_1", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("QUIN_TDM_TX_2", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("QUIN_TDM_TX_3", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("QUIN_TDM_TX_4", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("QUIN_TDM_TX_5", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("QUIN_TDM_TX_6", NULL,
    - 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("QUIN_TDM_TX_7", NULL,
    - 0, 0, 0, 0),
    - SND_SOC_DAPM_AIF_OUT("DISPLAY_PORT_RX", "NULL", 0, 0, 0, 0),
    + 0, SND_SOC_NOPM, 0, 0),
    + SND_SOC_DAPM_AIF_OUT("DISPLAY_PORT_RX", "NULL", 0, SND_SOC_NOPM, 0, 0),
    };

    static const struct snd_soc_component_driver q6afe_dai_component = {
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-08-24 10:43    [W:5.635 / U:0.604 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site