Skip to content

Commit 56235e4

Browse files
Srinivas-Kandagatlabroonie
Srinivas-Kandagatla
authored and
broonie
committed
ASoC: q6afe-dai: mark all widgets registers as SND_SOC_NOPM
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: 24c4cbc ("ASoC: qdsp6: q6afe: Add q6afe dai driver") Reported-by: John Stultz <[email protected]> Signed-off-by: Srinivas Kandagatla <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent efc913c commit 56235e4

File tree

1 file changed

+105
-105
lines changed

1 file changed

+105
-105
lines changed

‎sound/soc/qcom/qdsp6/q6afe-dai.c

Lines changed: 105 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,206 +1150,206 @@ static int q6afe_of_xlate_dai_name(struct snd_soc_component *component,
11501150
}
11511151

11521152
static const struct snd_soc_dapm_widget q6afe_dai_widgets[] = {
1153-
SND_SOC_DAPM_AIF_IN("HDMI_RX", NULL, 0, 0, 0, 0),
1154-
SND_SOC_DAPM_AIF_IN("SLIMBUS_0_RX", NULL, 0, 0, 0, 0),
1155-
SND_SOC_DAPM_AIF_IN("SLIMBUS_1_RX", NULL, 0, 0, 0, 0),
1156-
SND_SOC_DAPM_AIF_IN("SLIMBUS_2_RX", NULL, 0, 0, 0, 0),
1157-
SND_SOC_DAPM_AIF_IN("SLIMBUS_3_RX", NULL, 0, 0, 0, 0),
1158-
SND_SOC_DAPM_AIF_IN("SLIMBUS_4_RX", NULL, 0, 0, 0, 0),
1159-
SND_SOC_DAPM_AIF_IN("SLIMBUS_5_RX", NULL, 0, 0, 0, 0),
1160-
SND_SOC_DAPM_AIF_IN("SLIMBUS_6_RX", NULL, 0, 0, 0, 0),
1161-
SND_SOC_DAPM_AIF_OUT("SLIMBUS_0_TX", NULL, 0, 0, 0, 0),
1162-
SND_SOC_DAPM_AIF_OUT("SLIMBUS_1_TX", NULL, 0, 0, 0, 0),
1163-
SND_SOC_DAPM_AIF_OUT("SLIMBUS_2_TX", NULL, 0, 0, 0, 0),
1164-
SND_SOC_DAPM_AIF_OUT("SLIMBUS_3_TX", NULL, 0, 0, 0, 0),
1165-
SND_SOC_DAPM_AIF_OUT("SLIMBUS_4_TX", NULL, 0, 0, 0, 0),
1166-
SND_SOC_DAPM_AIF_OUT("SLIMBUS_5_TX", NULL, 0, 0, 0, 0),
1167-
SND_SOC_DAPM_AIF_OUT("SLIMBUS_6_TX", NULL, 0, 0, 0, 0),
1153+
SND_SOC_DAPM_AIF_IN("HDMI_RX", NULL, 0, SND_SOC_NOPM, 0, 0),
1154+
SND_SOC_DAPM_AIF_IN("SLIMBUS_0_RX", NULL, 0, SND_SOC_NOPM, 0, 0),
1155+
SND_SOC_DAPM_AIF_IN("SLIMBUS_1_RX", NULL, 0, SND_SOC_NOPM, 0, 0),
1156+
SND_SOC_DAPM_AIF_IN("SLIMBUS_2_RX", NULL, 0, SND_SOC_NOPM, 0, 0),
1157+
SND_SOC_DAPM_AIF_IN("SLIMBUS_3_RX", NULL, 0, SND_SOC_NOPM, 0, 0),
1158+
SND_SOC_DAPM_AIF_IN("SLIMBUS_4_RX", NULL, 0, SND_SOC_NOPM, 0, 0),
1159+
SND_SOC_DAPM_AIF_IN("SLIMBUS_5_RX", NULL, 0, SND_SOC_NOPM, 0, 0),
1160+
SND_SOC_DAPM_AIF_IN("SLIMBUS_6_RX", NULL, 0, SND_SOC_NOPM, 0, 0),
1161+
SND_SOC_DAPM_AIF_OUT("SLIMBUS_0_TX", NULL, 0, SND_SOC_NOPM, 0, 0),
1162+
SND_SOC_DAPM_AIF_OUT("SLIMBUS_1_TX", NULL, 0, SND_SOC_NOPM, 0, 0),
1163+
SND_SOC_DAPM_AIF_OUT("SLIMBUS_2_TX", NULL, 0, SND_SOC_NOPM, 0, 0),
1164+
SND_SOC_DAPM_AIF_OUT("SLIMBUS_3_TX", NULL, 0, SND_SOC_NOPM, 0, 0),
1165+
SND_SOC_DAPM_AIF_OUT("SLIMBUS_4_TX", NULL, 0, SND_SOC_NOPM, 0, 0),
1166+
SND_SOC_DAPM_AIF_OUT("SLIMBUS_5_TX", NULL, 0, SND_SOC_NOPM, 0, 0),
1167+
SND_SOC_DAPM_AIF_OUT("SLIMBUS_6_TX", NULL, 0, SND_SOC_NOPM, 0, 0),
11681168
SND_SOC_DAPM_AIF_IN("QUAT_MI2S_RX", NULL,
1169-
0, 0, 0, 0),
1169+
0, SND_SOC_NOPM, 0, 0),
11701170
SND_SOC_DAPM_AIF_OUT("QUAT_MI2S_TX", NULL,
1171-
0, 0, 0, 0),
1171+
0, SND_SOC_NOPM, 0, 0),
11721172
SND_SOC_DAPM_AIF_IN("TERT_MI2S_RX", NULL,
1173-
0, 0, 0, 0),
1173+
0, SND_SOC_NOPM, 0, 0),
11741174
SND_SOC_DAPM_AIF_OUT("TERT_MI2S_TX", NULL,
1175-
0, 0, 0, 0),
1175+
0, SND_SOC_NOPM, 0, 0),
11761176
SND_SOC_DAPM_AIF_IN("SEC_MI2S_RX", NULL,
1177-
0, 0, 0, 0),
1177+
0, SND_SOC_NOPM, 0, 0),
11781178
SND_SOC_DAPM_AIF_OUT("SEC_MI2S_TX", NULL,
1179-
0, 0, 0, 0),
1179+
0, SND_SOC_NOPM, 0, 0),
11801180
SND_SOC_DAPM_AIF_IN("SEC_MI2S_RX_SD1",
11811181
"Secondary MI2S Playback SD1",
1182-
0, 0, 0, 0),
1182+
0, SND_SOC_NOPM, 0, 0),
11831183
SND_SOC_DAPM_AIF_IN("PRI_MI2S_RX", NULL,
1184-
0, 0, 0, 0),
1184+
0, SND_SOC_NOPM, 0, 0),
11851185
SND_SOC_DAPM_AIF_OUT("PRI_MI2S_TX", NULL,
1186-
0, 0, 0, 0),
1186+
0, SND_SOC_NOPM, 0, 0),
11871187

