Skip to content

Commit 1c15ca4

Browse files
committed
Merge tag 'sound-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound updates from Takashi Iwai: "At this time, it's an interesting mixture of changes for both old and new stuff. Majority of changes are about ASoC (lots of systematic changes for converting remove callbacks to void, and cleanups), while we got the fixes and the enhancements of very old PCI cards, too. Here are some highlights: ALSA/ASoC Core: - Continued effort of more ASoC core cleanups - Minor improvements for XRUN handling in indirect PCM helpers - Code refactoring of PCM core code ASoC: - Continued feature and simplification work on SOF, including addition of a no-DSP mode for bringup, HDA MLink and extensions to the IPC4 protocol - Hibernation support for CS35L45 - More DT binding conversions - Support for Cirrus Logic CS35L56, Freescale QMC, Maxim MAX98363, nVidia systems with MAX9809x and RT5631, Realtek RT712, Renesas R-Car Gen4, Rockchip RK3588 and TI TAS5733 ALSA: - Lots of works for legacy emu10k1 and ymfpci PCI drivers - PCM kselftest fixes and enhancements" * tag 'sound-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (586 commits) ALSA: emu10k1: use high-level I/O in set_filterQ() ALSA: emu10k1: use high-level I/O functions also during init ALSA: emu10k1: fix error handling in snd_audigy_i2c_volume_put() ALSA: emu10k1: don't stop DSP in _snd_emu10k1_{,audigy_}init_efx() ALSA: emu10k1: fix SNDRV_EMU10K1_IOCTL_SINGLE_STEP ALSA: emu10k1: skip Sound Blaster-specific hacks for E-MU cards ALSA: emu10k1: fixup DSP defines ALSA: emu10k1: pull in some register definitions from kX-project ALSA: emu10k1: remove some bogus defines ALSA: emu10k1: eliminate some unused defines ALSA: emu10k1: fix lineup of EMU_HANA_* defines ALSA: emu10k1: comment updates ALSA: emu10k1: fix snd_emu1010_fpga_read() input masking for rev2 cards ALSA: emu10k1: remove unused emu->pcm_playback_efx_substream field ALSA: emu10k1: remove unused `resume` parameter from snd_emu10k1_init() ALSA: emu10k1: minor optimizations ALSA: emu10k1: remove remaining cruft from snd_emu10k1_emu1010_init() ALSA: emu10k1: remove apparently pointless EMU_HANA_OPTION_CARDS reads ALSA: emu10k1: remove apparently pointless FPGA reads ALSA: emu10k1: stop doing weird things with HCFG in snd_emu10k1_emu1010_init() ...
2 parents 34b62f1 + baa6584 commit 1c15ca4

File tree

520 files changed

+19877
-6275
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

520 files changed

