Skip to content

Commit c890e30

Browse files
brooniebroonie
committed
Merge remote-tracking branch 'asoc/for-5.10' into asoc-next
2 parents 7ffe09e + 86f29c7 commit c890e30

319 files changed

Lines changed: 23199 additions & 12554 deletions

File tree

Some content is hidden

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

‎Documentation/ABI/testing/sysfs-bus-pci-devices-catpt‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
What: /sys/devices/pci0000:00/<dev>/fw_version
2+
Date: September 2020
3+
Contact: Cezary Rojewski <cezary.rojewski@intel.com>
4+
Description:
5+
Version of AudioDSP firmware ASoC catpt driver is
6+
communicating with.
7+
Format: %d.%d.%d.%d, type:major:minor:build.
8+
9+
What: /sys/devices/pci0000:00/<dev>/fw_info
10+
Date: September 2020
11+
Contact: Cezary Rojewski <cezary.rojewski@intel.com>
12+
Description:
13+
Detailed AudioDSP firmware build information including
14+
build hash and log-providers hash. This information is
15+
obtained during initial handshake with firmware.
16+
Format: %s.

‎Documentation/devicetree/bindings/sound/ak4458.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ Required properties:
1010
Optional properties:
1111
- reset-gpios: A GPIO specifier for the power down & reset pin
1212
- mute-gpios: A GPIO specifier for the soft mute pin
13+
- AVDD-supply: Analog power supply
14+
- DVDD-supply: Digital power supply
15+
- dsd-path: Select DSD input pins for ak4497
16+
0: select #16, #17, #19 pins
17+
1: select #3, #4, #5 pins
1318

1419
Example:
1520

‎Documentation/devicetree/bindings/sound/ak5558.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ Required properties:
1010
Optional properties:
1111

1212
- reset-gpios: A GPIO specifier for the power down & reset pin.
13+
- AVDD-supply: Analog power supply
14+
- DVDD-supply: Digital power supply
1315

1416
Example:
1517

‎Documentation/devicetree/bindings/sound/allwinner,sun8i-a33-codec.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@ properties:
1515
const: 0
1616

1717
compatible:
18-
const: allwinner,sun8i-a33-codec
18+
oneOf:
19+
- items:
20+
- const: allwinner,sun50i-a64-codec
21+
- const: allwinner,sun8i-a33-codec
22+
- const: allwinner,sun8i-a33-codec
1923

2024
reg:
2125
maxItems: 1

‎Documentation/devicetree/bindings/sound/cirrus,cs4234.yaml‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
# SPDX-License-Identifier: (GPL-2.0+ OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/cirrus,cs4234.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Cirrus Logic cs4234 audio CODEC
8+
9+
maintainers:
10+
- patches@opensource.cirrus.com
11+
12+
description:
13+
The CS4234 is a highly versatile CODEC that combines 4 channels of
14+
high performance analog to digital conversion, 4 channels of high
15+
performance digital to analog conversion for audio, and 1 channel of
16+
digital to analog conversion to provide a nondelayed audio reference
17+
signal to an external Class H tracking power supply. If not used to
18+
drive a tracking power supply, the 5th DAC can instead be used as a
19+
standard audio grade DAC, with performance specifications identical
20+
to that of the 4 DACs in the audio path. Additionally, the CS4234
21+
includes tunable group delay for each of the 4 audio DAC paths to
22+
provide lead time for the external switch-mode power supply, and a
23+
nondelayed path into the DAC outputs for input signals requiring a
24+
low-latency path to the outputs.
25+
26+
properties:
27+
compatible:
28+
enum:
29+
- cirrus,cs4234
30+
31+
reg:
32+
description:
33+
The 7-bit I2C address depends on the state of the ADx pins, in
34+
binary given by [0 0 1 0 AD2 AD1 AD0 0].
35+
items:
36+
minimum: 0x10
37+
maximum: 0x17
38+
39+
VA-supply:
40+
description:
41+
Analogue power supply.
42+
43+
VL-supply:
44+
description:
45+
Interface power supply.
46+
47+
reset-gpios:
48+
maxItems: 1
49+
50+
required:
51+
- compatible
52+
- reg
53+
- VA-supply
54+
- VL-supply
55+
56+
additionalProperties: false
57+
58+
examples:
59+
- |
60+
i2c@e0004000 {
61+
#address-cells = <1>;
62+
#size-cells = <0>;
63+
reg = <0xe0004000 0x1000>;
64+
65+
cs4234: codec@11 {
66+
compatible = "cirrus,cs4234";
67+
reg = <0x11>;
68+
69+
VA-supply = <&vdd3v3>;
70+
VL-supply = <&vdd3v3>;
71+
72+
reset-gpios = <&gpio 0>;
73+
};
74+
};

