Skip to content

Commit c609469

Browse files
brooniebroonie
committed
Merge remote-tracking branch 'asoc/for-6.19' into asoc-next
2 parents d5cda96 + 79c36ec commit c609469

30 files changed

Lines changed: 367 additions & 75 deletions

‎Documentation/devicetree/bindings/sound/nvidia,tegra210-admaif.yaml‎

Lines changed: 66 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -67,46 +67,72 @@ properties:
6767
$ref: audio-graph-port.yaml#
6868
unevaluatedProperties: false
6969

70-
if:
71-
properties:
72-
compatible:
73-
contains:
74-
const: nvidia,tegra210-admaif
75-
76-
then:
77-
properties:
78-
dmas:
79-
description:
80-
DMA channel specifiers, equally divided for Tx and Rx.
81-
minItems: 1
82-
maxItems: 20
83-
dma-names:
84-
items:
85-
pattern: "^[rt]x(10|[1-9])$"
86-
description:
87-
Should be "rx1", "rx2" ... "rx10" for DMA Rx channel
88-
Should be "tx1", "tx2" ... "tx10" for DMA Tx channel
89-
minItems: 1
90-
maxItems: 20
91-
interconnects: false
92-
interconnect-names: false
93-
iommus: false
94-
95-
else:
96-
properties:
97-
dmas:
98-
description:
99-
DMA channel specifiers, equally divided for Tx and Rx.
100-
minItems: 1
101-
maxItems: 40
102-
dma-names:
103-
items:
104-
pattern: "^[rt]x(1[0-9]|[1-9]|20)$"
105-
description:
106-
Should be "rx1", "rx2" ... "rx20" for DMA Rx channel
107-
Should be "tx1", "tx2" ... "tx20" for DMA Tx channel
108-
minItems: 1
109-
maxItems: 40
70+
allOf:
71+
- if:
72+
properties:
73+
compatible:
74+
contains:
75+
const: nvidia,tegra210-admaif
76+
then:
77+
properties:
78+
dmas:
79+
description:
80+
DMA channel specifiers, equally divided for Tx and Rx.
81+
minItems: 1
82+
maxItems: 20
83+
dma-names:
84+
items:
85+
pattern: "^[rt]x(10|[1-9])$"
86+
description:
87+
Should be "rx1", "rx2" ... "rx10" for DMA Rx channel
88+
Should be "tx1", "tx2" ... "tx10" for DMA Tx channel
89+
minItems: 1
90+
maxItems: 20
91+
interconnects: false
92+
interconnect-names: false
93+
iommus: false
94+
95+
- if:
96+
properties:
97+
compatible:
98+
contains:
99+
const: nvidia,tegra186-admaif
100+
then:
101+
properties:
102+
dmas:
103+
description:
104+
DMA channel specifiers, equally divided for Tx and Rx.
105+
minItems: 1
106+
maxItems: 40
107+
dma-names:
108+
items:
109+
pattern: "^[rt]x(1[0-9]|[1-9]|20)$"
110+
description:
111+
Should be "rx1", "rx2" ... "rx20" for DMA Rx channel
112+
Should be "tx1", "tx2" ... "tx20" for DMA Tx channel
113+
minItems: 1
114+
maxItems: 40
115+
116+
- if:
117+
properties:
118+
compatible:
119+
contains:
120+
const: nvidia,tegra264-admaif
121+
then:
122+
properties:
123+
dmas:
124+
description:
125+
DMA channel specifiers, equally divided for Tx and Rx.
126+
minItems: 1
127+
maxItems: 64
128+
dma-names:
129+
items:
130+
pattern: "^[rt]x(3[0-2]|[1-2][0-9]|[1-9])$"
131+
description:
132+
Should be "rx1", "rx2" ... "rx32" for DMA Rx channel
133+
Should be "tx1", "tx2" ... "tx32" for DMA Tx channel
134+
minItems: 1
135+
maxItems: 64
110136

111137
required:
112138
- compatible

