Skip to content

Commit b94a62a

Browse files
committed
Merge branch 'for-next' into for-linus
Pull materials for 6.5 merge window. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2 parents 37e44d6 + 0982e51 commit b94a62a

File tree

354 files changed

+9340
-3885
lines changed

Some content is hidden

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

354 files changed

+9340
-3885
lines changed

Documentation/core-api/kernel-api.rst

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,11 @@ Base 2 log and power Functions
162162
.. kernel-doc:: include/linux/log2.h
163163
:internal:
164164

165-
Integer power Functions
166-
-----------------------
165+
Integer log and power Functions
166+
-------------------------------
167+
168+
.. kernel-doc:: include/linux/int_log.h
169+
:export:
167170

168171
.. kernel-doc:: lib/math/int_pow.c
169172
:export:
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/audio-iio-aux.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Audio IIO auxiliary
8+
9+
maintainers:
10+
- Herve Codina <herve.codina@bootlin.com>
11+
12+
description:
13+
Auxiliary device based on Industrial I/O device channels
14+
15+
allOf:
16+
- $ref: dai-common.yaml#
17+
18+
properties:
19+
compatible:
20+
const: audio-iio-aux
21+
22+
io-channels:
23+
description:
24+
Industrial I/O device channels used
25+
26+
io-channel-names:
27+
description:
28+
Industrial I/O channel names related to io-channels.
29+
These names are used to provides sound controls, widgets and routes names.
30+
31+
snd-control-invert-range:
32+
$ref: /schemas/types.yaml#/definitions/uint32-array
33+
description: |
34+
A list of 0/1 flags defining whether or not the related channel is
35+
inverted
36+
items:
37+
enum: [0, 1]
38+
default: 0
39+
description: |
40+
Invert the sound control value compared to the IIO channel raw value.
41+
- 1: The related sound control value is inverted meaning that the
42+
minimum sound control value correspond to the maximum IIO channel
43+
raw value and the maximum sound control value correspond to the
44+
minimum IIO channel raw value.
45+
- 0: The related sound control value is not inverted meaning that the
46+
minimum (resp maximum) sound control value correspond to the
47+
minimum (resp maximum) IIO channel raw value.
48+
49+
required:
50+
- compatible
51+
- io-channels
52+
- io-channel-names
53+
54+
unevaluatedProperties: false
55+
56+
examples:
57+
- |
58+
iio-aux {
59+
compatible = "audio-iio-aux";
60+
io-channels = <&iio 0>, <&iio 1>, <&iio 2>, <&iio 3>;
61+
io-channel-names = "CH0", "CH1", "CH2", "CH3";
62+
/* Invert CH1 and CH2 */
63+
snd-control-invert-range = <0 1 1 0>;
64+
};

Documentation/devicetree/bindings/sound/fsl,rpmsg.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ properties:
2525
- fsl,imx8mm-rpmsg-audio
2626
- fsl,imx8mp-rpmsg-audio
2727
- fsl,imx8ulp-rpmsg-audio
28+
- fsl,imx93-rpmsg-audio
2829

2930
model:
3031
$ref: /schemas/types.yaml#/definitions/string

Documentation/devicetree/bindings/sound/mediatek,mt8188-afe.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@ properties:
2525
reset-names:
2626
const: audiosys
2727

28+
memory-region:
29+
maxItems: 1
30+
description: |
31+
Shared memory region for AFE memif. A "shared-dma-pool".
32+
See ../reserved-memory/reserved-memory.yaml for details.
33+
2834
mediatek,topckgen:
2935
$ref: /schemas/types.yaml#/definitions/phandle
3036
description: The phandle of the mediatek topckgen controller
@@ -176,6 +182,7 @@ examples:
176182
interrupts = <GIC_SPI 822 IRQ_TYPE_LEVEL_HIGH 0>;
177183
resets = <&watchdog 14>;
178184
reset-names = "audiosys";
185+
memory-region = <&snd_dma_mem_reserved>;
179186
mediatek,topckgen = <&topckgen>;
180187
mediatek,infracfg = <&infracfg_ao>;
181188
power-domains = <&spm 13>; //MT8188_POWER_DOMAIN_AUDIO

Documentation/devicetree/bindings/sound/nau8821.txt