11881188
SND_SOC_DAPM_AIF_IN("PRIMARY_TDM_RX_0", NULL,
1189-
0, 0, 0, 0),
1189+
0, SND_SOC_NOPM, 0, 0),
11901190
SND_SOC_DAPM_AIF_IN("PRIMARY_TDM_RX_1", NULL,
1191-
0, 0, 0, 0),
1191+
0, SND_SOC_NOPM, 0, 0),
11921192
SND_SOC_DAPM_AIF_IN("PRIMARY_TDM_RX_2", NULL,
1193-
0, 0, 0, 0),
1193+
0, SND_SOC_NOPM, 0, 0),
11941194
SND_SOC_DAPM_AIF_IN("PRIMARY_TDM_RX_3", NULL,
1195-
0, 0, 0, 0),
1195+
0, SND_SOC_NOPM, 0, 0),
11961196
SND_SOC_DAPM_AIF_IN("PRIMARY_TDM_RX_4", NULL,
1197-
0, 0, 0, 0),
1197+
0, SND_SOC_NOPM, 0, 0),
11981198
SND_SOC_DAPM_AIF_IN("PRIMARY_TDM_RX_5", NULL,
1199-
0, 0, 0, 0),
1199+
0, SND_SOC_NOPM, 0, 0),
12001200
SND_SOC_DAPM_AIF_IN("PRIMARY_TDM_RX_6", NULL,
1201-
0, 0, 0, 0),
1201+
0, SND_SOC_NOPM, 0, 0),
12021202
SND_SOC_DAPM_AIF_IN("PRIMARY_TDM_RX_7", NULL,
1203-
0, 0, 0, 0),
1203+
0, SND_SOC_NOPM, 0, 0),
12041204
SND_SOC_DAPM_AIF_OUT("PRIMARY_TDM_TX_0", NULL,
1205-
0, 0, 0, 0),
1205+
0, SND_SOC_NOPM, 0, 0),
12061206
SND_SOC_DAPM_AIF_OUT("PRIMARY_TDM_TX_1", NULL,
1207-
0, 0, 0, 0),
1207+
0, SND_SOC_NOPM, 0, 0),
12081208
SND_SOC_DAPM_AIF_OUT("PRIMARY_TDM_TX_2", NULL,
1209-
0, 0, 0, 0),
1209+
0, SND_SOC_NOPM, 0, 0),
12101210
SND_SOC_DAPM_AIF_OUT("PRIMARY_TDM_TX_3", NULL,
1211-
0, 0, 0, 0),
1211+
0, SND_SOC_NOPM, 0, 0),
12121212
SND_SOC_DAPM_AIF_OUT("PRIMARY_TDM_TX_4", NULL,
1213-
0, 0, 0, 0),
1213+
0, SND_SOC_NOPM, 0, 0),
12141214
SND_SOC_DAPM_AIF_OUT("PRIMARY_TDM_TX_5", NULL,
1215-
0, 0, 0, 0),
1215+
0, SND_SOC_NOPM, 0, 0),
12161216
SND_SOC_DAPM_AIF_OUT("PRIMARY_TDM_TX_6", NULL,
1217-
0, 0, 0, 0),
1217+
0, SND_SOC_NOPM, 0, 0),
12181218
SND_SOC_DAPM_AIF_OUT("PRIMARY_TDM_TX_7", NULL,
1219-
0, 0, 0, 0),
1219+
0, SND_SOC_NOPM, 0, 0),
12201220