+19877
-6275
lines changed
Lines changed: 162 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,162 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/soc/fsl/cpm_qe/fsl,cpm1-scc-qmc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: PowerQUICC CPM QUICC Multichannel Controller (QMC)
8+
9+
maintainers:
10+
- Herve Codina <[email protected]>
11+
12+
description:
13+
The QMC (QUICC Multichannel Controller) emulates up to 64 channels within one
14+
serial controller using the same TDM physical interface routed from TSA.
15+
16+
properties:
17+
compatible:
18+
items:
19+
- enum:
20+
- fsl,mpc885-scc-qmc
21+
- fsl,mpc866-scc-qmc
22+
- const: fsl,cpm1-scc-qmc
23+
24+
reg:
25+
items:
26+
- description: SCC (Serial communication controller) register base
27+
- description: SCC parameter ram base
28+
- description: Dual port ram base
29+
30+
reg-names:
31+
items:
32+
- const: scc_regs
33+
- const: scc_pram
34+
- const: dpram
35+
36+
interrupts:
37+
maxItems: 1
38+
description: SCC interrupt line in the CPM interrupt controller
39+
40+
fsl,tsa-serial:
41+
$ref: /schemas/types.yaml#/definitions/phandle-array
42+
items:
43+
- items:
44+
- description: phandle to TSA node
45+
- enum: [1, 2, 3]
46+
description: |
47+
TSA serial interface (dt-bindings/soc/cpm1-fsl,tsa.h defines these
48+
values)
49+
- 1: SCC2
50+
- 2: SCC3
51+
- 3: SCC4
52+
description:
53+
Should be a phandle/number pair. The phandle to TSA node and the TSA
54+
serial interface to use.
55+
56+
'#address-cells':
57+
const: 1
58+
59+
'#size-cells':
60+
const: 0
61+
62+
patternProperties:
63+
'^channel@([0-9]|[1-5][0-9]|6[0-3])$':
64+
description:
65+
A channel managed by this controller
66+
type: object
67+
68+
properties:
69+
reg:
70+
minimum: 0
71+
maximum: 63
72+
description:
73+
The channel number
74+
75+
fsl,operational-mode:
76+
$ref: /schemas/types.yaml#/definitions/string
77+
enum: [transparent, hdlc]
78+
default: transparent
79+
description: |
80+
The channel operational mode
81+
- hdlc: The channel handles HDLC frames
82+
- transparent: The channel handles raw data without any processing
83+
84+
fsl,reverse-data:
85+
$ref: /schemas/types.yaml#/definitions/flag
86+
description:
87+
The bit order as seen on the channels is reversed,
88+
transmitting/receiving the MSB of each octet first.
89+
This flag is used only in 'transparent' mode.
90+
91+
fsl,tx-ts-mask:
92+
$ref: /schemas/types.yaml#/definitions/uint64
93+
description:
94+
Channel assigned Tx time-slots within the Tx time-slots routed by the
95+
TSA to this cell.
96+
97+
fsl,rx-ts-mask:
98+
$ref: /schemas/types.yaml#/definitions/uint64
99+
description:
100+
Channel assigned Rx time-slots within the Rx time-slots routed by the
101+
TSA to this cell.
102+
103+
required:
104+
- reg
105+
- fsl,tx-ts-mask
106+
- fsl,rx-ts-mask
107+
108+
required:
109+
- compatible
110+
- reg
111+
- reg-names
112+
- interrupts
113+
- fsl,tsa-serial
114+
- '#address-cells'
115+
- '#size-cells'
116+
117+
additionalProperties: false
118+
119+
examples:
120+
- |
121+
#include <dt-bindings/soc/cpm1-fsl,tsa.h>
122+
123+
qmc@a60 {
124+
compatible = "fsl,mpc885-scc-qmc", "fsl,cpm1-scc-qmc";
125+
reg = <0xa60 0x20>,
126+
<0x3f00 0xc0>,
127+
<0x2000 0x1000>;
128+
reg-names = "scc_regs", "scc_pram", "dpram";
129+
interrupts = <27>;
130+
interrupt-parent = <&CPM_PIC>;
131+
132+
#address-cells = <1>;
133+
#size-cells = <0>;
134+
135+
fsl,tsa-serial = <&tsa FSL_CPM_TSA_SCC4>;
136+
137+
channel@16 {
138+
/* Ch16 : First 4 even TS from all routed from TSA */
139+
reg = <16>;
140+
fsl,mode = "transparent";
141+
fsl,reverse-data;
142+
fsl,tx-ts-mask = <0x00000000 0x000000aa>;
143+
fsl,rx-ts-mask = <0x00000000 0x000000aa>;
144+
};
145+
146+
channel@17 {
147+
/* Ch17 : First 4 odd TS from all routed from TSA */
148+
reg = <17>;
149+
fsl,mode = "transparent";
150+
fsl,reverse-data;
151+
fsl,tx-ts-mask = <0x00000000 0x00000055>;
152+
fsl,rx-ts-mask = <0x00000000 0x00000055>;
153+
};
154+
155+
channel@19 {
156+
/* Ch19 : 8 TS (TS 8..15) from all routed from TSA */
157+
reg = <19>;
158+
fsl,mode = "hdlc";
159+
fsl,tx-ts-mask = <0x00000000 0x0000ff00>;
160+
fsl,rx-ts-mask = <0x00000000 0x0000ff00>;
161+
};
162+
};
Lines changed: 205 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,205 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/soc/fsl/cpm_qe/fsl,cpm1-tsa.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: PowerQUICC CPM Time-slot assigner (TSA) controller
8+
9+
maintainers:
10+
- Herve Codina <[email protected]>
11+
12+
description:
13+
The TSA is the time-slot assigner that can be found on some PowerQUICC SoC.
14+
Its purpose is to route some TDM time-slots to other internal serial
15+
controllers.
16+
17+
properties:
18+
compatible:
19+
items:
20+
- enum:
21+
- fsl,mpc885-tsa
22+
- fsl,mpc866-tsa
23+
- const: fsl,cpm1-tsa
24+
25+
reg:
26+
items:
27+
- description: SI (Serial Interface) register base
28+
- description: SI RAM base
29+
30+
reg-names:
31+
items:
32+
- const: si_regs
33+
- const: si_ram
34+
35+
'#address-cells':
36+
const: 1
37+
38+
'#size-cells':
39+
const: 0
40+
41+
patternProperties:
42+
'^tdm@[0-1]$':
43+
description:
44+
The TDM managed by this controller
45+
type: object
46+
47+
additionalProperties: false
48+
49+
properties:
50+
reg:
51+
minimum: 0
52+
maximum: 1
53+
description:
54+
The TDM number for this TDM, 0 for TDMa and 1 for TDMb
55+
56+
fsl,common-rxtx-pins:
57+
$ref: /schemas/types.yaml#/definitions/flag
58+
description:
59+
The hardware can use four dedicated pins for Tx clock, Tx sync, Rx
60+
clock and Rx sync or use only two pins, Tx/Rx clock and Tx/Rx sync.
61+
Without the 'fsl,common-rxtx-pins' property, the four pins are used.
62+
With the 'fsl,common-rxtx-pins' property, two pins are used.
63+
64+
clocks:
65+
minItems: 2
66+
items:
67+
- description: External clock connected to L1RSYNC pin
68+
- description: External clock connected to L1RCLK pin
69+
- description: External clock connected to L1TSYNC pin
70+
- description: External clock connected to L1TCLK pin
71+
72+
clock-names:
73+
minItems: 2
74+
items:
75+
- const: l1rsync
76+
- const: l1rclk
77+
- const: l1tsync
78+
- const: l1tclk
79+
80+
fsl,rx-frame-sync-delay-bits:
81+
enum: [0, 1, 2, 3]
82+
default: 0
83+
description: |
84+
Receive frame sync delay in number of bits.
85+
Indicates the delay between the Rx sync and the first bit of the Rx
86+
frame. 0 for no bit delay. 1, 2 or 3 for 1, 2 or 3 bits delay.
87+
88+
fsl,tx-frame-sync-delay-bits:
89+
enum: [0, 1, 2, 3]
90+
default: 0
91+
description: |
92+
Transmit frame sync delay in number of bits.
93+
Indicates the delay between the Tx sync and the first bit of the Tx
94+
frame. 0 for no bit delay. 1, 2 or 3 for 1, 2 or 3 bits delay.
95+
96+
fsl,clock-falling-edge:
97+
$ref: /schemas/types.yaml#/definitions/flag
98+
description:
99+
Data is sent on falling edge of the clock (and received on the rising
100+
edge). If 'clock-falling-edge' is not present, data is sent on the
101+
rising edge (and received on the falling edge).
102+
103+
fsl,fsync-rising-edge:
104+
$ref: /schemas/types.yaml#/definitions/flag
105+
description:
106+
Frame sync pulses are sampled with the rising edge of the channel
107+
clock. If 'fsync-rising-edge' is not present, pulses are sampled with
108+
the falling edge.
109+
110+
fsl,double-speed-clock:
111+
$ref: /schemas/types.yaml#/definitions/flag
112+
description:
113+
The channel clock is twice the data rate.
114+
115+
patternProperties:
116+
'^fsl,[rt]x-ts-routes$':
117+
$ref: /schemas/types.yaml#/definitions/uint32-matrix
118+
description: |
119+
A list of tuple that indicates the Tx or Rx time-slots routes.
120+
items:
121+
items:
122+
- description:
123+
The number of time-slots
124+
minimum: 1
125+
maximum: 64
126+
- description: |
127+
The source (Tx) or destination (Rx) serial interface
128+
(dt-bindings/soc/cpm1-fsl,tsa.h defines these values)
129+
- 0: No destination
130+
- 1: SCC2
131+
- 2: SCC3
132+
- 3: SCC4
133+
- 4: SMC1
134+
- 5: SMC2
135+
enum: [0, 1, 2, 3, 4, 5]
136+
minItems: 1
137+
maxItems: 64
138+
139+
allOf:
140+
# If fsl,common-rxtx-pins is present, only 2 clocks are needed.
141+
# Else, the 4 clocks must be present.
142+
- if:
143+
required:
144+
- fsl,common-rxtx-pins
145+
then:
146+
properties:
147+
clocks:
148+
maxItems: 2
149+
clock-names:
150+
maxItems: 2
151+
else:
152+
properties:
153+
clocks:
154+
minItems: 4
155+
clock-names:
156+
minItems: 4
157+
158+
required:
159+
- reg
160+
- clocks
161+
- clock-names
162+
163+
required:
164+
- compatible
165+
- reg
166+
- reg-names
167+
- '#address-cells'
168+
- '#size-cells'
169+
170+
additionalProperties: false
171+
172+
examples:
173+
- |
174+
#include <dt-bindings/soc/cpm1-fsl,tsa.h>
175+
176+
tsa@ae0 {
177+
compatible = "fsl,mpc885-tsa", "fsl,cpm1-tsa";
178+
reg = <0xae0 0x10>,
179+
<0xc00 0x200>;
180+
reg-names = "si_regs", "si_ram";
181+
182+
#address-cells = <1>;
183+
#size-cells = <0>;
184+
185+
tdm@0 {
186+
/* TDMa */
187+
reg = <0>;
188+
189+
clocks = <&clk_l1rsynca>, <&clk_l1rclka>;
190+
clock-names = "l1rsync", "l1rclk";
191+
192+
fsl,common-rxtx-pins;
193+
fsl,fsync-rising-edge;
194+
195+
fsl,tx-ts-routes = <2 0>, /* TS 0..1 */
196+
<24 FSL_CPM_TSA_SCC4>, /* TS 2..25 */
197+
<1 0>, /* TS 26 */
198+
<5 FSL_CPM_TSA_SCC3>; /* TS 27..31 */
199+
200+
fsl,rx-ts-routes = <2 0>, /* TS 0..1 */
201+
<24 FSL_CPM_TSA_SCC4>, /* 2..25 */
202+
<1 0>, /* TS 26 */
203+
<5 FSL_CPM_TSA_SCC3>; /* TS 27..31 */
204+
};
205+
};

Documentation/devicetree/bindings/sound/adi,adau1372.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ properties:
3232
maxItems: 1
3333

3434
clock-names:
35-
const: "mclk"
35+
const: mclk
3636

3737
powerdown-gpios:
3838
description: GPIO used for hardware power-down.

0 commit comments

Comments
 (0)