Lines changed: 0 additions & 55 deletions
This file was deleted.
Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/nuvoton,nau8821.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: NAU88L21 audio codec
8+
9+
maintainers:
10+
- Seven Lee <wtli@nuvoton.com>
11+
12+
allOf:
13+
- $ref: dai-common.yaml#
14+
15+
properties:
16+
compatible:
17+
const: nuvoton,nau8821
18+
19+
reg:
20+
maxItems: 1
21+
22+
interrupts:
23+
maxItems: 1
24+
25+
nuvoton,jkdet-enable:
26+
description: Enable jack detection via JKDET pin.
27+
type: boolean
28+
29+
nuvoton,jkdet-pull-enable:
30+
description: Enable JKDET pin pull. If set - pin pull enabled,
31+
otherwise pin in high impedance state.
32+
type: boolean
33+
34+
nuvoton,jkdet-pull-up:
35+
description: Pull-up JKDET pin. If set then JKDET pin is pull up,
36+
otherwise pull down.
37+
type: boolean
38+
39+
nuvoton,key-enable:
40+
description: handles key press detection.
41+
type: boolean
42+
43+
nuvoton,jkdet-polarity:
44+
description: JKDET pin polarity.
45+
$ref: /schemas/types.yaml#/definitions/uint32
46+
enum:
47+
- 0 # active high
48+
- 1 # active low
49+
default: 1
50+
51+
nuvoton,micbias-voltage:
52+
description: MICBIAS output level select.
53+
$ref: /schemas/types.yaml#/definitions/uint32
54+
enum:
55+
- 0 # VDDA
56+
- 1 # VDDA * 1
57+
- 2 # VDDA * 1.1
58+
- 3 # VDDA * 1.2
59+
- 4 # VDDA * 1.3
60+
- 5 # VDDA * 1.4
61+
- 6 # VDDA * 1.53
62+
- 7 # VDDA * 1.53
63+
default: 6
64+
65+
nuvoton,vref-impedance:
66+
description: VMID Tie-off impedance select.
67+
$ref: /schemas/types.yaml#/definitions/uint32
68+
enum:
69+
- 0 # open
70+
- 1 # 25KOhms
71+
- 2 # 125KOhms
72+
- 3 # 2.5KOhms
73+
default: 2
74+
75+
nuvoton,jack-insert-debounce:
76+
description: number from 0 to 7 that sets debounce time to 2^(n+2)ms.
77+
$ref: /schemas/types.yaml#/definitions/uint32
78+
maximum: 7
79+
default: 7
80+
81+
nuvoton,jack-eject-debounce:
82+
description: number from 0 to 7 that sets debounce time to 2^(n+2)ms.
83+
$ref: /schemas/types.yaml#/definitions/uint32
84+
maximum: 7
85+
default: 0
86+
87+
nuvoton,dmic-clk-threshold:
88+
description: DMIC clock speed expected value. Unit is Hz.
89+
$ref: /schemas/types.yaml#/definitions/uint32
90+
default: 3072000
91+
92+
'#sound-dai-cells':
93+
const: 0
94+
95+
required:
96+
- compatible
97+
- reg
98+
99+
unevaluatedProperties: false
100+
101+
examples:
102+
- |
103+
#include <dt-bindings/gpio/gpio.h>
104+
#include <dt-bindings/interrupt-controller/irq.h>
105+
i2c {
106+
#address-cells = <1>;
107+
#size-cells = <0>;
108+
codec@1b {
109+
compatible = "nuvoton,nau8821";
110+
reg = <0x1b>;
111+
interrupt-parent = <&gpio>;
112+
interrupts = <23 IRQ_TYPE_LEVEL_LOW>;
113+
nuvoton,jkdet-enable;
114+
nuvoton,jkdet-pull-enable;
115+
nuvoton,jkdet-pull-up;
116+
nuvoton,key-enable;
117+
nuvoton,jkdet-polarity = <GPIO_ACTIVE_LOW>;
118+
nuvoton,micbias-voltage = <6>;
119+
nuvoton,vref-impedance = <2>;
120+
nuvoton,jack-insert-debounce = <7>;
121+
nuvoton,jack-eject-debounce = <0>;
122+
nuvoton,dmic-clk-threshold = <3072000>;
123+
#sound-dai-cells = <0>;
124+
};
125+
};

Documentation/devicetree/bindings/sound/nuvoton,nau8822.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,15 @@ properties:
2121
reg:
2222
maxItems: 1
2323

24+
"#sound-dai-cells":
25+
const: 0
26+
27+
clocks:
28+
maxItems: 1
29+
30+
clock-names:
31+
const: mclk
32+
2433
nuvoton,spk-btl:
2534
description:
2635
If set, configure the two loudspeaker outputs as a Bridge Tied Load output
@@ -31,6 +40,9 @@ required:
3140
- compatible
3241
- reg
3342

43+
allOf:
44+
- $ref: dai-common.yaml#
45+
3446
additionalProperties: false
3547

3648
examples:

0 commit comments

Comments
 (0)