12211221
SND_SOC_DAPM_AIF_IN("SEC_TDM_RX_0", NULL,
1222-
0, 0, 0, 0),
1222+
0, SND_SOC_NOPM, 0, 0),
12231223
SND_SOC_DAPM_AIF_IN("SEC_TDM_RX_1", NULL,
1224-
0, 0, 0, 0),
1224+
0, SND_SOC_NOPM, 0, 0),
12251225
SND_SOC_DAPM_AIF_IN("SEC_TDM_RX_2", NULL,
1226-
0, 0, 0, 0),
1226+
0, SND_SOC_NOPM, 0, 0),
12271227
SND_SOC_DAPM_AIF_IN("SEC_TDM_RX_3", NULL,
1228-
0, 0, 0, 0),
1228+
0, SND_SOC_NOPM, 0, 0),
12291229
SND_SOC_DAPM_AIF_IN("SEC_TDM_RX_4", NULL,
1230-
0, 0, 0, 0),
1230+
0, SND_SOC_NOPM, 0, 0),
12311231
SND_SOC_DAPM_AIF_IN("SEC_TDM_RX_5", NULL,
1232-
0, 0, 0, 0),
1232+
0, SND_SOC_NOPM, 0, 0),
12331233
SND_SOC_DAPM_AIF_IN("SEC_TDM_RX_6", NULL,
1234-
0, 0, 0, 0),
1234+
0, SND_SOC_NOPM, 0, 0),
12351235
SND_SOC_DAPM_AIF_IN("SEC_TDM_RX_7", NULL,
1236-
0, 0, 0, 0),
1236+
0, SND_SOC_NOPM, 0, 0),
12371237
SND_SOC_DAPM_AIF_OUT("SEC_TDM_TX_0", NULL,
1238-
0, 0, 0, 0),
1238+
0, SND_SOC_NOPM, 0, 0),
12391239
SND_SOC_DAPM_AIF_OUT("SEC_TDM_TX_1", NULL,
1240-
0, 0, 0, 0),
1240+
0, SND_SOC_NOPM, 0, 0),
12411241
SND_SOC_DAPM_AIF_OUT("SEC_TDM_TX_2", NULL,
1242-
0, 0, 0, 0),
1242+
0, SND_SOC_NOPM, 0, 0),
12431243
SND_SOC_DAPM_AIF_OUT("SEC_TDM_TX_3", NULL,
1244-
0, 0, 0, 0),
1244+
0, SND_SOC_NOPM, 0, 0),
12451245
SND_SOC_DAPM_AIF_OUT("SEC_TDM_TX_4", NULL,
1246-
0, 0, 0, 0),
1246+
0, SND_SOC_NOPM, 0, 0),
12471247
SND_SOC_DAPM_AIF_OUT("SEC_TDM_TX_5", NULL,
1248-
0, 0, 0, 0),
1248+
0, SND_SOC_NOPM, 0, 0),
12491249
SND_SOC_DAPM_AIF_OUT("SEC_TDM_TX_6", NULL,
1250-
0, 0, 0, 0),
1250+
0, SND_SOC_NOPM, 0, 0),
12511251
SND_SOC_DAPM_AIF_OUT("SEC_TDM_TX_7", NULL,
1252-
0, 0, 0, 0),
1252+
0, SND_SOC_NOPM, 0, 0),
12531253