‎Documentation/devicetree/bindings/sound/fsl,spdif.txt‎

Lines changed: 0 additions & 68 deletions
This file was deleted.

‎Documentation/devicetree/bindings/sound/fsl,spdif.yaml‎

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/fsl,spdif.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Freescale Sony/Philips Digital Interface Format (S/PDIF) Controller
8+
9+
maintainers:
10+
- Shengjiu Wang <shengjiu.wang@nxp.com>
11+
12+
description: |
13+
The Freescale S/PDIF audio block is a stereo transceiver that allows the
14+
processor to receive and transmit digital audio via an coaxial cable or
15+
a fibre cable.
16+
17+
properties:
18+
compatible:
19+
enum:
20+
- fsl,imx35-spdif
21+
- fsl,vf610-spdif
22+
- fsl,imx6sx-spdif
23+
24+
reg:
25+
maxItems: 1
26+
27+
interrupts:
28+
maxItems: 1
29+
30+
dmas:
31+
items:
32+
- description: DMA controller phandle and request line for RX
33+
- description: DMA controller phandle and request line for TX
34+
35+
dma-names:
36+
items:
37+
- const: rx
38+
- const: tx
39+
40+
clocks:
41+
items:
42+
- description: The core clock of spdif controller.
43+
- description: Clock for tx0 and rx0.
44+
- description: Clock for tx1 and rx1.
45+
- description: Clock for tx2 and rx2.
46+
- description: Clock for tx3 and rx3.
47+
- description: Clock for tx4 and rx4.
48+
- description: Clock for tx5 and rx5.
49+
- description: Clock for tx6 and rx6.
50+
- description: Clock for tx7 and rx7.
51+
- description: The spba clock is required when SPDIF is placed as a bus
52+
slave of the Shared Peripheral Bus and when two or more bus masters
53+
(CPU, DMA or DSP) try to access it. This property is optional depending
54+
on the SoC design.
55+
minItems: 9
56+
57+
clock-names:
58+
items:
59+
- const: core
60+
- const: rxtx0
61+
- const: rxtx1
62+
- const: rxtx2
63+
- const: rxtx3
64+
- const: rxtx4
65+
- const: rxtx5
66+
- const: rxtx6
67+
- const: rxtx7
68+
- const: spba
69+
minItems: 9
70+
71+
big-endian:
72+
$ref: /schemas/types.yaml#/definitions/flag
73+
description: |
74+
If this property is absent, the native endian mode will be in use
75+
as default, or the big endian mode will be in use for all the device
76+
registers. Set this flag for HCDs with big endian descriptors and big
77+
endian registers.
78+
79+
required:
80+
- compatible
81+
- reg
82+
- interrupts
83+
- dmas
84+
- dma-names
85+
- clocks
86+
- clock-names
87+
88+
additionalProperties: false
89+
90+
examples:
91+
- |
92+
spdif@2004000 {
93+
compatible = "fsl,imx35-spdif";
94+
reg = <0x02004000 0x4000>;
95+
interrupts = <0 52 0x04>;
96+
dmas = <&sdma 14 18 0>,
97+
<&sdma 15 18 0>;
98+
dma-names = "rx", "tx";
99+
clocks = <&clks 197>, <&clks 3>,
100+
<&clks 197>, <&clks 107>,
101+
<&clks 0>, <&clks 118>,
102+
<&clks 62>, <&clks 139>,
103+
<&clks 0>;
104+
clock-names = "core", "rxtx0",
105+
"rxtx1", "rxtx2",
106+
"rxtx3", "rxtx4",
107+
"rxtx5", "rxtx6",
108+
"rxtx7";
109+
big-endian;
110+
};

‎Documentation/devicetree/bindings/sound/fsl-asoc-card.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ The compatible list for this generic sound card currently:
3838

3939
"fsl,imx-audio-wm8524"
4040

41+
"fsl,imx-audio-tlv320aic32x4"
42+
4143
Required properties:
4244

4345
- compatible : Contains one of entries in the compatible list.

‎Documentation/devicetree/bindings/sound/hdmi.txt‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎Documentation/devicetree/bindings/sound/intel,keembay-i2s.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ properties:
1717
compatible:
1818
enum:
1919
- intel,keembay-i2s
20+
- intel,keembay-tdm
2021

2122
"#sound-dai-cells":
2223
const: 0

0 commit comments

Comments
 (0)