‎include/sound/soc-acpi.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ struct snd_soc_acpi_endpoint {
114114
* @name_prefix: string used for codec controls
115115
*/
116116
struct snd_soc_acpi_adr_device {
117-
const u64 adr;
118-
const u8 num_endpoints;
117+
u64 adr;
118+
u8 num_endpoints;
119119
const struct snd_soc_acpi_endpoint *endpoints;
120120
const char *name_prefix;
121121
};
@@ -131,8 +131,8 @@ struct snd_soc_acpi_adr_device {
131131
*/
132132

133133
struct snd_soc_acpi_link_adr {
134-
const u32 mask;
135-
const u32 num_adr;
134+
u32 mask;
135+
u32 num_adr;
136136
const struct snd_soc_acpi_adr_device *adr_d;
137137
};
138138

‎include/sound/soc_sdw_utils.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ struct asoc_sdw_codec_info {
6868
const int part_id;
6969
const int version_id;
7070
const char *codec_name;
71+
const char *name_prefix;
7172
int amp_num;
7273
const u8 acpi_id[ACPI_ID_LEN];
7374
const bool ignore_internal_dmic;
@@ -168,6 +169,7 @@ int asoc_sdw_count_sdw_endpoints(struct snd_soc_card *card, int *num_devs, int *
168169

169170
struct asoc_sdw_dailink *asoc_sdw_find_dailink(struct asoc_sdw_dailink *dailinks,
170171
const struct snd_soc_acpi_endpoint *new);
172+
int asoc_sdw_get_dai_type(u32 type);
171173

172174
int asoc_sdw_parse_sdw_endpoints(struct snd_soc_card *card,
173175
struct asoc_sdw_dailink *soc_dais,

‎sound/soc/codecs/aw88081.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,7 @@ static void aw88081_start(struct aw88081 *aw88081, bool sync_start)
779779
if (sync_start == AW88081_SYNC_START)
780780
aw88081_start_pa(aw88081);
781781
else
782-
queue_delayed_work(system_wq,
782+
queue_delayed_work(system_dfl_wq,
783783
&aw88081->start_work,
784784
AW88081_START_WORK_DELAY_MS);
785785
}

‎sound/soc/codecs/aw88166.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1310,7 +1310,7 @@ static void aw88166_start(struct aw88166 *aw88166, bool sync_start)
13101310
if (sync_start == AW88166_SYNC_START)
13111311
aw88166_start_pa(aw88166);
13121312
else
1313-
queue_delayed_work(system_wq,
1313+
queue_delayed_work(system_dfl_wq,
13141314
&aw88166->start_work,
13151315
AW88166_START_WORK_DELAY_MS);
13161316
}

‎sound/soc/codecs/aw88261.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ static void aw88261_start(struct aw88261 *aw88261, bool sync_start)
705705
if (sync_start == AW88261_SYNC_START)
706706
aw88261_start_pa(aw88261);
707707
else
708-
queue_delayed_work(system_wq,
708+
queue_delayed_work(system_dfl_wq,
709709
&aw88261->start_work,
710710
AW88261_START_WORK_DELAY_MS);
711711
}

‎sound/soc/codecs/aw88395/aw88395.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ static void aw88395_start(struct aw88395 *aw88395, bool sync_start)
7575
if (sync_start == AW88395_SYNC_START)
7676
aw88395_start_pa(aw88395);
7777
else
78-
queue_delayed_work(system_wq,
78+
queue_delayed_work(system_dfl_wq,
7979
&aw88395->start_work,
8080
AW88395_START_WORK_DELAY_MS);
8181
}

‎sound/soc/codecs/aw88399.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1340,7 +1340,7 @@ static void aw88399_start(struct aw88399 *aw88399, bool sync_start)
13401340
if (sync_start == AW88399_SYNC_START)
13411341
aw88399_start_pa(aw88399);
13421342
else
1343-
queue_delayed_work(system_wq,
1343+
queue_delayed_work(system_dfl_wq,
13441344
&aw88399->start_work,
13451345
AW88399_START_WORK_DELAY_MS);
13461346
}

‎sound/soc/codecs/cs42l43-jack.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ irqreturn_t cs42l43_bias_detect_clamp(int irq, void *data)
300300
{
301301
struct cs42l43_codec *priv = data;
302302

303-
queue_delayed_work(system_wq, &priv->bias_sense_timeout,
303+
queue_delayed_work(system_dfl_wq, &priv->bias_sense_timeout,
304304
msecs_to_jiffies(1000));
305305

306306
return IRQ_HANDLED;

‎sound/soc/codecs/cs42l43.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ static void cs42l43_hp_ilimit_clear_work(struct work_struct *work)
161161
priv->hp_ilimit_count--;
162162

163163
if (priv->hp_ilimit_count)
164-
queue_delayed_work(system_wq, &priv->hp_ilimit_clear_work,
164+
queue_delayed_work(system_dfl_wq, &priv->hp_ilimit_clear_work,
165165
msecs_to_jiffies(CS42L43_HP_ILIMIT_DECAY_MS));
166166

167167
snd_soc_dapm_mutex_unlock(dapm);
@@ -179,7 +179,7 @@ static irqreturn_t cs42l43_hp_ilimit(int irq, void *data)
179179

180180
if (priv->hp_ilimit_count < CS42L43_HP_ILIMIT_MAX_COUNT) {
181181
if (!priv->hp_ilimit_count)
182-
queue_delayed_work(system_wq, &priv->hp_ilimit_clear_work,
182+
queue_delayed_work(system_dfl_wq, &priv->hp_ilimit_clear_work,
183183
msecs_to_jiffies(CS42L43_HP_ILIMIT_DECAY_MS));
184184

185185
priv->hp_ilimit_count++;

0 commit comments

Comments
 (0)