12541254
SND_SOC_DAPM_AIF_IN("TERT_TDM_RX_0", NULL,
1255-
0, 0, 0, 0),
1255+
0, SND_SOC_NOPM, 0, 0),
12561256
SND_SOC_DAPM_AIF_IN("TERT_TDM_RX_1", NULL,
1257-
0, 0, 0, 0),
1257+
0, SND_SOC_NOPM, 0, 0),
12581258
SND_SOC_DAPM_AIF_IN("TERT_TDM_RX_2", NULL,
1259-
0, 0, 0, 0),
1259+
0, SND_SOC_NOPM, 0, 0),
12601260
SND_SOC_DAPM_AIF_IN("TERT_TDM_RX_3", NULL,
1261-
0, 0, 0, 0),
1261+
0, SND_SOC_NOPM, 0, 0),
12621262
SND_SOC_DAPM_AIF_IN("TERT_TDM_RX_4", NULL,
1263-
0, 0, 0, 0),
1263+
0, SND_SOC_NOPM, 0, 0),
12641264
SND_SOC_DAPM_AIF_IN("TERT_TDM_RX_5", NULL,
1265-
0, 0, 0, 0),
1265+
0, SND_SOC_NOPM, 0, 0),
12661266
SND_SOC_DAPM_AIF_IN("TERT_TDM_RX_6", NULL,
1267-
0, 0, 0, 0),
1267+
0, SND_SOC_NOPM, 0, 0),
12681268
SND_SOC_DAPM_AIF_IN("TERT_TDM_RX_7", NULL,
1269-
0, 0, 0, 0),
1269+
0, SND_SOC_NOPM, 0, 0),
12701270
SND_SOC_DAPM_AIF_OUT("TERT_TDM_TX_0", NULL,
1271-
0, 0, 0, 0),
1271+
0, SND_SOC_NOPM, 0, 0),
12721272
SND_SOC_DAPM_AIF_OUT("TERT_TDM_TX_1", NULL,
1273-
0, 0, 0, 0),
1273+
0, SND_SOC_NOPM, 0, 0),
12741274
SND_SOC_DAPM_AIF_OUT("TERT_TDM_TX_2", NULL,
1275-
0, 0, 0, 0),
1275+
0, SND_SOC_NOPM, 0, 0),
12761276
SND_SOC_DAPM_AIF_OUT("TERT_TDM_TX_3", NULL,
1277-
0, 0, 0, 0),
1277+
0, SND_SOC_NOPM, 0, 0),
12781278
SND_SOC_DAPM_AIF_OUT("TERT_TDM_TX_4", NULL,
1279-
0, 0, 0, 0),
1279+
0, SND_SOC_NOPM, 0, 0),
12801280
SND_SOC_DAPM_AIF_OUT("TERT_TDM_TX_5", NULL,
1281-
0, 0, 0, 0),
1281+
0, SND_SOC_NOPM, 0, 0),
12821282
SND_SOC_DAPM_AIF_OUT("TERT_TDM_TX_6", NULL,
1283-
0, 0, 0, 0),
1283+
0, SND_SOC_NOPM, 0, 0),
12841284
SND_SOC_DAPM_AIF_OUT("TERT_TDM_TX_7", NULL,
1285-
0, 0, 0, 0),
1285+
0, SND_SOC_NOPM, 0, 0),
12861286

