Skip to content

Commit a3b5d47

Browse files
committed
Merge tag 'asoc-v5.20-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: More updates for v5.20 More updates that came in since the last pull request I sent, a series of driver specific changes: - Support for AMD RPL, some Intel platforms and Mediatek MT8186.
2 parents 9769e44 + 40d060b commit a3b5d47

File tree

98 files changed

+7732
-844
lines changed

Some content is hidden

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

98 files changed

+7732
-844
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ properties:
3232
reset-gpios:
3333
maxItems: 1
3434

35-
spi-max-frequency: true
36-
3735
AVDD-supply:
3836
description: Analog power support for the device.
3937

@@ -52,7 +50,10 @@ required:
5250
- compatible
5351
- AVDD-supply
5452

55-
additionalProperties: false
53+
allOf:
54+
- $ref: /schemas/spi/spi-peripheral-props.yaml#
55+
56+
unevaluatedProperties: false
5657

5758
examples:
5859
- |
Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
# Copyright (C) 2022 Microchip Technology, Inc. and its subsidiaries
3+
%YAML 1.2
4+
---
5+
$id: http://devicetree.org/schemas/sound/atmel,sama5d2-classd.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: Atmel ClassD Amplifier
9+
10+
maintainers:
11+
- Nicolas Ferre <[email protected]>
12+
- Alexandre Belloni <[email protected]>
13+
- Claudiu Beznea <[email protected]>
14+
15+
description:
16+
The Audio Class D Amplifier (CLASSD) is a digital input, Pulse Width
17+
Modulated (PWM) output stereo Class D amplifier.
18+
19+
properties:
20+
compatible:
21+
const: atmel,sama5d2-classd
22+
23+
reg:
24+
maxItems: 1
25+
26+
interrupts:
27+
maxItems: 1
28+
29+
dmas:
30+
maxItems: 1
31+
32+
dma-names:
33+
const: tx
34+
35+
clocks:
36+
maxItems: 2
37+
38+
clock-names:
39+
items:
40+
- const: pclk
41+
- const: gclk
42+
43+
atmel,model:
44+
$ref: /schemas/types.yaml#/definitions/string
45+
default: CLASSD
46+
description: The user-visible name of this sound complex.
47+
48+
atmel,pwm-type:
49+
$ref: /schemas/types.yaml#/definitions/string
50+
enum:
51+
- single
52+
- diff
53+
default: single
54+
description: PWM modulation type.
55+
56+
atmel,non-overlap-time:
57+
$ref: /schemas/types.yaml#/definitions/uint32
58+
enum:
59+
- 5
60+
- 10
61+
- 15
62+
- 20
63+
default: 10
64+
description:
65+
Set non-overlapping time, the unit is nanosecond(ns).
66+
Non-overlapping will be disabled if not specified.
67+
68+
required:
69+
- compatible
70+
- reg
71+
- interrupts
72+
- dmas
73+
- dma-names
74+
- clock-names
75+
- clocks
76+
77+
additionalProperties: false
78+
79+
examples:
80+
- |
81+
#include <dt-bindings/dma/at91.h>
82+
#include <dt-bindings/interrupt-controller/arm-gic.h>
83+
84+
classd: sound@fc048000 {
85+
compatible = "atmel,sama5d2-classd";
86+
reg = <0xfc048000 0x100>;
87+
interrupts = <59 IRQ_TYPE_LEVEL_HIGH 7>;
88+
dmas = <&dma0
89+
(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)
90+
| AT91_XDMAC_DT_PERID(47))>;
91+
dma-names = "tx";
92+
clocks = <&classd_clk>, <&classd_gclk>;
93+
clock-names = "pclk", "gclk";
94+
assigned-clocks = <&classd_gclk>;
95+
pinctrl-names = "default";
96+
pinctrl-0 = <&pinctrl_classd_default>;
97+
atmel,model = "classd @ SAMA5D2-Xplained";
98+
atmel,pwm-type = "diff";
99+
atmel,non-overlap-time = <10>;
100+
};
Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
# Copyright (C) 2022 Microchip Technology, Inc. and its subsidiaries
3+
%YAML 1.2
4+
---
5+
$id: http://devicetree.org/schemas/sound/atmel,sama5d2-i2s.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: Atmel I2S controller
9+
10+
maintainers:
11+
- Nicolas Ferre <[email protected]>
12+
- Alexandre Belloni <[email protected]>
13+
- Claudiu Beznea <[email protected]>
14+
15+
description:
16+
Atmel I2S (Inter-IC Sound Controller) bus is the standard
17+
interface for connecting audio devices, such as audio codecs.
18+
19+
properties:
20+
compatible:
21+
const: atmel,sama5d2-i2s
22+
23+
reg:
24+
maxItems: 1
25+
26+
interrupts:
27+
maxItems: 1
28+
29+
clocks:
30+
items:
31+
- description: Peripheral clock
32+
- description: Generated clock (Optional)
33+
- description: I2S mux clock (Optional). Set
34+
with gclk when Master Mode is required.
35+
minItems: 1
36+
37+
clock-names:
38+
items:
39+
- const: pclk
40+
- const: gclk
41+
- const: muxclk
42+
minItems: 1
43+
44+
dmas:
45+
items:
46+
- description: TX DMA Channel
47+
- description: RX DMA Channel
48+
49+
dma-names:
50+
items:
51+
- const: tx
52+
- const: rx
53+
54+
required:
55+
- compatible
56+
- reg
57+
- interrupts
58+
- dmas
59+
- dma-names
60+
- clocks
61+
- clock-names
62+
63+
additionalProperties: false
64+
65+
examples:
66+
- |
67+
#include <dt-bindings/dma/at91.h>
68+
#include <dt-bindings/interrupt-controller/arm-gic.h>
69+
70+
i2s@f8050000 {
71+
compatible = "atmel,sama5d2-i2s";
72+
reg = <0xf8050000 0x300>;
73+
interrupts = <54 IRQ_TYPE_LEVEL_HIGH 7>;
74+
dmas = <&dma0
75+
(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
76+
AT91_XDMAC_DT_PERID(31))>,
77+
<&dma0
78+
(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
79+
AT91_XDMAC_DT_PERID(32))>;
80+
dma-names = "tx", "rx";
81+
clocks = <&i2s0_clk>, <&i2s0_gclk>, <&i2s0muxck>;
82+
clock-names = "pclk", "gclk", "muxclk";
83+
pinctrl-names = "default";
84+
pinctrl-0 = <&pinctrl_i2s0_default>;
85+
};
Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
# Copyright (C) 2022 Microchip Technology, Inc. and its subsidiaries
3+
%YAML 1.2
4+
---
5+
$id: http://devicetree.org/schemas/sound/atmel,sama5d2-pdmic.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: Atmel PDMIC decoder
9+
10+
maintainers:
11+
- Claudiu Beznea <[email protected]>
12+
13+
description:
14+
Atmel Pulse Density Modulation Interface Controller
15+
(PDMIC) peripheral is a mono PDM decoder module
16+
that decodes an incoming PDM sample stream.
17+
18+
properties:
19+
compatible:
20+
const: atmel,sama5d2-pdmic
21+
22+
reg:
23+
maxItems: 1
24+
25+
interrupts:
26+
maxItems: 1
27+
28+
clocks:
29+
items:
30+
- description: peripheral clock
31+
- description: generated clock
32+
33+
clock-names:
34+
items:
35+
- const: pclk
36+
- const: gclk
37+
38+
dmas:
39+
maxItems: 1
40+
41+
dma-names:
42+
const: rx
43+
44+
atmel,mic-min-freq:
45+
$ref: /schemas/types.yaml#/definitions/uint32
46+
description:
47+
The minimal frequency that the microphone supports.
48+
49+
atmel,mic-max-freq:
50+
$ref: /schemas/types.yaml#/definitions/uint32
51+
description:
52+
The maximal frequency that the microphone supports.
53+
54+
atmel,model:
55+
$ref: /schemas/types.yaml#/definitions/string
56+
default: PDMIC
57+
description: The user-visible name of this sound card.
58+
59+
atmel,mic-offset:
60+
$ref: /schemas/types.yaml#/definitions/int32
61+
default: 0
62+
description: The offset that should be added.
63+
64+
required:
65+
- compatible
66+
- reg
67+
- interrupts
68+
- dmas
69+
- dma-names
70+
- clock-names
71+
- clocks
72+
- atmel,mic-min-freq
73+
- atmel,mic-max-freq
74+
75+
additionalProperties: false
76+
77+
examples:
78+
- |
79+
#include <dt-bindings/dma/at91.h>
80+
#include <dt-bindings/interrupt-controller/arm-gic.h>
81+
82+
pdmic: sound@f8018000 {
83+
compatible = "atmel,sama5d2-pdmic";
84+
reg = <0xf8018000 0x124>;
85+
interrupts = <48 IRQ_TYPE_LEVEL_HIGH 7>;
86+
dmas = <&dma0
87+
(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)
88+
| AT91_XDMAC_DT_PERID(50))>;
89+
dma-names = "rx";
90+
clocks = <&pdmic_clk>, <&pdmic_gclk>;
91+
clock-names = "pclk", "gclk";
92+
pinctrl-names = "default";
93+
pinctrl-0 = <&pinctrl_pdmic_default>;
94+
atmel,model = "PDMIC@sama5d2_xplained";
95+
atmel,mic-min-freq = <1000000>;
96+
atmel,mic-max-freq = <3246000>;
97+
atmel,mic-offset = <0x0>;
98+
};

Documentation/devicetree/bindings/sound/atmel-classd.txt

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

0 commit comments

Comments
 (0)