12871287
SND_SOC_DAPM_AIF_IN("QUAT_TDM_RX_0", NULL,
1288-
0, 0, 0, 0),
1288+
0, SND_SOC_NOPM, 0, 0),
12891289
SND_SOC_DAPM_AIF_IN("QUAT_TDM_RX_1", NULL,
1290-
0, 0, 0, 0),
1290+
0, SND_SOC_NOPM, 0, 0),
12911291
SND_SOC_DAPM_AIF_IN("QUAT_TDM_RX_2", NULL,
1292-
0, 0, 0, 0),
1292+
0, SND_SOC_NOPM, 0, 0),
12931293
SND_SOC_DAPM_AIF_IN("QUAT_TDM_RX_3", NULL,
1294-
0, 0, 0, 0),
1294+
0, SND_SOC_NOPM, 0, 0),
12951295
SND_SOC_DAPM_AIF_IN("QUAT_TDM_RX_4", NULL,
1296-
0, 0, 0, 0),
1296+
0, SND_SOC_NOPM, 0, 0),
12971297
SND_SOC_DAPM_AIF_IN("QUAT_TDM_RX_5", NULL,
1298-
0, 0, 0, 0),
1298+
0, SND_SOC_NOPM, 0, 0),
12991299
SND_SOC_DAPM_AIF_IN("QUAT_TDM_RX_6", NULL,
1300-
0, 0, 0, 0),
1300+
0, SND_SOC_NOPM, 0, 0),
13011301
SND_SOC_DAPM_AIF_IN("QUAT_TDM_RX_7", NULL,
1302-
0, 0, 0, 0),
1302+
0, SND_SOC_NOPM, 0, 0),
13031303
SND_SOC_DAPM_AIF_OUT("QUAT_TDM_TX_0", NULL,
1304-
0, 0, 0, 0),
1304+
0, SND_SOC_NOPM, 0, 0),
13051305
SND_SOC_DAPM_AIF_OUT("QUAT_TDM_TX_1", NULL,
1306-
0, 0, 0, 0),
1306+
0, SND_SOC_NOPM, 0, 0),
13071307
SND_SOC_DAPM_AIF_OUT("QUAT_TDM_TX_2", NULL,
1308-
0, 0, 0, 0),
1308+
0, SND_SOC_NOPM, 0, 0),
13091309
SND_SOC_DAPM_AIF_OUT("QUAT_TDM_TX_3", NULL,
1310-
0, 0, 0, 0),
1310+
0, SND_SOC_NOPM, 0, 0),
13111311
SND_SOC_DAPM_AIF_OUT("QUAT_TDM_TX_4", NULL,
1312-
0, 0, 0, 0),
1312+
0, SND_SOC_NOPM, 0, 0),
13131313
SND_SOC_DAPM_AIF_OUT("QUAT_TDM_TX_5", NULL,
1314-
0, 0, 0, 0),
1314+
0, SND_SOC_NOPM, 0, 0),
13151315
SND_SOC_DAPM_AIF_OUT("QUAT_TDM_TX_6", NULL,
1316-
0, 0, 0, 0),
1316+
0, SND_SOC_NOPM, 0, 0),
13171317
SND_SOC_DAPM_AIF_OUT("QUAT_TDM_TX_7", NULL,
1318-
0, 0, 0, 0),
1318+
0, SND_SOC_NOPM, 0, 0),
13191319

13201320
SND_SOC_DAPM_AIF_IN("QUIN_TDM_RX_0", NULL,
1321-
0, 0, 0, 0),
1321+
0, SND_SOC_NOPM, 0, 0),
13221322
SND_SOC_DAPM_AIF_IN("QUIN_TDM_RX_1", NULL,
1323-
0, 0, 0, 0),
1323+
0, SND_SOC_NOPM, 0, 0),
13241324
SND_SOC_DAPM_AIF_IN("QUIN_TDM_RX_2", NULL,
1325-
0, 0, 0, 0),
1325+
0, SND_SOC_NOPM, 0, 0),
13261326
SND_SOC_DAPM_AIF_IN("QUIN_TDM_RX_3", NULL,
1327-
0, 0, 0, 0),
1327+
0, SND_SOC_NOPM, 0, 0),
13281328
SND_SOC_DAPM_AIF_IN("QUIN_TDM_RX_4", NULL,
1329-
0, 0, 0, 0),
1329+
0, SND_SOC_NOPM, 0, 0),
13301330
SND_SOC_DAPM_AIF_IN("QUIN_TDM_RX_5", NULL,
1331-
0, 0, 0, 0),
1331+
0, SND_SOC_NOPM, 0, 0),
13321332
SND_SOC_DAPM_AIF_IN("QUIN_TDM_RX_6", NULL,
1333-
0, 0, 0, 0),
1333+
0, SND_SOC_NOPM, 0, 0),
13341334
SND_SOC_DAPM_AIF_IN("QUIN_TDM_RX_7", NULL,
1335-
0, 0, 0, 0),
1335+
0, SND_SOC_NOPM, 0, 0),
13361336
SND_SOC_DAPM_AIF_OUT("QUIN_TDM_TX_0", NULL,
1337-
0, 0, 0, 0),
1337+
0, SND_SOC_NOPM, 0, 0),
13381338
SND_SOC_DAPM_AIF_OUT("QUIN_TDM_TX_1", NULL,
1339-
0, 0, 0, 0),
1339+
0, SND_SOC_NOPM, 0, 0),
13401340
SND_SOC_DAPM_AIF_OUT("QUIN_TDM_TX_2", NULL,
1341-
0, 0, 0, 0),
1341+
0, SND_SOC_NOPM, 0, 0),
13421342
SND_SOC_DAPM_AIF_OUT("QUIN_TDM_TX_3", NULL,
1343-
0, 0, 0, 0),
1343+
0, SND_SOC_NOPM, 0, 0),
13441344
SND_SOC_DAPM_AIF_OUT("QUIN_TDM_TX_4", NULL,
1345-
0, 0, 0, 0),
1345+
0, SND_SOC_NOPM, 0, 0),
13461346
SND_SOC_DAPM_AIF_OUT("QUIN_TDM_TX_5", NULL,
1347-
0, 0, 0, 0),
1347+
0, SND_SOC_NOPM, 0, 0),
13481348
SND_SOC_DAPM_AIF_OUT("QUIN_TDM_TX_6", NULL,
1349-
0, 0, 0, 0),
1349+
0, SND_SOC_NOPM, 0, 0),
13501350
SND_SOC_DAPM_AIF_OUT("QUIN_TDM_TX_7", NULL,
1351-
0, 0, 0, 0),
1352-
SND_SOC_DAPM_AIF_OUT("DISPLAY_PORT_RX", "NULL", 0, 0, 0, 0),
1351+
0, SND_SOC_NOPM, 0, 0),
1352+
SND_SOC_DAPM_AIF_OUT("DISPLAY_PORT_RX", "NULL", 0, SND_SOC_NOPM, 0, 0),
13531353
};
13541354

13551355
static const struct snd_soc_component_driver q6afe_dai_component = {

0 commit comments

Comments
 (0)