lael-labs/linux

Documentation/devicetree/bindings/sound/adi,max98363.yaml+0−60

@@ -1,60 +0,0 @@
1	# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2	%YAML 1.2
3	---
4	$id: http://devicetree.org/schemas/sound/adi,max98363.yaml#
5	$schema: http://devicetree.org/meta-schemas/core.yaml#
6
7	title: Analog Devices MAX98363 SoundWire Amplifier
8
9	maintainers:
10	- Ryan Lee <ryans.lee@analog.com>
11
12	description:
13	The MAX98363 is a SoundWire input Class D mono amplifier that
14	supports MIPI SoundWire v1.2-compatible digital interface for
15	audio and control data.
16	SoundWire peripheral device ID of MAX98363 is 0x3*019f836300
17	where * is the peripheral device unique ID decoded from pin.
18	It supports up to 10 peripheral devices(0x0 to 0x9).
19
20	allOf:
21	- $ref: dai-common.yaml#
22
23	properties:
24	compatible:
25	const: sdw3019f836300
26
27	reg:
28	maxItems: 1
29
30	'#sound-dai-cells':
31	const: 0
32
33	required:
34	- compatible
35	- reg
36	- "#sound-dai-cells"
37
38	unevaluatedProperties: false
39
40	examples:
41	- \|
42	soundwire@3250000 {
43	#address-cells = <2>;
44	#size-cells = <0>;
45	reg = <0x3250000 0x2000>;
46
47	speaker@0,0 {
48	compatible = "sdw3019f836300";
49	reg = <0 0>;
50	#sound-dai-cells = <0>;
51	sound-name-prefix = "Speaker Left";
52	};
53
54	speaker@0,1 {
55	compatible = "sdw3019f836300";
56	reg = <0 1>;
57	#sound-dai-cells = <0>;
58	sound-name-prefix = "Speaker Right";
59	};
60	};

Documentation/devicetree/bindings/sound/adi,ssm2602.txt+0−19

@@ -1,19 +0,0 @@
1	Analog Devices SSM2602, SSM2603 and SSM2604 I2S audio CODEC devices
2
3	SSM2602 support both I2C and SPI as the configuration interface,
4	the selection is made by the MODE strap-in pin.
5	SSM2603 and SSM2604 only support I2C as the configuration interface.
6
7	Required properties:
8
9	- compatible : One of "adi,ssm2602", "adi,ssm2603" or "adi,ssm2604"
10
11	- reg : the I2C address of the device for I2C, the chip select
12	number for SPI.
13
14	Example:
15
16	ssm2602: ssm2602@1a {
17	compatible = "adi,ssm2602";
18	reg = <0x1a>;
19	};

Documentation/devicetree/bindings/sound/adi,ssm3515.yaml+0−49

@@ -1,49 +0,0 @@
1	# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2	%YAML 1.2
3	---
4	$id: http://devicetree.org/schemas/sound/adi,ssm3515.yaml#
5	$schema: http://devicetree.org/meta-schemas/core.yaml#
6
7	title: Analog Devices SSM3515 Audio Amplifier
8
9	maintainers:
10	- Martin Povišer <povik+lin@cutebit.org>
11
12	description: \|
13	SSM3515 is a mono Class-D audio amplifier with digital input.
14
15	https://www.analog.com/media/en/technical-documentation/data-sheets/SSM3515.pdf
16
17	allOf:
18	- $ref: dai-common.yaml#
19
20	properties:
21	compatible:
22	enum:
23	- adi,ssm3515
24
25	reg:
26	maxItems: 1
27
28	'#sound-dai-cells':
29	const: 0
30
31	required:
32	- compatible
33	- reg
34
35	unevaluatedProperties: false
36
37	examples:
38	- \|
39	i2c {
40	#address-cells = <1>;
41	#size-cells = <0>;
42
43	codec@14 {
44	compatible = "adi,ssm3515";
45	reg = <0x14>;
46	#sound-dai-cells = <0>;
47	sound-name-prefix = "Left Tweeter";
48	};
49	};

Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-i2s.yaml+3−1

       - const: allwinner,sun50i-h6-i2s
       - const: allwinner,sun50i-r329-i2s
       - items:
-          - const: allwinner,sun20i-d1-i2s
+          - enum:
+              - allwinner,sun20i-d1-i2s
+              - allwinner,sun55i-a523-i2s
           - const: allwinner,sun50i-r329-i2s
   reg:

Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-spdif.yaml+38−6

@@ -23,6 +23,7 @@ properties: · 22 unmodified lines
23	- const: allwinner,sun8i-h3-spdif	23	- const: allwinner,sun8i-h3-spdif
24	- const: allwinner,sun50i-h6-spdif	24	- const: allwinner,sun50i-h6-spdif
25	- const: allwinner,sun50i-h616-spdif	25	- const: allwinner,sun50i-h616-spdif
		26	- const: allwinner,sun55i-a523-spdif
26	- items:	27	- items:
27	- const: allwinner,sun8i-a83t-spdif	28	- const: allwinner,sun8i-a83t-spdif
28	- const: allwinner,sun8i-h3-spdif	29	- const: allwinner,sun8i-h3-spdif
@@ -37,14 +38,12 @@ properties: · 8 unmodified lines
37	maxItems: 1	38	maxItems: 1
38		39
39	clocks:	40	clocks:
40	items:	41	minItems: 2
41	- description: Bus Clock	42	maxItems: 3
42	- description: Module Clock
43		43
44	clock-names:	44	clock-names:
45	items:	45	minItems: 2
46	- const: apb	46	maxItems: 3
47	- const: spdif
48		47
49	# Even though it only applies to subschemas under the conditionals,	48	# Even though it only applies to subschemas under the conditionals,
50	# not listing them here will trigger a warning because of the	49	# not listing them here will trigger a warning because of the
@@ -65,6 +64,7 @@ allOf: · 14 unmodified lines
65	- allwinner,sun8i-h3-spdif	64	- allwinner,sun8i-h3-spdif
66	- allwinner,sun50i-h6-spdif	65	- allwinner,sun50i-h6-spdif
67	- allwinner,sun50i-h616-spdif	66	- allwinner,sun50i-h616-spdif
		67	- allwinner,sun55i-a523-spdif
68		68
69	then:	69	then:
70	required:	70	required:
@@ -98,6 +98,38 @@ allOf: · 27 unmodified lines
98	- const: rx	98	- const: rx
99	- const: tx	99	- const: tx
100		100
		101	- if:
		102	properties:
		103	compatible:
		104	contains:
		105	enum:
		106	- allwinner,sun55i-a523-spdif
		107
		108	then:
		109	properties:
		110	clocks:
		111	items:
		112	- description: Bus Clock
		113	- description: TX Clock
		114	- description: RX Clock
		115
		116	clock-names:
		117	items:
		118	- const: apb
		119	- const: tx
		120	- const: rx
		121	else:
		122	properties:
		123	clocks:
		124	items:
		125	- description: Bus Clock
		126	- description: Module Clock
		127
		128	clock-names:
		129	items:
		130	- const: apb
		131	- const: spdif
		132
101	required:	133	required:
102	- "#sound-dai-cells"	134	- "#sound-dai-cells"
103	- compatible	135	- compatible

Documentation/devicetree/bindings/sound/cirrus,cs4271.yaml+10−0

@@ -25,6 +25,16 @@ properties: · 24 unmodified lines
25	reg:	25	reg:
26	maxItems: 1	26	maxItems: 1
27		27
		28	clocks:
		29	items:
		30	- description:
		31	Master clock connected to the MCLK pin if MCLK is an input (i.e. no
		32	crystal used).
		33
		34	clock-names:
		35	items:
		36	- const: mclk
		37
28	spi-cpha: true	38	spi-cpha: true
29		39
30	spi-cpol: true	40	spi-cpol: true

Documentation/devicetree/bindings/sound/cirrus,cs530x.yaml+8−0

 allOf:
   - $ref: dai-common.yaml#
+  - $ref: /schemas/spi/spi-peripheral-props.yaml#
 properties:
   compatible:
     enum:
+      - cirrus,cs4282
+      - cirrus,cs4302
+      - cirrus,cs4304
+      - cirrus,cs4308
       - cirrus,cs5302
       - cirrus,cs5304
       - cirrus,cs5308
   reg:
     maxItems: 1
+  spi-max-frequency:
+    maximum: 24000000
   '#sound-dai-cells':
     const: 1

Documentation/devicetree/bindings/sound/cs4265.txt+0−29

@@ -1,29 +0,0 @@
1	CS4265 audio CODEC
2
3	This device supports I2C only.
4
5	Required properties:
6
7	- compatible : "cirrus,cs4265"
8
9	- reg : the I2C address of the device for I2C. The I2C address depends on
10	the state of the AD0 pin. If AD0 is high, the i2c address is 0x4f.
11	If it is low, the i2c address is 0x4e.
12
13	Optional properties:
14
15	- reset-gpios : a GPIO spec for the reset pin. If specified, it will be
16	deasserted before communication to the codec starts.
17
18	Examples:
19
20	codec_ad0_high: cs4265@4f { /* AD0 Pin is high */
21	compatible = "cirrus,cs4265";
22	reg = <0x4f>;
23	};
24
25
26	codec_ad0_low: cs4265@4e { /* AD0 Pin is low */
27	compatible = "cirrus,cs4265";
28	reg = <0x4e>;
29	};

Documentation/devicetree/bindings/sound/cs4341.txt+0−22

@@ -1,22 +0,0 @@
1	Cirrus Logic CS4341 audio DAC
2
3	This device supports both I2C and SPI (configured with pin strapping
4	on the board).
5
6	Required properties:
7	- compatible: "cirrus,cs4341a"
8	- reg : the I2C address of the device for I2C, the chip select
9	number for SPI.
10
11	For required properties on I2C-bus, please consult
12	dtschema schemas/i2c/i2c-controller.yaml
13	For required properties on SPI-bus, please consult
14	Documentation/devicetree/bindings/spi/spi-bus.txt
15
16	Example:
17	codec: cs4341@0 {
18	#sound-dai-cells = <0>;
19	compatible = "cirrus,cs4341a";
20	reg = <0>;
21	spi-max-frequency = <6000000>;
22	};

Documentation/devicetree/bindings/sound/cs4349.txt+0−19

@@ -1,19 +0,0 @@
1	CS4349 audio CODEC
2
3	Required properties:
4
5	- compatible : "cirrus,cs4349"
6
7	- reg : the I2C address of the device for I2C
8
9	Optional properties:
10
11	- reset-gpios : a GPIO spec for the reset pin.
12
13	Example:
14
15	codec: cs4349@48 {
16	compatible = "cirrus,cs4349";
17	reg = <0x48>;
18	reset-gpios = <&gpio 54 0>;
19	};

Documentation/devicetree/bindings/sound/da9055.txt+0−22

@@ -1,22 +0,0 @@
1	* Dialog DA9055 Audio CODEC
2
3	DA9055 provides Audio CODEC support (I2C only).
4
5	The Audio CODEC device in DA9055 has its own I2C address which is configurable,
6	so the device is instantiated separately from the PMIC (MFD) device.
7
8	For details on accompanying PMIC I2C device, see the following:
9	Documentation/devicetree/bindings/mfd/da9055.txt
10
11	Required properties:
12
13	- compatible: "dlg,da9055-codec"
14	- reg: Specifies the I2C slave address
15
16
17	Example:
18
19	codec: da9055-codec@1a {
20	compatible = "dlg,da9055-codec";
21	reg = <0x1a>;
22	};

Documentation/devicetree/bindings/sound/mediatek,mt8189-afe-pcm.yaml+178−0

@@ -0,0 +1,178 @@
	1	# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
	2	%YAML 1.2
	3	---
	4	$id: http://devicetree.org/schemas/sound/mediatek,mt8189-afe-pcm.yaml#
	5	$schema: http://devicetree.org/meta-schemas/core.yaml#
	6
	7	title: MediaTek Audio Front End PCM controller for MT8189
	8
	9	maintainers:
	10	- Darren Ye <darren.ye@mediatek.com>
	11	- Cyril Chao <cyril.chao@mediatek.com>
	12
	13	properties:
	14	compatible:
	15	const: mediatek,mt8189-afe-pcm
	16
	17	reg:
	18	maxItems: 1
	19
	20	interrupts:
	21	maxItems: 1
	22
	23	memory-region:
	24	maxItems: 1
	25
	26	mediatek,apmixedsys:
	27	$ref: /schemas/types.yaml#/definitions/phandle
	28	description: To set up the apll12 tuner
	29
	30	power-domains:
	31	maxItems: 1
	32
	33	clocks:
	34	items:
	35	- description: mux for audio intbus
	36	- description: mux for audio engen1
	37	- description: mux for audio engen2
	38	- description: mux for audio h
	39	- description: audio apll1 clock
	40	- description: audio apll2 clock
	41	- description: audio apll1 divide4
	42	- description: audio apll2 divide4
	43	- description: audio apll12 divide for i2sin0
	44	- description: audio apll12 divide for i2sin1
	45	- description: audio apll12 divide for i2sout0
	46	- description: audio apll12 divide for i2sout1
	47	- description: audio apll12 divide for fmi2s
	48	- description: audio apll12 divide for tdmout mck
	49	- description: audio apll12 divide for tdmout bck
	50	- description: mux for audio apll1
	51	- description: mux for audio apll2
	52	- description: mux for i2sin0 mck
	53	- description: mux for i2sin1 mck
	54	- description: mux for i2sout0 mck
	55	- description: mux for i2sout1 mck
	56	- description: mux for fmi2s mck
	57	- description: mux for tdmout mck
	58	- description: 26m clock
	59	- description: audio slv clock
	60	- description: audio mst clock
	61	- description: audio intbus clock
	62
	63	clock-names:
	64	items:
	65	- const: top_aud_intbus
	66	- const: top_aud_eng1
	67	- const: top_aud_eng2
	68	- const: top_aud_h
	69	- const: apll1
	70	- const: apll2
	71	- const: apll1_d4
	72	- const: apll2_d4
	73	- const: apll12_div_i2sin0
	74	- const: apll12_div_i2sin1
	75	- const: apll12_div_i2sout0
	76	- const: apll12_div_i2sout1
	77	- const: apll12_div_fmi2s
	78	- const: apll12_div_tdmout_m
	79	- const: apll12_div_tdmout_b
	80	- const: top_apll1
	81	- const: top_apll2
	82	- const: top_i2sin0
	83	- const: top_i2sin1
	84	- const: top_i2sout0
	85	- const: top_i2sout1
	86	- const: top_fmi2s
	87	- const: top_dptx
	88	- const: clk26m
	89	- const: aud_slv_ck_peri
	90	- const: aud_mst_ck_peri
	91	- const: aud_intbus_ck_peri
	92
	93	required:
	94	- compatible
	95	- reg
	96	- interrupts
	97	- memory-region
	98	- power-domains
	99	- clocks
	100	- clock-names
	101
	102	additionalProperties: false
	103
	104	examples:
	105	- \|
	106	#include <dt-bindings/interrupt-controller/arm-gic.h>
	107	#include <dt-bindings/interrupt-controller/irq.h>
	108
	109	soc {
	110	#address-cells = <2>;
	111	#size-cells = <2>;
	112
	113	afe@11050000 {
	114	compatible = "mediatek,mt8189-afe-pcm";
	115	reg = <0 0x11050000 0 0x10000>;
	116	interrupts = <GIC_SPI 392 IRQ_TYPE_LEVEL_HIGH 0>;
	117	memory-region = <&afe_dma_mem_reserved>;
	118	pinctrl-names = "default";
	119	pinctrl-0 = <&aud_pins_default>;
	120	power-domains = <&scpsys 1>; //MT8189_POWER_DOMAIN_AUDIO
	121	clocks = <&topckgen_clk 23>, //CLK_TOP_AUD_INTBUS_SEL
	122	<&topckgen_clk 39>, //CLK_TOP_AUD_ENGEN1_SEL
	123	<&topckgen_clk 40>, //CLK_TOP_AUD_ENGEN2_SEL
	124	<&topckgen_clk 49>, //CLK_TOP_AUDIO_H_SEL
	125	<&topckgen_clk 146>, //CLK_TOP_APLL1
	126	<&topckgen_clk 151>, //CLK_TOP_APLL2
	127	<&topckgen_clk 148>, //CLK_TOP_APLL1_D4
	128	<&topckgen_clk 153>, //CLK_TOP_APLL2_D4
	129	<&topckgen_clk 93>, //CLK_TOP_APLL12_CK_DIV_I2SIN0
	130	<&topckgen_clk 94>, //CLK_TOP_APLL12_CK_DIV_I2SIN1
	131	<&topckgen_clk 95>, //CLK_TOP_APLL12_CK_DIV_I2SOUT0
	132	<&topckgen_clk 96>, //CLK_TOP_APLL12_CK_DIV_I2SOUT1
	133	<&topckgen_clk 97>, //CLK_TOP_APLL12_CK_DIV_FMI2S
	134	<&topckgen_clk 98>, //CLK_TOP_APLL12_CK_DIV_TDMOUT_M
	135	<&topckgen_clk 99>, //CLK_TOP_APLL12_CK_DIV_TDMOUT_B
	136	<&topckgen_clk 44>, //CLK_TOP_AUD_1_SEL
	137	<&topckgen_clk 45>, //CLK_TOP_AUD_2_SEL
	138	<&topckgen_clk 78>, //CLK_TOP_APLL_I2SIN0_MCK_SEL
	139	<&topckgen_clk 79>, //CLK_TOP_APLL_I2SIN1_MCK_SEL
	140	<&topckgen_clk 84>, //CLK_TOP_APLL_I2SOUT0_MCK_SEL
	141	<&topckgen_clk 85>, //CLK_TOP_APLL_I2SOUT1_MCK_SEL
	142	<&topckgen_clk 90>, //CLK_TOP_APLL_FMI2S_MCK_SEL
	143	<&topckgen_clk 91>, //CLK_TOP_APLL_TDMOUT_MCK_SEL
	144	<&topckgen_clk 191>, //CLK_TOP_TCK_26M_MX9
	145	<&pericfg_ao_clk 77>, //CLK_PERAO_AUDIO0
	146	<&pericfg_ao_clk 78>, //CLK_PERAO_AUDIO1
	147	<&pericfg_ao_clk 79>; //CLK_PERAO_AUDIO2
	148	clock-names = "top_aud_intbus",
	149	"top_aud_eng1",
	150	"top_aud_eng2",
	151	"top_aud_h",
	152	"apll1",
	153	"apll2",
	154	"apll1_d4",
	155	"apll2_d4",
	156	"apll12_div_i2sin0",
	157	"apll12_div_i2sin1",
	158	"apll12_div_i2sout0",
	159	"apll12_div_i2sout1",
	160	"apll12_div_fmi2s",
	161	"apll12_div_tdmout_m",
	162	"apll12_div_tdmout_b",
	163	"top_apll1",
	164	"top_apll2",
	165	"top_i2sin0",
	166	"top_i2sin1",
	167	"top_i2sout0",
	168	"top_i2sout1",
	169	"top_fmi2s",
	170	"top_dptx",
	171	"clk26m",
	172	"aud_slv_ck_peri",
	173	"aud_mst_ck_peri",
	174	"aud_intbus_ck_peri";
	175	};
	176	};
	177
	178	...

Documentation/devicetree/bindings/sound/mediatek,mt8189-nau8825.yaml+101−0

@@ -0,0 +1,101 @@
	1	# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
	2	%YAML 1.2
	3	---
	4	$id: http://devicetree.org/schemas/sound/mediatek,mt8189-nau8825.yaml#
	5	$schema: http://devicetree.org/meta-schemas/core.yaml#
	6
	7	title: MediaTek MT8189 ASoC sound card
	8
	9	maintainers:
	10	- Darren Ye <darren.ye@mediatek.com>
	11	- Cyril Chao <cyril.chao@mediatek.com>
	12
	13	allOf:
	14	- $ref: sound-card-common.yaml#
	15
	16	properties:
	17	compatible:
	18	enum:
	19	- mediatek,mt8189-nau8825
	20	- mediatek,mt8189-rt5650
	21	- mediatek,mt8189-rt5682s
	22	- mediatek,mt8189-rt5682i
	23	- mediatek,mt8189-es8326
	24
	25	mediatek,platform:
	26	$ref: /schemas/types.yaml#/definitions/phandle
	27	description: The phandle of MT8189 ASoC platform.
	28
	29	patternProperties:
	30	"^dai-link-[0-9]+$":
	31	type: object
	32	description:
	33	Container for dai-link level properties and CODEC sub-nodes.
	34
	35	properties:
	36	link-name:
	37	description:
	38	This property corresponds to the name of the BE dai-link to which
	39	we are going to update parameters in this node.
	40	enum:
	41	- TDM_DPTX_BE
	42	- I2SOUT0_BE
	43	- I2SIN0_BE
	44	- I2SOUT1_BE
	45
	46	codec:
	47	description: Holds subnode which indicates codec dai.
	48	type: object
	49	additionalProperties: false
	50
	51	properties:
	52	sound-dai:
	53	minItems: 1
	54	maxItems: 2
	55	required:
	56	- sound-dai
	57
	58	dai-format:
	59	description: audio format.
	60	enum:
	61	- i2s
	62	- right_j
	63	- left_j
	64	- dsp_a
	65	- dsp_b
	66
	67	mediatek,clk-provider:
	68	$ref: /schemas/types.yaml#/definitions/string
	69	description: Indicates dai-link clock master.
	70	enum:
	71	- cpu
	72	- codec
	73
	74	additionalProperties: false
	75
	76	required:
	77	- link-name
	78
	79	required:
	80	- compatible
	81	- mediatek,platform
	82
	83	unevaluatedProperties: false
	84
	85	examples:
	86	- \|
	87	sound {
	88	compatible = "mediatek,mt8189-nau8825";
	89	model = "mt8189_rt9123_8825";
	90	mediatek,platform = <&afe>;
	91	dai-link-0 {
	92	link-name = "I2SOUT1_BE";
	93	dai-format = "i2s";
	94	mediatek,clk-provider = "cpu";
	95	codec {
	96	sound-dai = <&nau8825>;
	97	};
	98	};
	99	};
	100
	101	...

Documentation/devicetree/bindings/sound/nuvoton,nau8540.yaml+0−40

@@ -1,40 +0,0 @@
1	# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2	%YAML 1.2
3	---
4	$id: http://devicetree.org/schemas/sound/nuvoton,nau8540.yaml#
5	$schema: http://devicetree.org/meta-schemas/core.yaml#
6
7	title: Nuvoton Technology Corporation NAU85L40 Audio CODEC
8
9	maintainers:
10	- John Hsu <KCHSU0@nuvoton.com>
11
12	allOf:
13	- $ref: dai-common.yaml#
14
15	properties:
16	compatible:
17	const: nuvoton,nau8540
18
19	reg:
20	maxItems: 1
21
22	"#sound-dai-cells":
23	const: 0
24
25	required:
26	- compatible
27	- reg
28
29	unevaluatedProperties: false
30
31	examples:
32	- \|
33	i2c {
34	#address-cells = <1>;
35	#size-cells = <0>;
36	codec@1c {
37	compatible = "nuvoton,nau8540";
38	reg = <0x1c>;
39	};
40	};

Documentation/devicetree/bindings/sound/nuvoton,nau8810.yaml+0−45

@@ -1,45 +0,0 @@
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,nau8810.yaml#
5	$schema: http://devicetree.org/meta-schemas/core.yaml#
6
7	title: NAU8810/NAU8812/NAU8814 audio CODEC
8
9	maintainers:
10	- David Lin <CTLIN0@nuvoton.com>
11
12	allOf:
13	- $ref: dai-common.yaml#
14
15	properties:
16	compatible:
17	enum:
18	- nuvoton,nau8810
19	- nuvoton,nau8812
20	- nuvoton,nau8814
21
22	reg:
23	maxItems: 1
24
25	'#sound-dai-cells':
26	const: 0
27
28	required:
29	- compatible
30	- reg
31
32	unevaluatedProperties: false
33
34	examples:
35	- \|
36	i2c {
37	#address-cells = <1>;
38	#size-cells = <0>;
39
40	codec@1a {
41	#sound-dai-cells = <0>;
42	compatible = "nuvoton,nau8810";
43	reg = <0x1a>;
44	};
45	};

Documentation/devicetree/bindings/sound/nvidia,tegra210-admaif.yaml+66−40

@@ -67,46 +67,72 @@ properties: · 66 unmodified lines
67	$ref: audio-graph-port.yaml#	67	$ref: audio-graph-port.yaml#
68	unevaluatedProperties: false	68	unevaluatedProperties: false
69		69
70	if:	70	allOf:
71	properties:	71	- if:
72	compatible:	72	properties:
73	contains:	73	compatible:
74	const: nvidia,tegra210-admaif	74	contains:
75		75	const: nvidia,tegra210-admaif
76	then:	76	then:
77	properties:	77	properties:
78	dmas:	78	dmas:
79	description:	79	description:
80	DMA channel specifiers, equally divided for Tx and Rx.	80	DMA channel specifiers, equally divided for Tx and Rx.
81	minItems: 1	81	minItems: 1
82	maxItems: 20	82	maxItems: 20
83	dma-names:	83	dma-names:
84	items:	84	items:
85	pattern: "^[rt]x(10\|[1-9])$"	85	pattern: "^[rt]x(10\|[1-9])$"
86	description:	86	description:
87	Should be "rx1", "rx2" ... "rx10" for DMA Rx channel	87	Should be "rx1", "rx2" ... "rx10" for DMA Rx channel
88	Should be "tx1", "tx2" ... "tx10" for DMA Tx channel	88	Should be "tx1", "tx2" ... "tx10" for DMA Tx channel
89	minItems: 1	89	minItems: 1
90	maxItems: 20	90	maxItems: 20
91	interconnects: false	91	interconnects: false
92	interconnect-names: false	92	interconnect-names: false
93	iommus: false	93	iommus: false
94		94
95	else:	95	- if:
96	properties:	96	properties:
97	dmas:	97	compatible:
98	description:	98	contains:
99	DMA channel specifiers, equally divided for Tx and Rx.	99	const: nvidia,tegra186-admaif
100	minItems: 1	100	then:
101	maxItems: 40	101	properties:
102	dma-names:	102	dmas:
103	items:	103	description:
104	pattern: "^[rt]x(1[0-9]\|[1-9]\|20)$"	104	DMA channel specifiers, equally divided for Tx and Rx.
105	description:	105	minItems: 1
106	Should be "rx1", "rx2" ... "rx20" for DMA Rx channel	106	maxItems: 40
107	Should be "tx1", "tx2" ... "tx20" for DMA Tx channel	107	dma-names:
108	minItems: 1	108	items:
109	maxItems: 40	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
110		136
111	required:	137	required:
112	- compatible	138	- compatible

Documentation/devicetree/bindings/sound/nxp,tfa9879.yaml+0−44

@@ -1,44 +0,0 @@
1	# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2	%YAML 1.2
3	---
4	$id: http://devicetree.org/schemas/sound/nxp,tfa9879.yaml#
5	$schema: http://devicetree.org/meta-schemas/core.yaml#
6
7	title: NXP TFA9879 class-D audio amplifier
8
9	maintainers:
10	- Peter Rosin <peda@axentia.se>
11
12	allOf:
13	- $ref: dai-common.yaml#
14
15	properties:
16	compatible:
17	const: nxp,tfa9879
18
19	reg:
20	maxItems: 1
21
22	"#sound-dai-cells":
23	const: 0
24
25	required:
26	- compatible
27	- reg
28	- '#sound-dai-cells'
29
30	unevaluatedProperties: false
31
32	examples:
33	- \|
34	i2c1 {
35	#address-cells = <1>;
36	#size-cells = <0>;
37	amplifier@6c {
38	compatible = "nxp,tfa9879";
39	reg = <0x6c>;
40	pinctrl-names = "default";
41	pinctrl-0 = <&pinctrl_i2c1>;
42	#sound-dai-cells = <0>;
43	};
44	};

Documentation/devicetree/bindings/sound/nxp,uda1342.yaml+0−42

@@ -1,42 +0,0 @@
1	# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2	%YAML 1.2
3	---
4	$id: http://devicetree.org/schemas/sound/nxp,uda1342.yaml#
5	$schema: http://devicetree.org/meta-schemas/core.yaml#
6
7	title: NXP uda1342 audio CODECs
8
9	maintainers:
10	- Binbin Zhou <zhoubinbin@loongson.cn>
11
12	allOf:
13	- $ref: dai-common.yaml#
14
15	properties:
16	compatible:
17	const: nxp,uda1342
18
19	reg:
20	maxItems: 1
21
22	'#sound-dai-cells':
23	const: 0
24
25	required:
26	- compatible
27	- reg
28	- '#sound-dai-cells'
29
30	unevaluatedProperties: false
31
32	examples:
33	- \|
34	i2c {
35	#address-cells = <1>;
36	#size-cells = <0>;
37	codec@1a {
38	compatible = "nxp,uda1342";
39	reg = <0x1a>;
40	#sound-dai-cells = <0>;
41	};
42	};

Documentation/devicetree/bindings/sound/pcm1789.txt+0−22

@@ -1,22 +0,0 @@
1	Texas Instruments pcm1789 DT bindings
2
3	PCM1789 is a simple audio codec that can be connected via
4	I2C or SPI. Currently, only I2C bus is supported.
5
6	Required properties:
7
8	- compatible: "ti,pcm1789"
9
10	Required properties on I2C:
11
12	- reg: the I2C address
13	- reset-gpios: GPIO to control the RESET pin
14
15	Examples:
16
17	audio-codec@4c {
18	compatible = "ti,pcm1789";
19	reg = <0x4c>;
20	reset-gpios = <&gpio2 14 GPIO_ACTIVE_LOW>;
21	#sound-dai-cells = <0>;
22	};

Documentation/devicetree/bindings/sound/pcm179x.txt+0−27

@@ -1,27 +0,0 @@
1	Texas Instruments pcm179x DT bindings
2
3	This driver supports both the I2C and SPI bus.
4
5	Required properties:
6
7	- compatible: "ti,pcm1792a"
8
9	For required properties on SPI, please consult
10	Documentation/devicetree/bindings/spi/spi-bus.txt
11
12	Required properties on I2C:
13
14	- reg: the I2C address
15
16
17	Examples:
18
19	codec_spi: 1792a@0 {
20	compatible = "ti,pcm1792a";
21	spi-max-frequency = <600000>;
22	};
23
24	codec_i2c: 1792a@4c {
25	compatible = "ti,pcm1792a";
26	reg = <0x4c>;
27	};

Documentation/devicetree/bindings/sound/pcm186x.txt+0−42

@@ -1,42 +0,0 @@
1	Texas Instruments PCM186x Universal Audio ADC
2
3	These devices support both I2C and SPI (configured with pin strapping
4	on the board).
5
6	Required properties:
7
8	- compatible : "ti,pcm1862",
9	"ti,pcm1863",
10	"ti,pcm1864",
11	"ti,pcm1865"
12
13	- reg : The I2C address of the device for I2C, the chip select
14	number for SPI.
15
16	- avdd-supply: Analog core power supply (3.3v)
17	- dvdd-supply: Digital core power supply
18	- iovdd-supply: Digital IO power supply
19	See regulator/regulator.txt for more information
20
21	CODEC input pins:
22	* VINL1
23	* VINR1
24	* VINL2
25	* VINR2
26	* VINL3
27	* VINR3
28	* VINL4
29	* VINR4
30
31	The pins can be used in referring sound node's audio-routing property.
32
33	Example:
34
35	pcm186x: audio-codec@4a {
36	compatible = "ti,pcm1865";
37	reg = <0x4a>;
38
39	avdd-supply = <&reg_3v3_analog>;
40	dvdd-supply = <&reg_3v3>;
41	iovdd-supply = <&reg_1v8>;
42	};

Documentation/devicetree/bindings/sound/pcm5102a.txt+0−13

@@ -1,13 +0,0 @@
1	PCM5102a audio CODECs
2
3	These devices does not use I2C or SPI.
4
5	Required properties:
6
7	- compatible : set as "ti,pcm5102a"
8
9	Examples:
10
11	pcm5102a: pcm5102a {
12	compatible = "ti,pcm5102a";
13	};

Documentation/devicetree/bindings/sound/qcom,lpass-rx-macro.yaml+19−0

@@ -14,12 +14,14 @@ properties: · 13 unmodified lines
14	oneOf:	14	oneOf:
15	- enum:	15	- enum:
16	- qcom,sc7280-lpass-rx-macro	16	- qcom,sc7280-lpass-rx-macro
		17	- qcom,sm6115-lpass-rx-macro
17	- qcom,sm8250-lpass-rx-macro	18	- qcom,sm8250-lpass-rx-macro
18	- qcom,sm8450-lpass-rx-macro	19	- qcom,sm8450-lpass-rx-macro
19	- qcom,sm8550-lpass-rx-macro	20	- qcom,sm8550-lpass-rx-macro
20	- qcom,sc8280xp-lpass-rx-macro	21	- qcom,sc8280xp-lpass-rx-macro
21	- items:	22	- items:
22	- enum:	23	- enum:
		24	- qcom,kaanapali-lpass-rx-macro
23	- qcom,sm8650-lpass-rx-macro	25	- qcom,sm8650-lpass-rx-macro
24	- qcom,sm8750-lpass-rx-macro	26	- qcom,sm8750-lpass-rx-macro
25	- qcom,x1e80100-lpass-rx-macro	27	- qcom,x1e80100-lpass-rx-macro
@@ -80,6 +82,23 @@ allOf: · 54 unmodified lines
80	- const: npl	82	- const: npl
81	- const: fsgen	83	- const: fsgen
82		84
		85	- if:
		86	properties:
		87	compatible:
		88	enum:
		89	- qcom,sm6115-lpass-rx-macro
		90	then:
		91	properties:
		92	clocks:
		93	minItems: 4
		94	maxItems: 4
		95	clock-names:
		96	items:
		97	- const: mclk
		98	- const: npl
		99	- const: dcodec
		100	- const: fsgen
		101
83	- if:	102	- if:
84	properties:	103	properties:
85	compatible:	104	compatible:

Documentation/devicetree/bindings/sound/qcom,lpass-tx-macro.yaml+1−0

@@ -21,6 +21,7 @@ properties: · 20 unmodified lines
21	- qcom,sc8280xp-lpass-tx-macro	21	- qcom,sc8280xp-lpass-tx-macro
22	- items:	22	- items:
23	- enum:	23	- enum:
		24	- qcom,kaanapali-lpass-tx-macro
24	- qcom,sm8650-lpass-tx-macro	25	- qcom,sm8650-lpass-tx-macro
25	- qcom,sm8750-lpass-tx-macro	26	- qcom,sm8750-lpass-tx-macro
26	- qcom,x1e80100-lpass-tx-macro	27	- qcom,x1e80100-lpass-tx-macro

Documentation/devicetree/bindings/sound/qcom,lpass-va-macro.yaml+36−14

@@ -14,6 +14,7 @@ properties: · 13 unmodified lines
14	oneOf:	14	oneOf:
15	- enum:	15	- enum:
16	- qcom,sc7280-lpass-va-macro	16	- qcom,sc7280-lpass-va-macro
		17	- qcom,sm6115-lpass-va-macro
17	- qcom,sm8250-lpass-va-macro	18	- qcom,sm8250-lpass-va-macro
18	- qcom,sm8450-lpass-va-macro	19	- qcom,sm8450-lpass-va-macro
19	- qcom,sm8550-lpass-va-macro	20	- qcom,sm8550-lpass-va-macro
@@ -21,6 +22,7 @@ properties: · 1 unmodified line
21	- items:	22	- items:
22	- enum:	23	- enum:
23	- qcom,glymur-lpass-va-macro	24	- qcom,glymur-lpass-va-macro
		25	- qcom,kaanapali-lpass-va-macro
24	- qcom,sm8650-lpass-va-macro	26	- qcom,sm8650-lpass-va-macro
25	- qcom,sm8750-lpass-va-macro	27	- qcom,sm8750-lpass-va-macro
26	- qcom,x1e80100-lpass-va-macro	28	- qcom,x1e80100-lpass-va-macro
@@ -41,11 +43,7 @@ properties: · 14 unmodified lines
41		43
42	clock-names:	44	clock-names:
43	minItems: 1	45	minItems: 1
44	items:	46	maxItems: 4
45	- const: mclk
46	- const: macro
47	- const: dcodec
48	- const: npl
49		47
50	clock-output-names:	48	clock-output-names:
51	maxItems: 1	49	maxItems: 1
@@ -90,29 +88,48 @@ allOf: · 38 unmodified lines
90	clocks:	88	clocks:
91	maxItems: 1	89	maxItems: 1
92	clock-names:	90	clock-names:
93	maxItems: 1	91	items:
		92	- const: mclk
94	else:	93	else:
95	properties:	94	properties:
96	clocks:	95	clocks:
97	minItems: 3	96	minItems: 3
98	maxItems: 3	97	maxItems: 3
99	clock-names:	98	clock-names:
100	minItems: 3	99	items:
101	maxItems: 3	100	- const: mclk
102		101	- const: macro
		102	- const: dcodec
103	- if:	103	- if:
104	properties:	104	properties:
105	compatible:	105	compatible:
106	contains:	106	contains:
107	const: qcom,sm8250-lpass-va-macro	107	const: qcom,sm6115-lpass-va-macro
108	then:	108	then:
109	properties:	109	properties:
110	clocks:	110	clocks:
111	minItems: 3	111	minItems: 3
112	maxItems: 3	112	maxItems: 3
113	clock-names:	113	clock-names:
		114	items:
		115	- const: mclk
		116	- const: dcodec
		117	- const: npl
		118	- if:
		119	properties:
		120	compatible:
		121	contains:
		122	const: qcom,sm8250-lpass-va-macro
		123	then:
		124	properties:
		125	clocks:
114	minItems: 3	126	minItems: 3
115	maxItems: 3	127	maxItems: 3
		128	clock-names:
		129	items:
		130	- const: mclk
		131	- const: macro
		132	- const: dcodec
116		133
117	- if:	134	- if:
118	properties:	135	properties:
@@ -127,8 +144,11 @@ allOf: · 8 unmodified lines
127	minItems: 4	144	minItems: 4
128	maxItems: 4	145	maxItems: 4
129	clock-names:	146	clock-names:
130	minItems: 4	147	items:
131	maxItems: 4	148	- const: mclk
		149	- const: macro
		150	- const: dcodec
		151	- const: npl
132		152
133	- if:	153	- if:
134	properties:	154	properties:
@@ -142,8 +162,10 @@ allOf: · 7 unmodified lines
142	minItems: 3	162	minItems: 3
143	maxItems: 3	163	maxItems: 3
144	clock-names:	164	clock-names:
145	minItems: 3	165	items:
146	maxItems: 3	166	- const: mclk
		167	- const: macro
		168	- const: dcodec
147		169
148	unevaluatedProperties: false	170	unevaluatedProperties: false
149		171

Documentation/devicetree/bindings/sound/qcom,lpass-wsa-macro.yaml+1−0

@@ -21,6 +21,7 @@ properties: · 20 unmodified lines
21	- items:	21	- items:
22	- enum:	22	- enum:
23	- qcom,glymur-lpass-wsa-macro	23	- qcom,glymur-lpass-wsa-macro
		24	- qcom,kaanapali-lpass-wsa-macro
24	- qcom,sm8650-lpass-wsa-macro	25	- qcom,sm8650-lpass-wsa-macro
25	- qcom,sm8750-lpass-wsa-macro	26	- qcom,sm8750-lpass-wsa-macro
26	- qcom,x1e80100-lpass-wsa-macro	27	- qcom,x1e80100-lpass-wsa-macro

Documentation/devicetree/bindings/sound/qcom,sm8250.yaml+2−0

           - const: qcom,sdm845-sndcard
       - items:
           - enum:
+              - qcom,kaanapali-sndcard
               - qcom,sm8550-sndcard
               - qcom,sm8650-sndcard
               - qcom,sm8750-sndcard
           - qcom,qcs8275-sndcard
           - qcom,qcs9075-sndcard
           - qcom,qcs9100-sndcard
+          - qcom,qrb2210-sndcard
           - qcom,qrb4210-rb2-sndcard
           - qcom,qrb5165-rb5-sndcard
           - qcom,sc7180-qdsp6-sndcard

Documentation/devicetree/bindings/sound/qcom,wcd934x.yaml+1−1

@@ -132,7 +132,7 @@ properties: · 131 unmodified lines
132	$ref: /schemas/gpio/qcom,wcd934x-gpio.yaml#	132	$ref: /schemas/gpio/qcom,wcd934x-gpio.yaml#
133		133
134	patternProperties:	134	patternProperties:
135	"^.*@[0-9a-f]+$":	135	"@[0-9a-f]+$":
136	type: object	136	type: object
137	additionalProperties: true	137	additionalProperties: true
138	description: \|	138	description: \|

Documentation/devicetree/bindings/sound/spacemit,k1-i2s.yaml+87−0

@@ -0,0 +1,87 @@
	1	# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
	2	%YAML 1.2
	3	---
	4	$id: http://devicetree.org/schemas/sound/spacemit,k1-i2s.yaml#
	5	$schema: http://devicetree.org/meta-schemas/core.yaml#
	6
	7	title: K1 I2S controller
	8
	9	description:
	10	The I2S bus (Inter-IC sound bus) is a serial link for digital
	11	audio data transfer between devices in the system.
	12
	13	maintainers:
	14	- Troy Mitchell <troy.mitchell@linux.spacemit.com>
	15
	16	allOf:
	17	- $ref: dai-common.yaml#
	18
	19	properties:
	20	compatible:
	21	const: spacemit,k1-i2s
	22
	23	reg:
	24	maxItems: 1
	25
	26	clocks:
	27	items:
	28	- description: clock for I2S sysclk
	29	- description: clock for I2S bclk
	30	- description: clock for I2S bus
	31	- description: clock for I2S controller
	32
	33	clock-names:
	34	items:
	35	- const: sysclk
	36	- const: bclk
	37	- const: bus
	38	- const: func
	39
	40	dmas:
	41	minItems: 1
	42	maxItems: 2
	43
	44	dma-names:
	45	minItems: 1
	46	items:
	47	- const: tx
	48	- const: rx
	49
	50	resets:
	51	maxItems: 1
	52
	53	port:
	54	$ref: audio-graph-port.yaml#
	55	unevaluatedProperties: false
	56
	57	"#sound-dai-cells":
	58	const: 0
	59
	60	required:
	61	- compatible
	62	- reg
	63	- clocks
	64	- clock-names
	65	- dmas
	66	- dma-names
	67	- resets
	68	- "#sound-dai-cells"
	69
	70	unevaluatedProperties: false
	71
	72	examples:
	73	- \|
	74	#include <dt-bindings/clock/spacemit,k1-syscon.h>
	75	i2s@d4026000 {
	76	compatible = "spacemit,k1-i2s";
	77	reg = <0xd4026000 0x30>;
	78	clocks = <&syscon_mpmu CLK_I2S_SYSCLK>,
	79	<&syscon_mpmu CLK_I2S_BCLK>,
	80	<&syscon_apbc CLK_SSPA0_BUS>,
	81	<&syscon_apbc CLK_SSPA0>;
	82	clock-names = "sysclk", "bclk", "bus", "func";
	83	dmas = <&pdma0 21>, <&pdma0 22>;
	84	dma-names = "tx", "rx";
	85	resets = <&syscon_apbc RESET_SSPA0>;
	86	#sound-dai-cells = <0>;
	87	};

Documentation/devicetree/bindings/sound/ti,pcm1862.yaml+76−0

@@ -0,0 +1,76 @@
	1	# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
	2	%YAML 1.2
	3	---
	4	$id: http://devicetree.org/schemas/sound/ti,pcm1862.yaml#
	5	$schema: http://devicetree.org/meta-schemas/core.yaml#
	6
	7	title: Texas Instruments PCM186x Universal Audio ADC
	8
	9	maintainers:
	10	- Ranganath V N <vnranganath.20@gmail.com>
	11
	12	description: \|
	13	The Texas Instruments PCM186x family are multi-channel audio ADCs
	14	that support both I2C and SPI control interfaces, selected by
	15	pin strapping. These devices include on-chip programmable gain
	16	amplifiers and support differential or single-ended analog inputs.
	17
	18	CODEC input pins:
	19	* VINL1
	20	* VINR1
	21	* VINL2
	22	* VINR2
	23	* VINL3
	24	* VINR3
	25	* VINL4
	26	* VINR4
	27
	28	The pins can be used in referring sound node's audio-routing property.
	29
	30	allOf:
	31	- $ref: dai-common.yaml#
	32
	33	properties:
	34	compatible:
	35	enum:
	36	- ti,pcm1862
	37	- ti,pcm1863
	38	- ti,pcm1864
	39	- ti,pcm1865
	40
	41	reg:
	42	maxItems: 1
	43
	44	avdd-supply: true
	45
	46	dvdd-supply: true
	47
	48	iovdd-supply: true
	49
	50	'#sound-dai-cells':
	51	const: 0
	52
	53	required:
	54	- compatible
	55	- reg
	56	- avdd-supply
	57	- dvdd-supply
	58	- iovdd-supply
	59
	60	unevaluatedProperties: false
	61
	62	examples:
	63	- \|
	64	i2c {
	65	#address-cells = <1>;
	66	#size-cells = <0>;
	67
	68	audio-codec@4a {
	69	compatible = "ti,pcm1865";
	70	reg = <0x4a>;
	71
	72	avdd-supply = <&reg_3v3_analog>;
	73	dvdd-supply = <&reg_3v3>;
	74	iovdd-supply = <&reg_1v8>;
	75	};
	76	};

Documentation/devicetree/bindings/sound/ti,tas2781.yaml+54−4

   Instruments Smart Amp speaker protection algorithm. The
   integrated speaker voltage and current sense provides for real time
   monitoring of loudspeaker behavior.
-  The TAS5802/TAS5815/TAS5825/TAS5827/TAS5828 is a stereo, digital input
+  The TAS5802/TAS5815/TAS5822/TAS5825/TAS5827/TAS5828 is a stereo,
-  Class-D audio amplifier optimized for efficiently driving high peak
+  digital input Class-D audio amplifier optimized for efficiently driving
-  power into small loudspeakers. An integrated on-chip DSP supports
+  high peak power into small loudspeakers. An integrated on-chip DSP
-  Texas Instruments Smart Amp speaker protection algorithm.
+  supports Texas Instruments Smart Amp speaker protection algorithm.
   Specifications about the audio amplifier can be found at:
     https://www.ti.com/lit/gpn/tas2120
     https://www.ti.com/lit/gpn/tas2320
     https://www.ti.com/lit/gpn/tas2563
     https://www.ti.com/lit/gpn/tas2572
+    https://www.ti.com/lit/gpn/tas2574
     https://www.ti.com/lit/gpn/tas2781
+    https://www.ti.com/lit/gpn/tas5806m
+    https://www.ti.com/lit/gpn/tas5806md
     https://www.ti.com/lit/gpn/tas5815
+    https://www.ti.com/lit/gpn/tas5822m
     https://www.ti.com/lit/gpn/tas5825m
     https://www.ti.com/lit/gpn/tas5827
     https://www.ti.com/lit/gpn/tas5828m
+    https://www.ti.com/lit/gpn/tas5830
 properties:
   compatible:
       ti,tas2563: 6.1-W Boosted Class-D Audio Amplifier With Integrated
       DSP and IV Sense, 16/20/24/32bit stereo I2S or multichannel TDM.
+      ti,tas2568: 5.3-W Digital Input Smart Amp with I/V Sense and Integrated
+      10.75-V Class-H Boost
       ti,tas2570: 5.8-W Digital Input smart amp with I/V sense and integrated
       11-V Class-H Boost
       ti,tas2572: 6.6-W Digital Input smart amp with I/V sense and integrated
       13-V Class-H Boost
+      ti,tas2574: 8.5-W Digital Input smart amp with I/V sense and integrated
+      15-V Class-H Boost
       ti,tas2781: 24-V Class-D Amplifier with Real Time Integrated Speaker
       Protection and Audio Processing, 16/20/24/32bit stereo I2S or
       multichannel TDM.
       Audio Amplifier with 96-Khz Extended Processing and Low Idle Power
       Dissipation.
+      ti,tas5806m: 23-W, Inductor-Less, Digital Input, Stereo, Closed-Loop
+      Class-D Audio Amplifier with Enhanced Processing and Low Power
+      Dissipation.
+      ti,tas5806md: 23-W, Inductor-Less, Digital Input, Stereo, Closed-Loop
+      Class-D Audio Amplifier with Enhanced Processing and DirectPath(TM)
+      HP Driver
       ti,tas5815: 30-W, Digital Input, Stereo, Closed-loop Class-D Audio
       Amplifier with 96 kHz Enhanced Processing
+      ti,tas5822: 35-W, Digital Input, Stereo, Closed-Loop Class-D Audio
+      Amplifier with 96 kHz Enhanced Processing
       ti,tas5825: 38-W Stereo, Inductor-Less, Digital Input, Closed-Loop 4.5V
       to 26.4V Class-D Audio Amplifier with 192-kHz Extended Audio Processing.
       ti,tas5828: 50-W Stereo, Digital Input, High Efficiency Closed-Loop
       Class-D Amplifier with Hybrid-Pro Algorithm
+      ti,tas5830: 65-W Stereo, Digital Input, High Efficiency Closed-Loop
+      Class-D Amplifier with Class-H Algorithm
     oneOf:
       - items:
           - enum:
               - ti,tas2120
               - ti,tas2320
               - ti,tas2563
+              - ti,tas2568
               - ti,tas2570
               - ti,tas2572
+              - ti,tas2574
               - ti,tas5802
+              - ti,tas5806m
+              - ti,tas5806md
               - ti,tas5815
+              - ti,tas5822
               - ti,tas5825
               - ti,tas5827
               - ti,tas5828
+              - ti,tas5830
           - const: ti,tas2781
       - enum:
           - ti,tas2781
               - ti,tas2118
               - ti,tas2120
               - ti,tas2320
+              - ti,tas2568
+              - ti,tas2574
     then:
       properties:
         reg:
             minimum: 0x54
             maximum: 0x57
+  - if:
+      properties:
+        compatible:
+          contains:
+            enum:
+              - ti,tas5806m
+              - ti,tas5806md
+              - ti,tas5822
+    then:
+      properties:
+        reg:
+          maxItems: 4
+          items:
+            minimum: 0x2c
+            maximum: 0x2f
   - if:
       properties:
         compatible:
             enum:
               - ti,tas5827
               - ti,tas5828
+              - ti,tas5830
     then:
       properties:
         reg:

Documentation/devicetree/bindings/sound/trivial-codec.yaml+79−0

@@ -0,0 +1,79 @@
	1	# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
	2	%YAML 1.2
	3	---
	4	$id: http://devicetree.org/schemas/sound/trivial-codec.yaml#
	5	$schema: http://devicetree.org/meta-schemas/core.yaml#
	6
	7	title: Trivial Audio Codec
	8
	9	maintainers:
	10	- Rob Herring <robh@kernel.org>
	11
	12	allOf:
	13	- $ref: dai-common.yaml#
	14
	15	properties:
	16	compatible:
	17	enum:
	18	# Analog Devices SSM2602 I2S audio CODEC devices
	19	- adi,ssm2602
	20	- adi,ssm2603
	21	- adi,ssm2604
	22	- adi,ssm3515
	23	# Cirrus Logic CS4265 audio DAC
	24	- cirrus,cs4265
	25	- cirrus,cs4341a
	26	- cirrus,cs4349
	27	- dlg,da9055-codec
	28	# Nuvoton Technology Corporation NAU85L40 Audio CODEC
	29	- nuvoton,nau8540
	30	- nuvoton,nau8810
	31	- nuvoton,nau8812
	32	- nuvoton,nau8814
	33	# NXP TFA9879 class-D audio amplifier
	34	- nxp,tfa9879
	35	- nxp,uda1342
	36	- sdw3019f836300
	37	- ti,pcm1789
	38	- ti,pcm1792a
	39	- ti,pcm5102a
	40	- wlf,wm8510
	41	- wlf,wm8523
	42	- wlf,wm8580
	43	- wlf,wm8581
	44	- wlf,wm8711
	45	- wlf,wm8728
	46	- wlf,wm8737
	47	- wlf,wm8750
	48	- wlf,wm8753
	49	- wlf,wm8770
	50	- wlf,wm8776
	51	- wlf,wm8961
	52	- wlf,wm8974
	53	- wlf,wm8987
	54
	55	reg:
	56	maxItems: 1
	57
	58	"#sound-dai-cells":
	59	const: 0
	60
	61	reset-gpios:
	62	maxItems: 1
	63
	64	required:
	65	- compatible
	66	- reg
	67
	68	unevaluatedProperties: false
	69
	70	examples:
	71	- \|
	72	i2c {
	73	#address-cells = <1>;
	74	#size-cells = <0>;
	75	codec@1a {
	76	compatible = "wlf,wm8523";
	77	reg = <0x1a>;
	78	};
	79	};

Documentation/devicetree/bindings/sound/wlf,wm8510.yaml+0−41

@@ -1,41 +0,0 @@
1	# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2	%YAML 1.2
3	---
4	$id: http://devicetree.org/schemas/sound/wlf,wm8510.yaml#
5	$schema: http://devicetree.org/meta-schemas/core.yaml#
6
7	title: WM8510 audio CODEC
8
9	maintainers:
10	- patches@opensource.cirrus.com
11
12	allOf:
13	- $ref: dai-common.yaml#
14
15	properties:
16	compatible:
17	const: wlf,wm8510
18
19	reg:
20	maxItems: 1
21
22	"#sound-dai-cells":
23	const: 0
24
25	required:
26	- compatible
27	- reg
28
29	unevaluatedProperties: false
30
31	examples:
32	- \|
33	i2c {
34	#address-cells = <1>;
35	#size-cells = <0>;
36
37	codec@1a {
38	compatible = "wlf,wm8510";
39	reg = <0x1a>;
40	};
41	};

Documentation/devicetree/bindings/sound/wlf,wm8523.yaml+0−40

@@ -1,40 +0,0 @@
1	# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2	%YAML 1.2
3	---
4	$id: http://devicetree.org/schemas/sound/wlf,wm8523.yaml#
5	$schema: http://devicetree.org/meta-schemas/core.yaml#
6
7	title: WM8523 audio CODEC
8
9	maintainers:
10	- patches@opensource.cirrus.com
11
12	allOf:
13	- $ref: dai-common.yaml#
14
15	properties:
16	compatible:
17	const: wlf,wm8523
18
19	reg:
20	maxItems: 1
21
22	"#sound-dai-cells":
23	const: 0
24
25	required:
26	- compatible
27	- reg
28
29	unevaluatedProperties: false
30
31	examples:
32	- \|
33	i2c {
34	#address-cells = <1>;
35	#size-cells = <0>;
36	codec@1a {
37	compatible = "wlf,wm8523";
38	reg = <0x1a>;
39	};
40	};

Documentation/devicetree/bindings/sound/wlf,wm8580.yaml+0−42

@@ -1,42 +0,0 @@
1	# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2	%YAML 1.2
3	---
4	$id: http://devicetree.org/schemas/sound/wlf,wm8580.yaml#
5	$schema: http://devicetree.org/meta-schemas/core.yaml#
6
7	title: WM8580 and WM8581 audio CODEC
8
9	maintainers:
10	- patches@opensource.cirrus.com
11
12	allOf:
13	- $ref: dai-common.yaml#
14
15	properties:
16	compatible:
17	enum:
18	- wlf,wm8580
19	- wlf,wm8581
20
21	reg:
22	maxItems: 1
23
24	"#sound-dai-cells":
25	const: 0
26
27	required:
28	- compatible
29	- reg
30
31	unevaluatedProperties: false
32
33	examples:
34	- \|
35	i2c {
36	#address-cells = <1>;
37	#size-cells = <0>;
38	codec@1a {
39	compatible = "wlf,wm8580";
40	reg = <0x1a>;
41	};
42	};

Documentation/devicetree/bindings/sound/wlf,wm8711.yaml+0−40

@@ -1,40 +0,0 @@
1	# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2	%YAML 1.2
3	---
4	$id: http://devicetree.org/schemas/sound/wlf,wm8711.yaml#
5	$schema: http://devicetree.org/meta-schemas/core.yaml#
6
7	title: WM8711 audio CODEC
8
9	maintainers:
10	- patches@opensource.cirrus.com
11
12	allOf:
13	- $ref: dai-common.yaml#
14
15	properties:
16	compatible:
17	const: wlf,wm8711
18
19	reg:
20	maxItems: 1
21
22	"#sound-dai-cells":
23	const: 0
24
25	required:
26	- compatible
27	- reg
28
29	unevaluatedProperties: false
30
31	examples:
32	- \|
33	i2c {
34	#address-cells = <1>;
35	#size-cells = <0>;
36	codec@1a {
37	compatible = "wlf,wm8711";
38	reg = <0x1a>;
39	};
40	};

Documentation/devicetree/bindings/sound/wlf,wm8728.yaml+0−40

@@ -1,40 +0,0 @@
1	# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2	%YAML 1.2
3	---
4	$id: http://devicetree.org/schemas/sound/wlf,wm8728.yaml#
5	$schema: http://devicetree.org/meta-schemas/core.yaml#
6
7	title: WM8728 audio CODEC
8
9	maintainers:
10	- patches@opensource.cirrus.com
11
12	allOf:
13	- $ref: dai-common.yaml#
14
15	properties:
16	compatible:
17	const: wlf,wm8728
18
19	reg:
20	maxItems: 1
21
22	"#sound-dai-cells":
23	const: 0
24
25	required:
26	- compatible
27	- reg
28
29	unevaluatedProperties: false
30
31	examples:
32	- \|
33	i2c {
34	#address-cells = <1>;
35	#size-cells = <0>;
36	codec@1a {
37	compatible = "wlf,wm8728";
38	reg = <0x1a>;
39	};
40	};

Documentation/devicetree/bindings/sound/wlf,wm8737.yaml+0−40

@@ -1,40 +0,0 @@
1	# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2	%YAML 1.2
3	---
4	$id: http://devicetree.org/schemas/sound/wlf,wm8737.yaml#
5	$schema: http://devicetree.org/meta-schemas/core.yaml#
6
7	title: WM8737 audio CODEC
8
9	maintainers:
10	- patches@opensource.cirrus.com
11
12	allOf:
13	- $ref: dai-common.yaml#
14
15	properties:
16	compatible:
17	const: wlf,wm8737
18
19	reg:
20	maxItems: 1
21
22	"#sound-dai-cells":
23	const: 0
24
25	required:
26	- compatible
27	- reg
28
29	unevaluatedProperties: false
30
31	examples:
32	- \|
33	i2c {
34	#address-cells = <1>;
35	#size-cells = <0>;
36	codec@1a {
37	compatible = "wlf,wm8737";
38	reg = <0x1a>;
39	};
40	};

Documentation/devicetree/bindings/sound/wlf,wm8750.yaml+0−42

@@ -1,42 +0,0 @@
1	# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2	%YAML 1.2
3	---
4	$id: http://devicetree.org/schemas/sound/wlf,wm8750.yaml#
5	$schema: http://devicetree.org/meta-schemas/core.yaml#
6
7	title: WM8750 and WM8987 audio CODECs
8
9	description: \|
10	These devices support both I2C and SPI (configured with pin strapping
11	on the board).
12
13	maintainers:
14	- Mark Brown <broonie@kernel.org>
15
16	properties:
17	compatible:
18	enum:
19	- wlf,wm8750
20	- wlf,wm8987
21
22	reg:
23	description:
24	The I2C address of the device for I2C, the chip select number for SPI
25	maxItems: 1
26
27	additionalProperties: false
28
29	required:
30	- reg
31
32	examples:
33	- \|
34	i2c {
35	#address-cells = <1>;
36	#size-cells = <0>;
37
38	codec@1a {
39	compatible = "wlf,wm8750";
40	reg = <0x1a>;
41	};
42	};

Documentation/devicetree/bindings/sound/wlf,wm8753.yaml+0−62

@@ -1,62 +0,0 @@
1	# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2	%YAML 1.2
3	---
4	$id: http://devicetree.org/schemas/sound/wlf,wm8753.yaml#
5	$schema: http://devicetree.org/meta-schemas/core.yaml#
6
7	title: WM8753 audio CODEC
8
9	description: \|
10	Pins on the device (for linking into audio routes):
11	* LOUT1
12	* LOUT2
13	* ROUT1
14	* ROUT2
15	* MONO1
16	* MONO2
17	* OUT3
18	* OUT4
19	* LINE1
20	* LINE2
21	* RXP
22	* RXN
23	* ACIN
24	* ACOP
25	* MIC1N
26	* MIC1
27	* MIC2N
28	* MIC2
29	* Mic Bias
30
31	maintainers:
32	- patches@opensource.cirrus.com
33
34	allOf:
35	- $ref: dai-common.yaml#
36
37	properties:
38	compatible:
39	const: wlf,wm8753
40
41	reg:
42	maxItems: 1
43
44	"#sound-dai-cells":
45	const: 0
46
47	required:
48	- compatible
49	- reg
50
51	unevaluatedProperties: false
52
53	examples:
54	- \|
55	i2c {
56	#address-cells = <1>;
57	#size-cells = <0>;
58	codec@1a {
59	compatible = "wlf,wm8753";
60	reg = <0x1a>;
61	};
62	};

Documentation/devicetree/bindings/sound/wlf,wm8776.yaml+0−41

@@ -1,41 +0,0 @@
1	# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2	%YAML 1.2
3	---
4	$id: http://devicetree.org/schemas/sound/wlf,wm8776.yaml#
5	$schema: http://devicetree.org/meta-schemas/core.yaml#
6
7	title: WM8776 audio CODEC
8
9	maintainers:
10	- patches@opensource.cirrus.com
11
12	allOf:
13	- $ref: dai-common.yaml#
14
15	properties:
16	compatible:
17	const: wlf,wm8776
18
19	reg:
20	maxItems: 1
21
22	"#sound-dai-cells":
23	const: 0
24
25	required:
26	- compatible
27	- reg
28
29	unevaluatedProperties: false
30
31	examples:
32	- \|
33	i2c {
34	#address-cells = <1>;
35	#size-cells = <0>;
36
37	codec@1a {
38	compatible = "wlf,wm8776";
39	reg = <0x1a>;
40	};
41	};

Documentation/devicetree/bindings/sound/wlf,wm8961.yaml+0−43

@@ -1,43 +0,0 @@
1	# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2	%YAML 1.2
3	---
4	$id: http://devicetree.org/schemas/sound/wlf,wm8961.yaml#
5	$schema: http://devicetree.org/meta-schemas/core.yaml#
6
7	title: Wolfson WM8961 Ultra-Low Power Stereo CODEC
8
9	maintainers:
10	- patches@opensource.cirrus.com
11
12	allOf:
13	- $ref: dai-common.yaml#
14
15	properties:
16	compatible:
17	const: wlf,wm8961
18
19	reg:
20	maxItems: 1
21
22	'#sound-dai-cells':
23	const: 0
24
25	required:
26	- compatible
27	- reg
28	- '#sound-dai-cells'
29
30	unevaluatedProperties: false
31
32	examples:
33	- \|
34	i2c {
35	#address-cells = <1>;
36	#size-cells = <0>;
37
38	wm8961: codec@4a {
39	compatible = "wlf,wm8961";
40	reg = <0x4a>;
41	#sound-dai-cells = <0>;
42	};
43	};

Documentation/devicetree/bindings/sound/wlf,wm8974.yaml+0−41

@@ -1,41 +0,0 @@
1	# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2	%YAML 1.2
3	---
4	$id: http://devicetree.org/schemas/sound/wlf,wm8974.yaml#
5	$schema: http://devicetree.org/meta-schemas/core.yaml#
6
7	title: WM8974 audio CODEC
8
9	maintainers:
10	- patches@opensource.cirrus.com
11
12	allOf:
13	- $ref: dai-common.yaml#
14
15	properties:
16	compatible:
17	const: wlf,wm8974
18
19	reg:
20	maxItems: 1
21
22	"#sound-dai-cells":
23	const: 0
24
25	required:
26	- compatible
27	- reg
28
29	unevaluatedProperties: false
30
31	examples:
32	- \|
33	i2c {
34	#address-cells = <1>;
35	#size-cells = <0>;
36
37	codec@1a {
38	compatible = "wlf,wm8974";
39	reg = <0x1a>;
40	};
41	};

Documentation/devicetree/bindings/sound/wm8770.txt+0−16

@@ -1,16 +0,0 @@
1	WM8770 audio CODEC
2
3	This device supports SPI.
4
5	Required properties:
6
7	- compatible : "wlf,wm8770"
8
9	- reg : the chip select number.
10
11	Example:
12
13	wm8770: codec@1 {
14	compatible = "wlf,wm8770";
15	reg = <1>;
16	};

MAINTAINERS+5−3

@@ -1758,6 +1758,7 @@ S: Supported · 1757 unmodified lines
1758	W: http://wiki.analog.com/	1758	W: http://wiki.analog.com/
1759	W: https://ez.analog.com/linux-software-drivers	1759	W: https://ez.analog.com/linux-software-drivers
1760	F: Documentation/devicetree/bindings/sound/adi,*	1760	F: Documentation/devicetree/bindings/sound/adi,*
		1761	F: Documentation/devicetree/bindings/sound/trivial-codec.yaml
1761	F: sound/soc/codecs/ad1*	1762	F: sound/soc/codecs/ad1*
1762	F: sound/soc/codecs/ad7*	1763	F: sound/soc/codecs/ad7*
1763	F: sound/soc/codecs/adau*	1764	F: sound/soc/codecs/adau*
@@ -2421,9 +2422,9 @@ M: Martin Povišer <povik+lin@cutebit.org> · 657 unmodified lines
2421	L: asahi@lists.linux.dev	2422	L: asahi@lists.linux.dev
2422	L: linux-sound@vger.kernel.org	2423	L: linux-sound@vger.kernel.org
2423	S: Maintained	2424	S: Maintained
2424	F: Documentation/devicetree/bindings/sound/adi,ssm3515.yaml
2425	F: Documentation/devicetree/bindings/sound/cirrus,cs42l84.yaml
2426	F: Documentation/devicetree/bindings/sound/apple,*	2425	F: Documentation/devicetree/bindings/sound/apple,*
		2426	F: Documentation/devicetree/bindings/sound/cirrus,cs42l84.yaml
		2427	F: Documentation/devicetree/bindings/sound/trivial-codec.yaml
2427	F: sound/soc/apple/*	2428	F: sound/soc/apple/*
2428	F: sound/soc/codecs/cs42l83-i2c.c	2429	F: sound/soc/codecs/cs42l83-i2c.c
2429	F: sound/soc/codecs/cs42l84.*	2430	F: sound/soc/codecs/cs42l84.*
@@ -18749,7 +18750,7 @@ NXP TFA9879 DRIVER · 16319 unmodified lines
18749	M: Peter Rosin <peda@axentia.se>	18750	M: Peter Rosin <peda@axentia.se>
18750	L: linux-sound@vger.kernel.org	18751	L: linux-sound@vger.kernel.org
18751	S: Maintained	18752	S: Maintained
18752	F: Documentation/devicetree/bindings/sound/nxp,tfa9879.yaml	18753	F: Documentation/devicetree/bindings/sound/trivial-codec.yaml
18753	F: sound/soc/codecs/tfa9879*	18754	F: sound/soc/codecs/tfa9879*
18754		18755
18755	NXP-NCI NFC DRIVER	18756	NXP-NCI NFC DRIVER
@@ -27799,6 +27800,7 @@ F: Documentation/devicetree/bindings/extcon/wlf,arizona.yaml · 9043 unmodified lines
27799	F: Documentation/devicetree/bindings/mfd/wlf,arizona.yaml	27800	F: Documentation/devicetree/bindings/mfd/wlf,arizona.yaml
27800	F: Documentation/devicetree/bindings/mfd/wm831x.txt	27801	F: Documentation/devicetree/bindings/mfd/wm831x.txt
27801	F: Documentation/devicetree/bindings/regulator/wlf,arizona.yaml	27802	F: Documentation/devicetree/bindings/regulator/wlf,arizona.yaml
		27803	F: Documentation/devicetree/bindings/sound/trivial-codec.yaml
27802	F: Documentation/devicetree/bindings/sound/wlf,*.yaml	27804	F: Documentation/devicetree/bindings/sound/wlf,*.yaml
27803	F: Documentation/devicetree/bindings/sound/wm*	27805	F: Documentation/devicetree/bindings/sound/wm*
27804	F: Documentation/hwmon/wm83??.rst	27806	F: Documentation/hwmon/wm83??.rst

drivers/base/regmap/regmap-sdw-mbq.c+12−11

 struct regmap_mbq_context {
 	struct device *dev;
+	struct sdw_slave *sdw;
 	struct regmap_sdw_mbq_cfg cfg;
 static int regmap_sdw_mbq_poll_busy(struct sdw_slave *slave, unsigned int reg,
 				    struct regmap_mbq_context *ctx)
 {
-	struct device *dev = &slave->dev;
+	struct device *dev = ctx->dev;
 	int val, ret = 0;
 	dev_dbg(dev, "Deferring transaction for 0x%x\n", reg);
 static int regmap_sdw_mbq_write(void *context, unsigned int reg, unsigned int val)
 {
 	struct regmap_mbq_context *ctx = context;
-	struct device *dev = ctx->dev;
+	struct sdw_slave *slave = ctx->sdw;
-	struct sdw_slave *slave = dev_to_sdw_dev(dev);
 	bool deferrable = regmap_sdw_mbq_deferrable(ctx, reg);
 	int mbq_size = regmap_sdw_mbq_size(ctx, reg);
 	int ret;
 static int regmap_sdw_mbq_read(void *context, unsigned int reg, unsigned int *val)
 {
 	struct regmap_mbq_context *ctx = context;
-	struct device *dev = ctx->dev;
+	struct sdw_slave *slave = ctx->sdw;
-	struct sdw_slave *slave = dev_to_sdw_dev(dev);
 	bool deferrable = regmap_sdw_mbq_deferrable(ctx, reg);
 	int mbq_size = regmap_sdw_mbq_size(ctx, reg);
 	int ret;
 static struct regmap_mbq_context *
 regmap_sdw_mbq_gen_context(struct device *dev,
+			   struct sdw_slave *sdw,
 			   const struct regmap_config *config,
 			   const struct regmap_sdw_mbq_cfg *mbq_config)
 {
 		return ERR_PTR(-ENOMEM);
 	ctx->dev = dev;
+	ctx->sdw = sdw;
 	if (mbq_config)
 		ctx->cfg = *mbq_config;
 	return ctx;
 }
-struct regmap *__regmap_init_sdw_mbq(struct sdw_slave *sdw,
+struct regmap *__regmap_init_sdw_mbq(struct device *dev, struct sdw_slave *sdw,
 				     const struct regmap_config *config,
 				     const struct regmap_sdw_mbq_cfg *mbq_config,
 				     struct lock_class_key *lock_key,
 	if (ret)
 		return ERR_PTR(ret);
-	ctx = regmap_sdw_mbq_gen_context(&sdw->dev, config, mbq_config);
+	ctx = regmap_sdw_mbq_gen_context(dev, sdw, config, mbq_config);
 	if (IS_ERR(ctx))
 		return ERR_CAST(ctx);
-	return __regmap_init(&sdw->dev, &regmap_sdw_mbq, ctx,
+	return __regmap_init(dev, &regmap_sdw_mbq, ctx,
 			     config, lock_key, lock_name);
 }
 EXPORT_SYMBOL_GPL(__regmap_init_sdw_mbq);
-struct regmap *__devm_regmap_init_sdw_mbq(struct sdw_slave *sdw,
+struct regmap *__devm_regmap_init_sdw_mbq(struct device *dev, struct sdw_slave *sdw,
 					  const struct regmap_config *config,
 					  const struct regmap_sdw_mbq_cfg *mbq_config,
 					  struct lock_class_key *lock_key,
 	if (ret)
 		return ERR_PTR(ret);
-	ctx = regmap_sdw_mbq_gen_context(&sdw->dev, config, mbq_config);
+	ctx = regmap_sdw_mbq_gen_context(dev, sdw, config, mbq_config);
 	if (IS_ERR(ctx))
 		return ERR_CAST(ctx);
-	return __devm_regmap_init(&sdw->dev, &regmap_sdw_mbq, ctx,
+	return __devm_regmap_init(dev, &regmap_sdw_mbq, ctx,
 				  config, lock_key, lock_name);
 }
 EXPORT_SYMBOL_GPL(__devm_regmap_init_sdw_mbq);

drivers/firmware/cirrus/cs_dsp.c+72−103

@@ -9,9 +9,11 @@ · 8 unmodified lines
9	* Cirrus Logic International Semiconductor Ltd.	9	* Cirrus Logic International Semiconductor Ltd.
10	*/	10	*/
11		11
		12	#include <linux/cleanup.h>
12	#include <linux/ctype.h>	13	#include <linux/ctype.h>
13	#include <linux/debugfs.h>	14	#include <linux/debugfs.h>
14	#include <linux/delay.h>	15	#include <linux/delay.h>
		16	#include <linux/math.h>
15	#include <linux/minmax.h>	17	#include <linux/minmax.h>
16	#include <linux/module.h>	18	#include <linux/module.h>
17	#include <linux/moduleparam.h>	19	#include <linux/moduleparam.h>
@@ -316,44 +318,6 @@ struct cs_dsp_alg_region_list_item { · 298 unmodified lines
316	struct cs_dsp_alg_region alg_region;	318	struct cs_dsp_alg_region alg_region;
317	};	319	};
318		320
319	struct cs_dsp_buf {
320	struct list_head list;
321	void *buf;
322	};
323
324	static struct cs_dsp_buf cs_dsp_buf_alloc(const void src, size_t len,
325	struct list_head *list)
326	{
327	struct cs_dsp_buf buf = kzalloc(sizeof(buf), GFP_KERNEL);
328
329	if (buf == NULL)
330	return NULL;
331
332	buf->buf = vmalloc(len);
333	if (!buf->buf) {
334	kfree(buf);
335	return NULL;
336	}
337	memcpy(buf->buf, src, len);
338
339	if (list)
340	list_add_tail(&buf->list, list);
341
342	return buf;
343	}
344
345	static void cs_dsp_buf_free(struct list_head *list)
346	{
347	while (!list_empty(list)) {
348	struct cs_dsp_buf *buf = list_first_entry(list,
349	struct cs_dsp_buf,
350	list);
351	list_del(&buf->list);
352	vfree(buf->buf);
353	kfree(buf);
354	}
355	}
356
357	/**	321	/**
358	* cs_dsp_mem_region_name() - Return a name string for a memory type	322	* cs_dsp_mem_region_name() - Return a name string for a memory type
359	* @type: the memory type to match	323	* @type: the memory type to match
@@ -388,18 +352,14 @@ EXPORT_SYMBOL_NS_GPL(cs_dsp_mem_region_name, "FW_CS_DSP"); · 28 unmodified lines
388	#ifdef CONFIG_DEBUG_FS	352	#ifdef CONFIG_DEBUG_FS
389	static void cs_dsp_debugfs_save_wmfwname(struct cs_dsp dsp, const char s)	353	static void cs_dsp_debugfs_save_wmfwname(struct cs_dsp dsp, const char s)
390	{	354	{
391	char *tmp = kasprintf(GFP_KERNEL, "%s\n", s);
392
393	kfree(dsp->wmfw_file_name);	355	kfree(dsp->wmfw_file_name);
394	dsp->wmfw_file_name = tmp;	356	dsp->wmfw_file_name = kstrdup(s, GFP_KERNEL);
395	}	357	}
396		358
397	static void cs_dsp_debugfs_save_binname(struct cs_dsp dsp, const char s)	359	static void cs_dsp_debugfs_save_binname(struct cs_dsp dsp, const char s)
398	{	360	{
399	char *tmp = kasprintf(GFP_KERNEL, "%s\n", s);
400
401	kfree(dsp->bin_file_name);	361	kfree(dsp->bin_file_name);
402	dsp->bin_file_name = tmp;	362	dsp->bin_file_name = kstrdup(s, GFP_KERNEL);
403	}	363	}
404		364
405	static void cs_dsp_debugfs_clear(struct cs_dsp *dsp)	365	static void cs_dsp_debugfs_clear(struct cs_dsp *dsp)
@@ -410,24 +370,33 @@ static void cs_dsp_debugfs_clear(struct cs_dsp *dsp) · 4 unmodified lines
410	dsp->bin_file_name = NULL;	370	dsp->bin_file_name = NULL;
411	}	371	}
412		372
		373	static ssize_t cs_dsp_debugfs_string_read(struct cs_dsp *dsp,
		374	char __user *user_buf,
		375	size_t count, loff_t *ppos,
		376	const char **pstr)
		377	{
		378	const char *str __free(kfree) = NULL;
		379
		380	scoped_guard(mutex, &dsp->pwr_lock) {
		381	if (!*pstr)
		382	return 0;
		383
		384	str = kasprintf(GFP_KERNEL, "%s\n", *pstr);
		385	if (!str)
		386	return -ENOMEM;
		387
		388	return simple_read_from_buffer(user_buf, count, ppos, str, strlen(str));
		389	}
		390	}
		391
413	static ssize_t cs_dsp_debugfs_wmfw_read(struct file *file,	392	static ssize_t cs_dsp_debugfs_wmfw_read(struct file *file,
414	char __user *user_buf,	393	char __user *user_buf,
415	size_t count, loff_t *ppos)	394	size_t count, loff_t *ppos)
416	{	395	{
417	struct cs_dsp *dsp = file->private_data;	396	struct cs_dsp *dsp = file->private_data;
418	ssize_t ret;
419
420	mutex_lock(&dsp->pwr_lock);
421		397
422	if (!dsp->wmfw_file_name \|\| !dsp->booted)	398	return cs_dsp_debugfs_string_read(dsp, user_buf, count, ppos,
423	ret = 0;	399	&dsp->wmfw_file_name);
424	else
425	ret = simple_read_from_buffer(user_buf, count, ppos,
426	dsp->wmfw_file_name,
427	strlen(dsp->wmfw_file_name));
428
429	mutex_unlock(&dsp->pwr_lock);
430	return ret;
431	}	400	}
432		401
433	static ssize_t cs_dsp_debugfs_bin_read(struct file *file,	402	static ssize_t cs_dsp_debugfs_bin_read(struct file *file,
@@ -435,19 +404,9 @@ static ssize_t cs_dsp_debugfs_bin_read(struct file *file, · 1 unmodified line
435	size_t count, loff_t *ppos)	404	size_t count, loff_t *ppos)
436	{	405	{
437	struct cs_dsp *dsp = file->private_data;	406	struct cs_dsp *dsp = file->private_data;
438	ssize_t ret;
439
440	mutex_lock(&dsp->pwr_lock);
441		407
442	if (!dsp->bin_file_name \|\| !dsp->booted)	408	return cs_dsp_debugfs_string_read(dsp, user_buf, count, ppos,
443	ret = 0;	409	&dsp->bin_file_name);
444	else
445	ret = simple_read_from_buffer(user_buf, count, ppos,
446	dsp->bin_file_name,
447	strlen(dsp->bin_file_name));
448
449	mutex_unlock(&dsp->pwr_lock);
450	return ret;
451	}	410	}
452		411
453	static const struct {	412	static const struct {
@@ -479,9 +438,11 @@ static int cs_dsp_debugfs_read_controls_show(struct seq_file s, void ignored) · 25 unmodified lines
479	struct cs_dsp_coeff_ctl *ctl;	438	struct cs_dsp_coeff_ctl *ctl;
480	unsigned int reg;	439	unsigned int reg;
481		440
		441	guard(mutex)(&dsp->pwr_lock);
		442
482	list_for_each_entry(ctl, &dsp->ctl_list, list) {	443	list_for_each_entry(ctl, &dsp->ctl_list, list) {
483	cs_dsp_coeff_base_reg(ctl, &reg, 0);	444	cs_dsp_coeff_base_reg(ctl, &reg, 0);
484	seq_printf(s, "%22.*s: %#8zx %s:%08x %#8x %s %#8x %#4x %c%c%c%c %s %s\n",	445	seq_printf(s, "%22.*s: %#8x %s:%08x %#8x %s %#8x %#4x %c%c%c%c %s %s\n",
485	ctl->subname_len, ctl->subname, ctl->len,	446	ctl->subname_len, ctl->subname, ctl->len,
486	cs_dsp_mem_region_name(ctl->alg_region.type),	447	cs_dsp_mem_region_name(ctl->alg_region.type),
487	ctl->offset, reg, ctl->fw_name, ctl->alg_region.alg, ctl->type,	448	ctl->offset, reg, ctl->fw_name, ctl->alg_region.alg, ctl->type,
@@ -1028,7 +989,7 @@ static void cs_dsp_signal_event_controls(struct cs_dsp *dsp, · 540 unmodified lines
1028		989
1029	static void cs_dsp_free_ctl_blk(struct cs_dsp_coeff_ctl *ctl)	990	static void cs_dsp_free_ctl_blk(struct cs_dsp_coeff_ctl *ctl)
1030	{	991	{
1031	kfree(ctl->cache);	992	kvfree(ctl->cache);
1032	kfree(ctl->subname);	993	kfree(ctl->subname);
1033	kfree(ctl);	994	kfree(ctl);
1034	}	995	}
@@ -1078,7 +1039,7 @@ static int cs_dsp_create_control(struct cs_dsp *dsp, · 43 unmodified lines
1078	ctl->type = type;	1039	ctl->type = type;
1079	ctl->offset = offset;	1040	ctl->offset = offset;
1080	ctl->len = len;	1041	ctl->len = len;
1081	ctl->cache = kzalloc(ctl->len, GFP_KERNEL);	1042	ctl->cache = kvzalloc(ctl->len, GFP_KERNEL);
1082	if (!ctl->cache) {	1043	if (!ctl->cache) {
1083	ret = -ENOMEM;	1044	ret = -ENOMEM;
1084	goto err_ctl_subname;	1045	goto err_ctl_subname;
@@ -1096,7 +1057,7 @@ static int cs_dsp_create_control(struct cs_dsp *dsp, · 11 unmodified lines
1096		1057
1097	err_list_del:	1058	err_list_del:
1098	list_del(&ctl->list);	1059	list_del(&ctl->list);
1099	kfree(ctl->cache);	1060	kvfree(ctl->cache);
1100	err_ctl_subname:	1061	err_ctl_subname:
1101	kfree(ctl->subname);	1062	kfree(ctl->subname);
1102	err_ctl:	1063	err_ctl:
@@ -1485,7 +1446,9 @@ static int cs_dsp_load(struct cs_dsp dsp, const struct firmware firmware, · 382 unmodified lines
1485	const struct wmfw_region *region;	1446	const struct wmfw_region *region;
1486	const struct cs_dsp_region *mem;	1447	const struct cs_dsp_region *mem;
1487	const char *region_name;	1448	const char *region_name;
1488	struct cs_dsp_buf *buf;	1449	u8 *buf __free(kfree) = NULL;
		1450	size_t buf_len = 0;
		1451	size_t region_len;
1489	unsigned int reg;	1452	unsigned int reg;
1490	int regions = 0;	1453	int regions = 0;
1491	int ret, offset, type;	1454	int ret, offset, type;
@@ -1605,23 +1568,23 @@ static int cs_dsp_load(struct cs_dsp dsp, const struct firmware firmware, · 113 unmodified lines
1605	region_name);	1568	region_name);
1606		1569
1607	if (reg) {	1570	if (reg) {
1608	buf = cs_dsp_buf_alloc(region->data,	1571	region_len = le32_to_cpu(region->len);
1609	le32_to_cpu(region->len),	1572	if (region_len > buf_len) {
1610	&buf_list);	1573	buf_len = round_up(region_len, PAGE_SIZE);
1611	if (!buf) {	1574	kfree(buf);
1612	cs_dsp_err(dsp, "Out of memory\n");	1575	buf = kmalloc(buf_len, GFP_KERNEL \| GFP_DMA);
1613	ret = -ENOMEM;	1576	if (!buf) {
1614	goto out_fw;	1577	ret = -ENOMEM;
		1578	goto out_fw;
		1579	}
1615	}	1580	}
1616		1581
1617	ret = regmap_raw_write(regmap, reg, buf->buf,	1582	memcpy(buf, region->data, region_len);
1618	le32_to_cpu(region->len));	1583	ret = regmap_raw_write(regmap, reg, buf, region_len);
1619	if (ret != 0) {	1584	if (ret != 0) {
1620	cs_dsp_err(dsp,	1585	cs_dsp_err(dsp,
1621	"%s.%d: Failed to write %d bytes at %d in %s: %d\n",	1586	"%s.%d: Failed to write %zu bytes at %d in %s: %d\n",
1622	file, regions,	1587	file, regions, region_len, offset, region_name, ret);
1623	le32_to_cpu(region->len), offset,
1624	region_name, ret);
1625	goto out_fw;	1588	goto out_fw;
1626	}	1589	}
1627	}	1590	}
@@ -1638,8 +1601,6 @@ static int cs_dsp_load(struct cs_dsp dsp, const struct firmware firmware, · 10 unmodified lines
1638		1601
1639	ret = 0;	1602	ret = 0;
1640	out_fw:	1603	out_fw:
1641	cs_dsp_buf_free(&buf_list);
1642
1643	if (ret == -EOVERFLOW)	1604	if (ret == -EOVERFLOW)
1644	cs_dsp_err(dsp, "%s: file content overflows file data\n", file);	1605	cs_dsp_err(dsp, "%s: file content overflows file data\n", file);
1645		1606
@@ -2171,7 +2132,9 @@ static int cs_dsp_load_coeff(struct cs_dsp dsp, const struct firmware firmware · 525 unmodified lines
2171	struct cs_dsp_alg_region *alg_region;	2132	struct cs_dsp_alg_region *alg_region;
2172	const char *region_name;	2133	const char *region_name;
2173	int ret, pos, blocks, type, offset, reg, version;	2134	int ret, pos, blocks, type, offset, reg, version;
2174	struct cs_dsp_buf *buf;	2135	u8 *buf __free(kfree) = NULL;
		2136	size_t buf_len = 0;
		2137	size_t region_len;
2175		2138
2176	if (!firmware)	2139	if (!firmware)
2177	return 0;	2140	return 0;
@@ -2313,20 +2276,22 @@ static int cs_dsp_load_coeff(struct cs_dsp dsp, const struct firmware firmware · 135 unmodified lines
2313	}	2276	}
2314		2277
2315	if (reg) {	2278	if (reg) {
2316	buf = cs_dsp_buf_alloc(blk->data,	2279	region_len = le32_to_cpu(blk->len);
2317	le32_to_cpu(blk->len),	2280	if (region_len > buf_len) {
2318	&buf_list);	2281	buf_len = round_up(region_len, PAGE_SIZE);
2319	if (!buf) {	2282	kfree(buf);
2320	cs_dsp_err(dsp, "Out of memory\n");	2283	buf = kmalloc(buf_len, GFP_KERNEL \| GFP_DMA);
2321	ret = -ENOMEM;	2284	if (!buf) {
2322	goto out_fw;	2285	ret = -ENOMEM;
		2286	goto out_fw;
		2287	}
2323	}	2288	}
2324		2289
2325	cs_dsp_dbg(dsp, "%s.%d: Writing %d bytes at %x\n",	2290	memcpy(buf, blk->data, region_len);
2326	file, blocks, le32_to_cpu(blk->len),	2291
2327	reg);	2292	cs_dsp_dbg(dsp, "%s.%d: Writing %zu bytes at %x\n",
2328	ret = regmap_raw_write(regmap, reg, buf->buf,	2293	file, blocks, region_len, reg);
2329	le32_to_cpu(blk->len));	2294	ret = regmap_raw_write(regmap, reg, buf, region_len);
2330	if (ret != 0) {	2295	if (ret != 0) {
2331	cs_dsp_err(dsp,	2296	cs_dsp_err(dsp,
2332	"%s.%d: Failed to write to %x in %s: %d\n",	2297	"%s.%d: Failed to write to %x in %s: %d\n",
@@ -2346,8 +2311,6 @@ static int cs_dsp_load_coeff(struct cs_dsp dsp, const struct firmware firmware · 13 unmodified lines
2346		2311
2347	ret = 0;	2312	ret = 0;
2348	out_fw:	2313	out_fw:
2349	cs_dsp_buf_free(&buf_list);
2350
2351	if (ret == -EOVERFLOW)	2314	if (ret == -EOVERFLOW)
2352	cs_dsp_err(dsp, "%s: file content overflows file data\n", file);	2315	cs_dsp_err(dsp, "%s: file content overflows file data\n", file);
2353		2316
@@ -2366,6 +2329,9 @@ static int cs_dsp_create_name(struct cs_dsp *dsp) · 12 unmodified lines
2366	return 0;	2329	return 0;
2367	}	2330	}
2368		2331
		2332	static const struct cs_dsp_client_ops cs_dsp_default_client_ops = {
		2333	};
		2334
2369	static int cs_dsp_common_init(struct cs_dsp *dsp)	2335	static int cs_dsp_common_init(struct cs_dsp *dsp)
2370	{	2336	{
2371	int ret;	2337	int ret;
@@ -2379,6 +2345,9 @@ static int cs_dsp_common_init(struct cs_dsp *dsp) · 7 unmodified lines
2379		2345
2380	mutex_init(&dsp->pwr_lock);	2346	mutex_init(&dsp->pwr_lock);
2381		2347
		2348	if (!dsp->client_ops)
		2349	dsp->client_ops = &cs_dsp_default_client_ops;
		2350
2382	#ifdef CONFIG_DEBUG_FS	2351	#ifdef CONFIG_DEBUG_FS
2383	/* Ensure this is invalid if client never provides a debugfs root */	2352	/* Ensure this is invalid if client never provides a debugfs root */
2384	dsp->debugfs_root = ERR_PTR(-ENODEV);	2353	dsp->debugfs_root = ERR_PTR(-ENODEV);

drivers/firmware/cirrus/test/cs_dsp_test_callbacks.c+1−0

@@ -600,6 +600,7 @@ KUNIT_ARRAY_PARAM(cs_dsp_callbacks_ops, · 599 unmodified lines
600		600
601	static const struct cs_dsp_callbacks_test_param cs_dsp_no_callbacks_cases[] = {	601	static const struct cs_dsp_callbacks_test_param cs_dsp_no_callbacks_cases[] = {
602	{ .ops = &cs_dsp_callback_test_empty_client_ops, .case_name = "empty ops" },	602	{ .ops = &cs_dsp_callback_test_empty_client_ops, .case_name = "empty ops" },
		603	{ .ops = NULL, .case_name = "NULL ops" },
603	};	604	};
604		605
605	KUNIT_ARRAY_PARAM(cs_dsp_no_callbacks,	606	KUNIT_ARRAY_PARAM(cs_dsp_no_callbacks,

drivers/gpio/Kconfig+17−0

 config GPIOLIB_LEGACY
 	def_bool y
+config HAVE_SHARED_GPIOS
+	bool
 menuconfig GPIOLIB
 	bool "GPIO Support"
 	help
 	  this symbol, but new drivers should use the generic gpio-regmap
 	  infrastructure instead.
+config GPIO_SHARED
+	def_bool y
+	depends on HAVE_SHARED_GPIOS || COMPILE_TEST
+	select AUXILIARY_BUS
 config DEBUG_GPIO
 	bool "Debug GPIO calls"
 	depends on DEBUG_KERNEL
 	  This enables the GPIO simulator - a configfs-based GPIO testing
 	  driver.
+config GPIO_SHARED_PROXY
+	tristate "Proxy driver for non-exclusive GPIOs"
+	default m
+	depends on GPIO_SHARED || COMPILE_TEST
+	select AUXILIARY_BUS
+	help
+	  This enables the GPIO shared proxy driver - an abstraction layer
+	  for GPIO pins that are shared by multiple devices.
 endmenu
 menu "GPIO Debugging utilities"

drivers/gpio/Makefile+2−0

 obj-$(CONFIG_GPIO_ACPI)		+= gpiolib-acpi.o
 gpiolib-acpi-y			:= gpiolib-acpi-core.o gpiolib-acpi-quirks.o
 obj-$(CONFIG_GPIOLIB)		+= gpiolib-swnode.o
+obj-$(CONFIG_GPIO_SHARED)	+= gpiolib-shared.o
 # Device drivers. Generally keep list sorted alphabetically
 obj-$(CONFIG_GPIO_REGMAP)	+= gpio-regmap.o
 obj-$(CONFIG_GPIO_SAMA5D2_PIOBU)	+= gpio-sama5d2-piobu.o
 obj-$(CONFIG_GPIO_SCH311X)		+= gpio-sch311x.o
 obj-$(CONFIG_GPIO_SCH)			+= gpio-sch.o
+obj-$(CONFIG_GPIO_SHARED_PROXY)		+= gpio-shared-proxy.o
 obj-$(CONFIG_GPIO_SIFIVE)		+= gpio-sifive.o
 obj-$(CONFIG_GPIO_SIM)			+= gpio-sim.o
 obj-$(CONFIG_GPIO_SIOX)			+= gpio-siox.o

drivers/gpio/gpio-shared-proxy.c+333−0

@@ -0,0 +1,333 @@
	1	// SPDX-License-Identifier: GPL-2.0-only
	2	/*
	3	* Copyright (C) 2025 Linaro Ltd.
	4	*/
	5
	6	#include <linux/auxiliary_bus.h>
	7	#include <linux/cleanup.h>
	8	#include <linux/device.h>
	9	#include <linux/err.h>
	10	#include <linux/gpio/consumer.h>
	11	#include <linux/gpio/driver.h>
	12	#include <linux/mod_devicetable.h>
	13	#include <linux/module.h>
	14	#include <linux/string_choices.h>
	15	#include <linux/types.h>
	16
	17	#include "gpiolib-shared.h"
	18
	19	struct gpio_shared_proxy_data {
	20	struct gpio_chip gc;
	21	struct gpio_shared_desc *shared_desc;
	22	struct device *dev;
	23	bool voted_high;
	24	};
	25
	26	static int
	27	gpio_shared_proxy_set_unlocked(struct gpio_shared_proxy_data *proxy,
	28	int (set_func)(struct gpio_desc desc, int value),
	29	int value)
	30	{
	31	struct gpio_shared_desc *shared_desc = proxy->shared_desc;
	32	struct gpio_desc *desc = shared_desc->desc;
	33	int ret = 0;
	34
	35	gpio_shared_lockdep_assert(shared_desc);
	36
	37	if (value) {
	38	/* User wants to set value to high. */
	39	if (proxy->voted_high)
	40	/* Already voted for high, nothing to do. */
	41	goto out;
	42
	43	/* Haven't voted for high yet. */
	44	if (!shared_desc->highcnt) {
	45	/*
	46	* Current value is low, need to actually set value
	47	* to high.
	48	*/
	49	ret = set_func(desc, 1);
	50	if (ret)
	51	goto out;
	52	}
	53
	54	shared_desc->highcnt++;
	55	proxy->voted_high = true;
	56
	57	goto out;
	58	}
	59
	60	/* Desired value is low. */
	61	if (!proxy->voted_high)
	62	/* We didn't vote for high, nothing to do. */
	63	goto out;
	64
	65	/* We previously voted for high. */
	66	if (shared_desc->highcnt == 1) {
	67	/* This is the last remaining vote for high, set value to low. */
	68	ret = set_func(desc, 0);
	69	if (ret)
	70	goto out;
	71	}
	72
	73	shared_desc->highcnt--;
	74	proxy->voted_high = false;
	75
	76	out:
	77	if (shared_desc->highcnt)
	78	dev_dbg(proxy->dev,
	79	"Voted for value '%s', effective value is 'high', number of votes for 'high': %u\n",
	80	str_high_low(value), shared_desc->highcnt);
	81	else
	82	dev_dbg(proxy->dev, "Voted for value 'low', effective value is 'low'\n");
	83
	84	return ret;
	85	}
	86
	87	static int gpio_shared_proxy_request(struct gpio_chip *gc, unsigned int offset)
	88	{
	89	struct gpio_shared_proxy_data *proxy = gpiochip_get_data(gc);
	90	struct gpio_shared_desc *shared_desc = proxy->shared_desc;
	91
	92	guard(gpio_shared_desc_lock)(shared_desc);
	93
	94	proxy->shared_desc->usecnt++;
	95
	96	dev_dbg(proxy->dev, "Shared GPIO requested, number of users: %u\n",
	97	proxy->shared_desc->usecnt);
	98
	99	return 0;
	100	}
	101
	102	static void gpio_shared_proxy_free(struct gpio_chip *gc, unsigned int offset)
	103	{
	104	struct gpio_shared_proxy_data *proxy = gpiochip_get_data(gc);
	105	struct gpio_shared_desc *shared_desc = proxy->shared_desc;
	106
	107	guard(gpio_shared_desc_lock)(shared_desc);
	108
	109	proxy->shared_desc->usecnt--;
	110
	111	dev_dbg(proxy->dev, "Shared GPIO freed, number of users: %u\n",
	112	proxy->shared_desc->usecnt);
	113	}
	114
	115	static int gpio_shared_proxy_set_config(struct gpio_chip *gc,
	116	unsigned int offset, unsigned long cfg)
	117	{
	118	struct gpio_shared_proxy_data *proxy = gpiochip_get_data(gc);
	119	struct gpio_shared_desc *shared_desc = proxy->shared_desc;
	120	struct gpio_desc *desc = shared_desc->desc;
	121	int ret;
	122
	123	guard(gpio_shared_desc_lock)(shared_desc);
	124
	125	if (shared_desc->usecnt > 1) {
	126	if (shared_desc->cfg != cfg) {
	127	dev_dbg(proxy->dev,
	128	"Shared GPIO's configuration already set, accepting changes but users may conflict!!\n");
	129	} else {
	130	dev_dbg(proxy->dev, "Equal config requested, nothing to do\n");
	131	return 0;
	132	}
	133	}
	134
	135	ret = gpiod_set_config(desc, cfg);
	136	if (ret && ret != -ENOTSUPP)
	137	return ret;
	138
	139	shared_desc->cfg = cfg;
	140	return 0;
	141	}
	142
	143	static int gpio_shared_proxy_direction_input(struct gpio_chip *gc,
	144	unsigned int offset)
	145	{
	146	struct gpio_shared_proxy_data *proxy = gpiochip_get_data(gc);
	147	struct gpio_shared_desc *shared_desc = proxy->shared_desc;
	148	struct gpio_desc *desc = shared_desc->desc;
	149	int dir;
	150
	151	guard(gpio_shared_desc_lock)(shared_desc);
	152
	153	if (shared_desc->usecnt == 1) {
	154	dev_dbg(proxy->dev,
	155	"Only one user of this shared GPIO, allowing to set direction to input\n");
	156
	157	return gpiod_direction_input(desc);
	158	}
	159
	160	dir = gpiod_get_direction(desc);
	161	if (dir < 0)
	162	return dir;
	163
	164	if (dir == GPIO_LINE_DIRECTION_OUT) {
	165	dev_dbg(proxy->dev,
	166	"Shared GPIO's direction already set to output, refusing to change\n");
	167	return -EPERM;
	168	}
	169
	170	return 0;
	171	}
	172
	173	static int gpio_shared_proxy_direction_output(struct gpio_chip *gc,
	174	unsigned int offset, int value)
	175	{
	176	struct gpio_shared_proxy_data *proxy = gpiochip_get_data(gc);
	177	struct gpio_shared_desc *shared_desc = proxy->shared_desc;
	178	struct gpio_desc *desc = shared_desc->desc;
	179	int ret, dir;
	180
	181	guard(gpio_shared_desc_lock)(shared_desc);
	182
	183	if (shared_desc->usecnt == 1) {
	184	dev_dbg(proxy->dev,
	185	"Only one user of this shared GPIO, allowing to set direction to output with value '%s'\n",
	186	str_high_low(value));
	187
	188	ret = gpiod_direction_output(desc, value);
	189	if (ret)
	190	return ret;
	191
	192	if (value) {
	193	proxy->voted_high = true;
	194	shared_desc->highcnt = 1;
	195	} else {
	196	proxy->voted_high = false;
	197	shared_desc->highcnt = 0;
	198	}
	199
	200	return 0;
	201	}
	202
	203	dir = gpiod_get_direction(desc);
	204	if (dir < 0)
	205	return dir;
	206
	207	if (dir == GPIO_LINE_DIRECTION_IN) {
	208	dev_dbg(proxy->dev,
	209	"Shared GPIO's direction already set to input, refusing to change\n");
	210	return -EPERM;
	211	}
	212
	213	return gpio_shared_proxy_set_unlocked(proxy, gpiod_direction_output, value);
	214	}
	215
	216	static int gpio_shared_proxy_get(struct gpio_chip *gc, unsigned int offset)
	217	{
	218	struct gpio_shared_proxy_data *proxy = gpiochip_get_data(gc);
	219
	220	return gpiod_get_value(proxy->shared_desc->desc);
	221	}
	222
	223	static int gpio_shared_proxy_get_cansleep(struct gpio_chip *gc,
	224	unsigned int offset)
	225	{
	226	struct gpio_shared_proxy_data *proxy = gpiochip_get_data(gc);
	227
	228	return gpiod_get_value_cansleep(proxy->shared_desc->desc);
	229	}
	230
	231	static int gpio_shared_proxy_do_set(struct gpio_shared_proxy_data *proxy,
	232	int (set_func)(struct gpio_desc desc, int value),
	233	int value)
	234	{
	235	guard(gpio_shared_desc_lock)(proxy->shared_desc);
	236
	237	return gpio_shared_proxy_set_unlocked(proxy, set_func, value);
	238	}
	239
	240	static int gpio_shared_proxy_set(struct gpio_chip *gc, unsigned int offset,
	241	int value)
	242	{
	243	struct gpio_shared_proxy_data *proxy = gpiochip_get_data(gc);
	244
	245	return gpio_shared_proxy_do_set(proxy, gpiod_set_value, value);
	246	}
	247
	248	static int gpio_shared_proxy_set_cansleep(struct gpio_chip *gc,
	249	unsigned int offset, int value)
	250	{
	251	struct gpio_shared_proxy_data *proxy = gpiochip_get_data(gc);
	252
	253	return gpio_shared_proxy_do_set(proxy, gpiod_set_value_cansleep, value);
	254	}
	255
	256	static int gpio_shared_proxy_get_direction(struct gpio_chip *gc,
	257	unsigned int offset)
	258	{
	259	struct gpio_shared_proxy_data *proxy = gpiochip_get_data(gc);
	260
	261	return gpiod_get_direction(proxy->shared_desc->desc);
	262	}
	263
	264	static int gpio_shared_proxy_to_irq(struct gpio_chip *gc, unsigned int offset)
	265	{
	266	struct gpio_shared_proxy_data *proxy = gpiochip_get_data(gc);
	267
	268	return gpiod_to_irq(proxy->shared_desc->desc);
	269	}
	270
	271	static int gpio_shared_proxy_probe(struct auxiliary_device *adev,
	272	const struct auxiliary_device_id *id)
	273	{
	274	struct gpio_shared_proxy_data *proxy;
	275	struct gpio_shared_desc *shared_desc;
	276	struct device *dev = &adev->dev;
	277	struct gpio_chip *gc;
	278
	279	shared_desc = devm_gpiod_shared_get(dev);
	280	if (IS_ERR(shared_desc))
	281	return PTR_ERR(shared_desc);
	282
	283	proxy = devm_kzalloc(dev, sizeof(*proxy), GFP_KERNEL);
	284	if (!proxy)
	285	return -ENOMEM;
	286
	287	proxy->shared_desc = shared_desc;
	288	proxy->dev = dev;
	289
	290	gc = &proxy->gc;
	291	gc->base = -1;
	292	gc->ngpio = 1;
	293	gc->label = dev_name(dev);
	294	gc->parent = dev;
	295	gc->owner = THIS_MODULE;
	296	gc->can_sleep = shared_desc->can_sleep;
	297
	298	gc->request = gpio_shared_proxy_request;
	299	gc->free = gpio_shared_proxy_free;
	300	gc->set_config = gpio_shared_proxy_set_config;
	301	gc->direction_input = gpio_shared_proxy_direction_input;
	302	gc->direction_output = gpio_shared_proxy_direction_output;
	303	if (gc->can_sleep) {
	304	gc->set = gpio_shared_proxy_set_cansleep;
	305	gc->get = gpio_shared_proxy_get_cansleep;
	306	} else {
	307	gc->set = gpio_shared_proxy_set;
	308	gc->get = gpio_shared_proxy_get;
	309	}
	310	gc->get_direction = gpio_shared_proxy_get_direction;
	311	gc->to_irq = gpio_shared_proxy_to_irq;
	312
	313	return devm_gpiochip_add_data(dev, &proxy->gc, proxy);
	314	}
	315
	316	static const struct auxiliary_device_id gpio_shared_proxy_id_table[] = {
	317	{ .name = "gpiolib_shared.proxy" },
	318	{},
	319	};
	320	MODULE_DEVICE_TABLE(auxiliary, gpio_shared_proxy_id_table);
	321
	322	static struct auxiliary_driver gpio_shared_proxy_driver = {
	323	.driver = {
	324	.name = "gpio-shared-proxy",
	325	},
	326	.probe = gpio_shared_proxy_probe,
	327	.id_table = gpio_shared_proxy_id_table,
	328	};
	329	module_auxiliary_driver(gpio_shared_proxy_driver);
	330
	331	MODULE_AUTHOR("Bartosz Golaszewski <bartosz.golaszewski@linaro.org>");
	332	MODULE_DESCRIPTION("Shared GPIO mux driver.");
	333	MODULE_LICENSE("GPL");

drivers/gpio/gpiolib-shared.c+558−0

@@ -0,0 +1,558 @@
	1	// SPDX-License-Identifier: GPL-2.0-only
	2	/*
	3	* Copyright (C) 2025 Linaro Ltd.
	4	*/
	5
	6	#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
	7
	8	#include <linux/auxiliary_bus.h>
	9	#include <linux/cleanup.h>
	10	#include <linux/device.h>
	11	#include <linux/fwnode.h>
	12	#include <linux/gpio/consumer.h>
	13	#include <linux/gpio/machine.h>
	14	#include <linux/idr.h>
	15	#include <linux/kref.h>
	16	#include <linux/list.h>
	17	#include <linux/lockdep.h>
	18	#include <linux/module.h>
	19	#include <linux/mutex.h>
	20	#include <linux/of.h>
	21	#include <linux/overflow.h>
	22	#include <linux/printk.h>
	23	#include <linux/property.h>
	24	#include <linux/slab.h>
	25	#include <linux/string.h>
	26
	27	#include "gpiolib.h"
	28	#include "gpiolib-shared.h"
	29
	30	/* Represents a single reference to a GPIO pin. */
	31	struct gpio_shared_ref {
	32	struct list_head list;
	33	/* Firmware node associated with this GPIO's consumer. */
	34	struct fwnode_handle *fwnode;
	35	/* GPIO flags this consumer uses for the request. */
	36	enum gpiod_flags flags;
	37	char *con_id;
	38	int dev_id;
	39	struct auxiliary_device adev;
	40	struct gpiod_lookup_table *lookup;
	41	};
	42
	43	/* Represents a single GPIO pin. */
	44	struct gpio_shared_entry {
	45	struct list_head list;
	46	/* Firmware node associated with the GPIO controller. */
	47	struct fwnode_handle *fwnode;
	48	/* Hardware offset of the GPIO within its chip. */
	49	unsigned int offset;
	50	/* Index in the property value array. */
	51	size_t index;
	52	struct gpio_shared_desc *shared_desc;
	53	struct kref ref;
	54	struct list_head refs;
	55	};
	56
	57	static LIST_HEAD(gpio_shared_list);
	58	static DEFINE_MUTEX(gpio_shared_lock);
	59	static DEFINE_IDA(gpio_shared_ida);
	60
	61	static struct gpio_shared_entry *
	62	gpio_shared_find_entry(struct fwnode_handle *controller_node,
	63	unsigned int offset)
	64	{
	65	struct gpio_shared_entry *entry;
	66
	67	list_for_each_entry(entry, &gpio_shared_list, list) {
	68	if (entry->fwnode == controller_node && entry->offset == offset)
	69	return entry;
	70	}
	71
	72	return NULL;
	73	}
	74
	75	#if IS_ENABLED(CONFIG_OF)
	76	static int gpio_shared_of_traverse(struct device_node *curr)
	77	{
	78	struct gpio_shared_entry *entry;
	79	size_t con_id_len, suffix_len;
	80	struct fwnode_handle *fwnode;
	81	struct of_phandle_args args;
	82	struct property *prop;
	83	unsigned int offset;
	84	const char *suffix;
	85	int ret, count, i;
	86
	87	for_each_property_of_node(curr, prop) {
	88	/*
	89	* The standard name for a GPIO property is "foo-gpios"
	90	* or "foo-gpio". Some bindings also use "gpios" or "gpio".
	91	* There are some legacy device-trees which have a different
	92	* naming convention and for which we have rename quirks in
	93	* place in gpiolib-of.c. I don't think any of them require
	94	* support for shared GPIOs so for now let's just ignore
	95	* them. We can always just export the quirk list and
	96	* iterate over it here.
	97	*/
	98	if (!strends(prop->name, "-gpios") &&
	99	!strends(prop->name, "-gpio") &&
	100	strcmp(prop->name, "gpios") != 0 &&
	101	strcmp(prop->name, "gpio") != 0)
	102	continue;
	103
	104	count = of_count_phandle_with_args(curr, prop->name,
	105	"#gpio-cells");
	106	if (count <= 0)
	107	continue;
	108
	109	for (i = 0; i < count; i++) {
	110	struct device_node *np __free(device_node) = NULL;
	111
	112	ret = of_parse_phandle_with_args(curr, prop->name,
	113	"#gpio-cells", i,
	114	&args);
	115	if (ret)
	116	continue;
	117
	118	np = args.np;
	119
	120	if (!of_property_present(np, "gpio-controller"))
	121	continue;
	122
	123	/*
	124	* We support 1, 2 and 3 cell GPIO bindings in the
	125	* kernel currently. There's only one old MIPS dts that
	126	* has a one-cell binding but there's no associated
	127	* consumer so it may as well be an error. There don't
	128	* seem to be any 3-cell users of non-exclusive GPIOs,
	129	* so we can skip this as well. Let's occupy ourselves
	130	* with the predominant 2-cell binding with the first
	131	* cell indicating the hardware offset of the GPIO and
	132	* the second defining the GPIO flags of the request.
	133	*/
	134	if (args.args_count != 2)
	135	continue;
	136
	137	fwnode = of_fwnode_handle(args.np);
	138	offset = args.args[0];
	139
	140	entry = gpio_shared_find_entry(fwnode, offset);
	141	if (!entry) {
	142	entry = kzalloc(sizeof(*entry), GFP_KERNEL);
	143	if (!entry)
	144	return -ENOMEM;
	145
	146	entry->fwnode = fwnode_handle_get(fwnode);
	147	entry->offset = offset;
	148	entry->index = count;
	149	INIT_LIST_HEAD(&entry->refs);
	150
	151	list_add_tail(&entry->list, &gpio_shared_list);
	152	}
	153
	154	struct gpio_shared_ref *ref __free(kfree) =
	155	kzalloc(sizeof(*ref), GFP_KERNEL);
	156	if (!ref)
	157	return -ENOMEM;
	158
	159	ref->fwnode = fwnode_handle_get(of_fwnode_handle(curr));
	160	ref->flags = args.args[1];
	161
	162	if (strends(prop->name, "gpios"))
	163	suffix = "-gpios";
	164	else if (strends(prop->name, "gpio"))
	165	suffix = "-gpio";
	166	else
	167	suffix = NULL;
	168	if (!suffix)
	169	continue;
	170
	171	/* We only set con_id if there's actually one. */
	172	if (strcmp(prop->name, "gpios") && strcmp(prop->name, "gpio")) {
	173	ref->con_id = kstrdup(prop->name, GFP_KERNEL);
	174	if (!ref->con_id)
	175	return -ENOMEM;
	176
	177	con_id_len = strlen(ref->con_id);
	178	suffix_len = strlen(suffix);
	179
	180	ref->con_id[con_id_len - suffix_len] = '\0';
	181	}
	182
	183	ref->dev_id = ida_alloc(&gpio_shared_ida, GFP_KERNEL);
	184	if (ref->dev_id < 0) {
	185	kfree(ref->con_id);
	186	return -ENOMEM;
	187	}
	188
	189	if (!list_empty(&entry->refs))
	190	pr_debug("GPIO %u at %s is shared by multiple firmware nodes\n",
	191	entry->offset, fwnode_get_name(entry->fwnode));
	192
	193	list_add_tail(&no_free_ptr(ref)->list, &entry->refs);
	194	}
	195	}
	196
	197	for_each_child_of_node_scoped(curr, child) {
	198	ret = gpio_shared_of_traverse(child);
	199	if (ret)
	200	return ret;
	201	}
	202
	203	return 0;
	204	}
	205
	206	static int gpio_shared_of_scan(void)
	207	{
	208	return gpio_shared_of_traverse(of_root);
	209	}
	210	#else
	211	static int gpio_shared_of_scan(void)
	212	{
	213	return 0;
	214	}
	215	#endif /* CONFIG_OF */
	216
	217	static void gpio_shared_adev_release(struct device *dev)
	218	{
	219
	220	}
	221
	222	static int gpio_shared_make_adev(struct gpio_device *gdev,
	223	struct gpio_shared_ref *ref)
	224	{
	225	struct auxiliary_device *adev = &ref->adev;
	226	int ret;
	227
	228	lockdep_assert_held(&gpio_shared_lock);
	229
	230	memset(adev, 0, sizeof(*adev));
	231
	232	adev->id = ref->dev_id;
	233	adev->name = "proxy";
	234	adev->dev.parent = gdev->dev.parent;
	235	adev->dev.release = gpio_shared_adev_release;
	236
	237	ret = auxiliary_device_init(adev);
	238	if (ret)
	239	return ret;
	240
	241	ret = auxiliary_device_add(adev);
	242	if (ret) {
	243	auxiliary_device_uninit(adev);
	244	return ret;
	245	}
	246
	247	pr_debug("Created an auxiliary GPIO proxy %s for GPIO device %s\n",
	248	dev_name(&adev->dev), gpio_device_get_label(gdev));
	249
	250	return 0;
	251	}
	252
	253	int gpio_shared_add_proxy_lookup(struct device *consumer, unsigned long lflags)
	254	{
	255	const char *dev_id = dev_name(consumer);
	256	struct gpio_shared_entry *entry;
	257	struct gpio_shared_ref *ref;
	258
	259	struct gpiod_lookup_table *lookup __free(kfree) =
	260	kzalloc(struct_size(lookup, table, 2), GFP_KERNEL);
	261	if (!lookup)
	262	return -ENOMEM;
	263
	264	guard(mutex)(&gpio_shared_lock);
	265
	266	list_for_each_entry(entry, &gpio_shared_list, list) {
	267	list_for_each_entry(ref, &entry->refs, list) {
	268	if (!device_match_fwnode(consumer, ref->fwnode))
	269	continue;
	270
	271	/* We've already done that on a previous request. */
	272	if (ref->lookup)
	273	return 0;
	274
	275	char *key __free(kfree) =
	276	kasprintf(GFP_KERNEL,
	277	KBUILD_MODNAME ".proxy.%u",
	278	ref->adev.id);
	279	if (!key)
	280	return -ENOMEM;
	281
	282	pr_debug("Adding machine lookup entry for a shared GPIO for consumer %s, with key '%s' and con_id '%s'\n",
	283	dev_id, key, ref->con_id ?: "none");
	284
	285	lookup->dev_id = dev_id;
	286	lookup->table[0] = GPIO_LOOKUP(no_free_ptr(key), 0,
	287	ref->con_id, lflags);
	288
	289	gpiod_add_lookup_table(no_free_ptr(lookup));
	290
	291	return 0;
	292	}
	293	}
	294
	295	/* We warn here because this can only happen if the programmer borked. */
	296	WARN_ON(1);
	297	return -ENOENT;
	298	}
	299
	300	static void gpio_shared_remove_adev(struct auxiliary_device *adev)
	301	{
	302	lockdep_assert_held(&gpio_shared_lock);
	303
	304	auxiliary_device_uninit(adev);
	305	auxiliary_device_delete(adev);
	306	}
	307
	308	int gpio_device_setup_shared(struct gpio_device *gdev)
	309	{
	310	struct gpio_shared_entry *entry;
	311	struct gpio_shared_ref *ref;
	312	unsigned long *flags;
	313	int ret;
	314
	315	guard(mutex)(&gpio_shared_lock);
	316
	317	list_for_each_entry(entry, &gpio_shared_list, list) {
	318	list_for_each_entry(ref, &entry->refs, list) {
	319	if (gdev->dev.parent == &ref->adev.dev) {
	320	/*
	321	* This is a shared GPIO proxy. Mark its
	322	* descriptor as such and return here.
	323	*/
	324	__set_bit(GPIOD_FLAG_SHARED_PROXY,
	325	&gdev->descs[0].flags);
	326	return 0;
	327	}
	328	}
	329	}
	330
	331	/*
	332	* This is not a shared GPIO proxy but it still may be the device
	333	* exposing shared pins. Find them and create the proxy devices.
	334	*/
	335	list_for_each_entry(entry, &gpio_shared_list, list) {
	336	if (!device_match_fwnode(&gdev->dev, entry->fwnode))
	337	continue;
	338
	339	if (list_count_nodes(&entry->refs) <= 1)
	340	continue;
	341
	342	flags = &gdev->descs[entry->offset].flags;
	343
	344	__set_bit(GPIOD_FLAG_SHARED, flags);
	345	/*
	346	* Shared GPIOs are not requested via the normal path. Make
	347	* them inaccessible to anyone even before we register the
	348	* chip.
	349	*/
	350	__set_bit(GPIOD_FLAG_REQUESTED, flags);
	351
	352	pr_debug("GPIO %u owned by %s is shared by multiple consumers\n",
	353	entry->offset, gpio_device_get_label(gdev));
	354
	355	list_for_each_entry(ref, &entry->refs, list) {
	356	pr_debug("Setting up a shared GPIO entry for %s\n",
	357	fwnode_get_name(ref->fwnode));
	358
	359	ret = gpio_shared_make_adev(gdev, ref);
	360	if (ret)
	361	return ret;
	362	}
	363	}
	364
	365	return 0;
	366	}
	367
	368	void gpio_device_teardown_shared(struct gpio_device *gdev)
	369	{
	370	struct gpio_shared_entry *entry;
	371	struct gpio_shared_ref *ref;
	372
	373	guard(mutex)(&gpio_shared_lock);
	374
	375	list_for_each_entry(entry, &gpio_shared_list, list) {
	376	if (!device_match_fwnode(&gdev->dev, entry->fwnode))
	377	continue;
	378
	379	list_for_each_entry(ref, &entry->refs, list) {
	380	gpiod_remove_lookup_table(ref->lookup);
	381	kfree(ref->lookup->table[0].key);
	382	kfree(ref->lookup);
	383	ref->lookup = NULL;
	384	gpio_shared_remove_adev(&ref->adev);
	385	}
	386	}
	387	}
	388
	389	static void gpio_shared_release(struct kref *kref)
	390	{
	391	struct gpio_shared_entry *entry =
	392	container_of(kref, struct gpio_shared_entry, ref);
	393	struct gpio_shared_desc *shared_desc = entry->shared_desc;
	394
	395	guard(mutex)(&gpio_shared_lock);
	396
	397	gpio_device_put(shared_desc->desc->gdev);
	398	if (shared_desc->can_sleep)
	399	mutex_destroy(&shared_desc->mutex);
	400	kfree(shared_desc);
	401	entry->shared_desc = NULL;
	402	}
	403
	404	static void gpiod_shared_put(void *data)
	405	{
	406	struct gpio_shared_entry *entry = data;
	407
	408	lockdep_assert_not_held(&gpio_shared_lock);
	409
	410	kref_put(&entry->ref, gpio_shared_release);
	411	}
	412
	413	static struct gpio_shared_desc *
	414	gpiod_shared_desc_create(struct gpio_shared_entry *entry)
	415	{
	416	struct gpio_shared_desc *shared_desc;
	417	struct gpio_device *gdev;
	418
	419	shared_desc = kzalloc(sizeof(*shared_desc), GFP_KERNEL);
	420	if (!shared_desc)
	421	return ERR_PTR(-ENOMEM);
	422
	423	gdev = gpio_device_find_by_fwnode(entry->fwnode);
	424	if (!gdev) {
	425	kfree(shared_desc);
	426	return ERR_PTR(-EPROBE_DEFER);
	427	}
	428
	429	shared_desc->desc = &gdev->descs[entry->offset];
	430	shared_desc->can_sleep = gpiod_cansleep(shared_desc->desc);
	431	if (shared_desc->can_sleep)
	432	mutex_init(&shared_desc->mutex);
	433	else
	434	spin_lock_init(&shared_desc->spinlock);
	435
	436	return shared_desc;
	437	}
	438
	439	static struct gpio_shared_entry gpiod_shared_find(struct auxiliary_device adev)
	440	{
	441	struct gpio_shared_desc *shared_desc;
	442	struct gpio_shared_entry *entry;
	443	struct gpio_shared_ref *ref;
	444
	445	guard(mutex)(&gpio_shared_lock);
	446
	447	list_for_each_entry(entry, &gpio_shared_list, list) {
	448	list_for_each_entry(ref, &entry->refs, list) {
	449	if (adev != &ref->adev)
	450	continue;
	451
	452	if (entry->shared_desc) {
	453	kref_get(&entry->ref);
	454	return entry;
	455	}
	456
	457	shared_desc = gpiod_shared_desc_create(entry);
	458	if (IS_ERR(shared_desc))
	459	return ERR_CAST(shared_desc);
	460
	461	kref_init(&entry->ref);
	462	entry->shared_desc = shared_desc;
	463
	464	pr_debug("Device %s acquired a reference to the shared GPIO %u owned by %s\n",
	465	dev_name(&adev->dev), gpio_chip_hwgpio(shared_desc->desc),
	466	gpio_device_get_label(shared_desc->desc->gdev));
	467
	468
	469	return entry;
	470	}
	471	}
	472
	473	return ERR_PTR(-ENOENT);
	474	}
	475
	476	struct gpio_shared_desc devm_gpiod_shared_get(struct device dev)
	477	{
	478	struct gpio_shared_entry *entry;
	479	int ret;
	480
	481	entry = gpiod_shared_find(to_auxiliary_dev(dev));
	482	if (IS_ERR(entry))
	483	return ERR_CAST(entry);
	484
	485	ret = devm_add_action_or_reset(dev, gpiod_shared_put, entry);
	486	if (ret)
	487	return ERR_PTR(ret);
	488
	489	return entry->shared_desc;
	490	}
	491	EXPORT_SYMBOL_GPL(devm_gpiod_shared_get);
	492
	493	static void gpio_shared_drop_ref(struct gpio_shared_ref *ref)
	494	{
	495	list_del(&ref->list);
	496	kfree(ref->con_id);
	497	ida_free(&gpio_shared_ida, ref->dev_id);
	498	fwnode_handle_put(ref->fwnode);
	499	kfree(ref);
	500	}
	501
	502	static void gpio_shared_drop_entry(struct gpio_shared_entry *entry)
	503	{
	504	list_del(&entry->list);
	505	fwnode_handle_put(entry->fwnode);
	506	kfree(entry);
	507	}
	508
	509	/*
	510	* This is only called if gpio_shared_init() fails so it's in fact __init and
	511	* not __exit.
	512	*/
	513	static void __init gpio_shared_teardown(void)
	514	{
	515	struct gpio_shared_entry entry, epos;
	516	struct gpio_shared_ref ref, rpos;
	517
	518	list_for_each_entry_safe(entry, epos, &gpio_shared_list, list) {
	519	list_for_each_entry_safe(ref, rpos, &entry->refs, list)
	520	gpio_shared_drop_ref(ref);
	521
	522	gpio_shared_drop_entry(entry);
	523	}
	524	}
	525
	526	static void gpio_shared_free_exclusive(void)
	527	{
	528	struct gpio_shared_entry entry, epos;
	529
	530	list_for_each_entry_safe(entry, epos, &gpio_shared_list, list) {
	531	if (list_count_nodes(&entry->refs) > 1)
	532	continue;
	533
	534	gpio_shared_drop_ref(list_first_entry(&entry->refs,
	535	struct gpio_shared_ref,
	536	list));
	537	gpio_shared_drop_entry(entry);
	538	}
	539	}
	540
	541	static int __init gpio_shared_init(void)
	542	{
	543	int ret;
	544
	545	/* Right now, we only support OF-based systems. */
	546	ret = gpio_shared_of_scan();
	547	if (ret) {
	548	gpio_shared_teardown();
	549	pr_err("Failed to scan OF nodes for shared GPIOs: %d\n", ret);
	550	return ret;
	551	}
	552
	553	gpio_shared_free_exclusive();
	554
	555	pr_debug("Finished scanning firmware nodes for shared GPIOs\n");
	556	return 0;
	557	}
	558	postcore_initcall(gpio_shared_init);

drivers/gpio/gpiolib-shared.h+71−0

@@ -0,0 +1,71 @@
	1	/* SPDX-License-Identifier: GPL-2.0 */
	2
	3	#ifndef __LINUX_GPIO_SHARED_H
	4	#define __LINUX_GPIO_SHARED_H
	5
	6	#include <linux/cleanup.h>
	7	#include <linux/lockdep.h>
	8	#include <linux/mutex.h>
	9	#include <linux/spinlock.h>
	10
	11	struct gpio_device;
	12	struct gpio_desc;
	13	struct device;
	14
	15	#if IS_ENABLED(CONFIG_GPIO_SHARED)
	16
	17	int gpio_device_setup_shared(struct gpio_device *gdev);
	18	void gpio_device_teardown_shared(struct gpio_device *gdev);
	19	int gpio_shared_add_proxy_lookup(struct device *consumer, unsigned long lflags);
	20
	21	#else
	22
	23	static inline int gpio_device_setup_shared(struct gpio_device *gdev)
	24	{
	25	return 0;
	26	}
	27
	28	static inline void gpio_device_teardown_shared(struct gpio_device *gdev) { }
	29
	30	static inline int gpio_shared_add_proxy_lookup(struct device *consumer,
	31	unsigned long lflags)
	32	{
	33	return 0;
	34	}
	35
	36	#endif /* CONFIG_GPIO_SHARED */
	37
	38	struct gpio_shared_desc {
	39	struct gpio_desc *desc;
	40	bool can_sleep;
	41	unsigned long cfg;
	42	unsigned int usecnt;
	43	unsigned int highcnt;
	44	union {
	45	struct mutex mutex;
	46	spinlock_t spinlock;
	47	};
	48	};
	49
	50	struct gpio_shared_desc devm_gpiod_shared_get(struct device dev);
	51
	52	DEFINE_LOCK_GUARD_1(gpio_shared_desc_lock, struct gpio_shared_desc,
	53	if (_T->lock->can_sleep)
	54	mutex_lock(&_T->lock->mutex);
	55	else
	56	spin_lock_irqsave(&_T->lock->spinlock, _T->flags),
	57	if (_T->lock->can_sleep)
	58	mutex_unlock(&_T->lock->mutex);
	59	else
	60	spin_unlock_irqrestore(&_T->lock->spinlock, _T->flags),
	61	unsigned long flags)
	62
	63	static inline void gpio_shared_lockdep_assert(struct gpio_shared_desc *shared_desc)
	64	{
	65	if (shared_desc->can_sleep)
	66	lockdep_assert_held(&shared_desc->mutex);
	67	else
	68	lockdep_assert_held(&shared_desc->spinlock);
	69	}
	70
	71	#endif /* __LINUX_GPIO_SHARED_H */

drivers/gpio/gpiolib.c+61−9

 #include "gpiolib-acpi.h"
 #include "gpiolib-cdev.h"
 #include "gpiolib-of.h"
+#include "gpiolib-shared.h"
 #include "gpiolib-swnode.h"
 #include "gpiolib-sysfs.h"
 #include "gpiolib.h"
 	if (ret)
 		goto err_remove_irqchip_mask;
+	ret = gpio_device_setup_shared(gdev);
+	if (ret)
+		goto err_remove_irqchip;
 	/*
 	 * By first adding the chardev, and then adding the device,
 	 * we get a device node entry in sysfs under
 	if (gpiolib_initialized) {
 		ret = gpiochip_setup_dev(gdev);
 		if (ret)
-			goto err_remove_irqchip;
+			goto err_teardown_shared;
 	}
 	return 0;
+err_teardown_shared:
+	gpio_device_teardown_shared(gdev);
 err_remove_irqchip:
 	gpiochip_irqchip_remove(gc);
 err_remove_irqchip_mask:
 	/* Numb the device, cancelling all outstanding operations */
 	rcu_assign_pointer(gdev->chip, NULL);
 	synchronize_srcu(&gdev->srcu);
+	gpio_device_teardown_shared(gdev);
 	gpiochip_irqchip_remove(gc);
 	acpi_gpiochip_remove(gc);
 	of_gpiochip_remove(gc);
 }
 EXPORT_SYMBOL_GPL(gpiod_set_consumer_name);
+/**
+ * gpiod_is_shared() - check if this GPIO can be shared by multiple consumers
+ * @desc: GPIO to inspect
+ *
+ * Returns:
+ * True if this GPIO can be shared by multiple consumers at once. False if it's
+ * a regular, exclusive GPIO.
+ *
+ * Note:
+ * This function returning true does not mean that this GPIO is currently being
+ * shared. It means the GPIO core has registered the fact that the firmware
+ * configuration indicates that it can be shared by multiple consumers and is
+ * in charge of arbitrating the access.
+ */
+bool gpiod_is_shared(const struct gpio_desc *desc)
+{
+	return test_bit(GPIOD_FLAG_SHARED_PROXY, &desc->flags);
+}
+EXPORT_SYMBOL_GPL(gpiod_is_shared);
 /**
  * gpiod_to_irq() - return the IRQ corresponding to a GPIO
  * @desc: gpio whose IRQ will be returned (already requested)
 	scoped_guard(srcu, &gpio_devices_srcu) {
 		desc = gpiod_fwnode_lookup(fwnode, consumer, con_id, idx,
 					   &flags, &lookupflags);
+		if (!IS_ERR_OR_NULL(desc) &&
+		    test_bit(GPIOD_FLAG_SHARED, &desc->flags)) {
+			/*
+			 * We're dealing with a GPIO shared by multiple
+			 * consumers. This is the moment to add the machine
+			 * lookup table for the proxy device as previously
+			 * we only knew the consumer's fwnode.
+			 */
+			ret = gpio_shared_add_proxy_lookup(consumer, lookupflags);
+			if (ret)
+				return ERR_PTR(ret);
+			/* Trigger platform lookup for shared GPIO proxy. */
+			desc = ERR_PTR(-ENOENT);
+			/* Trigger it even for fwnode-only gpiod_get(). */
+			platform_lookup_allowed = true;
+		}
 		if (gpiod_not_found(desc) && platform_lookup_allowed) {
 			/*
 			 * Either we are not using DT or ACPI, or their lookup
-			 * did not return a result. In that case, use platform
+			 * did not return a result or this is a shared GPIO. In
-			 * lookup as a fallback.
+			 * that case, use platform lookup as a fallback.
 			 */
 			dev_dbg(consumer,
 				"using lookup tables for GPIO lookup\n");
 			return ERR_PTR(ret);
 		/*
-		 * This happens when there are several consumers for
+		 * This happens when there are several consumers for the same
-		 * the same GPIO line: we just return here without
+		 * GPIO line: we just return here without further
-		 * further initialization. It is a bit of a hack.
+		 * initialization. It's a hack introduced long ago to support
-		 * This is necessary to support fixed regulators.
+		 * fixed regulators. We now have a better solution with
+		 * automated scanning where affected platforms just need to
+		 * select the provided Kconfig option.
 		 *
-		 * FIXME: Make this more sane and safe.
+		 * FIXME: Remove the GPIOD_FLAGS_BIT_NONEXCLUSIVE flag after
+		 * making sure all platforms use the new mechanism.
 		 */
-		dev_info(consumer, "nonexclusive access to GPIO for %s\n", name);
+		dev_info(consumer,
+			 "nonexclusive access to GPIO for %s, consider updating your code to using gpio-shared-proxy\n",
+			 name);
 		return desc;
 	}

drivers/gpio/gpiolib.h+2−0

@@ -204,6 +204,8 @@ struct gpio_desc { · 203 unmodified lines
204	#define GPIOD_FLAG_EDGE_FALLING 17 /* GPIO CDEV detects falling edge events */	204	#define GPIOD_FLAG_EDGE_FALLING 17 /* GPIO CDEV detects falling edge events */
205	#define GPIOD_FLAG_EVENT_CLOCK_REALTIME 18 /* GPIO CDEV reports REALTIME timestamps in events */	205	#define GPIOD_FLAG_EVENT_CLOCK_REALTIME 18 /* GPIO CDEV reports REALTIME timestamps in events */
206	#define GPIOD_FLAG_EVENT_CLOCK_HTE 19 /* GPIO CDEV reports hardware timestamps in events */	206	#define GPIOD_FLAG_EVENT_CLOCK_HTE 19 /* GPIO CDEV reports hardware timestamps in events */
		207	#define GPIOD_FLAG_SHARED 20 /* GPIO is shared by multiple consumers */
		208	#define GPIOD_FLAG_SHARED_PROXY 21 /* GPIO is a virtual proxy to a physically shared pin. */
207		209
208	/* Connection label */	210	/* Connection label */
209	struct gpio_desc_label __rcu *label;	211	struct gpio_desc_label __rcu *label;

drivers/input/misc/arizona-haptics.c+5−9

 						       struct arizona_haptics,
 						       work);
 	struct arizona *arizona = haptics->arizona;
-	struct snd_soc_component *component =
-		snd_soc_dapm_to_component(arizona->dapm);
 	int ret;
 	if (!haptics->arizona->dapm) {
 			return;
 		}
-		ret = snd_soc_component_enable_pin(component, "HAPTICS");
+		ret = snd_soc_dapm_enable_pin(arizona->dapm, "HAPTICS");
 		if (ret != 0) {
 			dev_err(arizona->dev, "Failed to start HAPTICS: %d\n",
 				ret);
 		}
 	} else {
 		/* This disable sequence will be a noop if already enabled */
-		ret = snd_soc_component_disable_pin(component, "HAPTICS");
+		ret = snd_soc_dapm_disable_pin(arizona->dapm, "HAPTICS");
 		if (ret != 0) {
 			dev_err(arizona->dev, "Failed to disable HAPTICS: %d\n",
 				ret);
 static void arizona_haptics_close(struct input_dev *input)
 {
 	struct arizona_haptics *haptics = input_get_drvdata(input);
-	struct snd_soc_component *component;
+	struct snd_soc_dapm_context *dapm = haptics->arizona->dapm;
 	cancel_work_sync(&haptics->work);
-	if (haptics->arizona->dapm) {
+	if (dapm)
-		component = snd_soc_dapm_to_component(haptics->arizona->dapm);
+		snd_soc_dapm_disable_pin(dapm, "HAPTICS");
-		snd_soc_component_disable_pin(component, "HAPTICS");
-	}
 }
 static int arizona_haptics_probe(struct platform_device *pdev)

drivers/regulator/arizona-micsupp.c+2−6

 	struct arizona_micsupp *micsupp =
 		container_of(work, struct arizona_micsupp, check_cp_work);
 	struct snd_soc_dapm_context *dapm = *micsupp->dapm;
-	struct snd_soc_component *component;
 	const struct regulator_desc *desc = micsupp->desc;
 	unsigned int val;
 	int ret;
 	}
 	if (dapm) {
-		component = snd_soc_dapm_to_component(dapm);
 		if ((val & (desc->enable_mask | desc->bypass_mask)) ==
 		    desc->enable_mask)
-			snd_soc_component_force_enable_pin(component,
+			snd_soc_dapm_force_enable_pin(dapm, "MICSUPP");
-							   "MICSUPP");
 		else
-			snd_soc_component_disable_pin(component, "MICSUPP");
+			snd_soc_dapm_disable_pin(dapm, "MICSUPP");
 		snd_soc_dapm_sync(dapm);
 	}

drivers/staging/greybus/audio_codec.c+11−5

 {
 	int ret;
 	struct snd_soc_component *comp;
+	struct snd_soc_dapm_context *dapm;
 	struct gbaudio_jack *jack = NULL;
 	if (!gbcodec) {
 	}
 	comp = gbcodec->component;
+	dapm = snd_soc_component_to_dapm(comp);
 	mutex_lock(&gbcodec->register_mutex);
 	}
 	if (module->dapm_widgets)
-		snd_soc_dapm_new_controls(&comp->dapm, module->dapm_widgets,
+		snd_soc_dapm_new_controls(dapm, module->dapm_widgets,
 					  module->num_dapm_widgets);
 	if (module->controls)
 		snd_soc_add_component_controls(comp, module->controls,
 					       module->num_controls);
 	if (module->dapm_routes)
-		snd_soc_dapm_add_routes(&comp->dapm, module->dapm_routes,
+		snd_soc_dapm_add_routes(dapm, module->dapm_routes,
 					module->num_dapm_routes);
 	/* card already instantiated, create widgets here only */
 	if (comp->card->instantiated) {
-		gbaudio_dapm_link_component_dai_widgets(comp->card, &comp->dapm);
+		gbaudio_dapm_link_component_dai_widgets(comp->card, dapm);
 #ifdef CONFIG_SND_JACK
 		/*
 		 * register jack devices for this module
 #endif
 	if (module->dapm_routes) {
+		struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(comp);
 		dev_dbg(comp->dev, "Removing %d routes\n",
 			module->num_dapm_routes);
-		snd_soc_dapm_del_routes(&comp->dapm, module->dapm_routes,
+		snd_soc_dapm_del_routes(dapm, module->dapm_routes,
 					module->num_dapm_routes);
 	}
 	if (module->controls) {
 						  module->num_controls);
 	}
 	if (module->dapm_widgets) {
+		struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(comp);
 		dev_dbg(comp->dev, "Removing %d widgets\n",
 			module->num_dapm_widgets);
-		gbaudio_dapm_free_controls(&comp->dapm, module->dapm_widgets,
+		gbaudio_dapm_free_controls(dapm, module->dapm_widgets,
 					   module->num_dapm_widgets);
 	}

drivers/staging/greybus/audio_helper.c+5−4

 {
 	int i;
 	struct snd_soc_dapm_widget *w, *tmp_w;
+	struct snd_soc_card *card = snd_soc_dapm_to_card(dapm);
-	mutex_lock(&dapm->card->dapm_mutex);
+	mutex_lock(&card->dapm_mutex);
 	for (i = 0; i < num; i++) {
 		/* below logic can be optimized to identify widget pointer */
 		w = NULL;
-		list_for_each_entry(tmp_w, &dapm->card->widgets, list) {
+		list_for_each_entry(tmp_w, &card->widgets, list) {
 			if (tmp_w->dapm == dapm &&
 			    !strcmp(tmp_w->name, widget->name)) {
 				w = tmp_w;
 			}
 		}
 		if (!w) {
-			dev_err(dapm->dev, "%s: widget not found\n",
+			dev_err(card->dev, "%s: widget not found\n",
 				widget->name);
 			widget++;
 			continue;
 		widget++;
 		gbaudio_dapm_free_widget(w);
 	}
-	mutex_unlock(&dapm->card->dapm_mutex);
+	mutex_unlock(&card->dapm_mutex);
 	return 0;
 }

drivers/staging/greybus/audio_topology.c+12−12

@@ -163,7 +163,7 @@ static int gbcodec_mixer_ctl_info(struct snd_kcontrol *kcontrol, · 162 unmodified lines
163	struct gbaudio_ctl_pvt *data;	163	struct gbaudio_ctl_pvt *data;
164	struct gb_audio_ctl_elem_info *info;	164	struct gb_audio_ctl_elem_info *info;
165	struct gbaudio_module_info *module;	165	struct gbaudio_module_info *module;
166	struct snd_soc_component *comp = snd_soc_kcontrol_component(kcontrol);	166	struct snd_soc_component *comp = snd_kcontrol_chip(kcontrol);
167	struct gbaudio_codec_info *gbcodec = snd_soc_component_get_drvdata(comp);	167	struct gbaudio_codec_info *gbcodec = snd_soc_component_get_drvdata(comp);
168		168
169	dev_dbg(comp->dev, "Entered %s:%s\n", __func__, kcontrol->id.name);	169	dev_dbg(comp->dev, "Entered %s:%s\n", __func__, kcontrol->id.name);
@@ -214,7 +214,7 @@ static int gbcodec_mixer_ctl_get(struct snd_kcontrol *kcontrol, · 44 unmodified lines
214	struct gbaudio_ctl_pvt *data;	214	struct gbaudio_ctl_pvt *data;
215	struct gb_audio_ctl_elem_value gbvalue;	215	struct gb_audio_ctl_elem_value gbvalue;
216	struct gbaudio_module_info *module;	216	struct gbaudio_module_info *module;
217	struct snd_soc_component *comp = snd_soc_kcontrol_component(kcontrol);	217	struct snd_soc_component *comp = snd_kcontrol_chip(kcontrol);
218	struct gbaudio_codec_info *gb = snd_soc_component_get_drvdata(comp);	218	struct gbaudio_codec_info *gb = snd_soc_component_get_drvdata(comp);
219	struct gb_bundle *bundle;	219	struct gb_bundle *bundle;
220		220
@@ -276,7 +276,7 @@ static int gbcodec_mixer_ctl_put(struct snd_kcontrol *kcontrol, · 55 unmodified lines
276	struct gbaudio_ctl_pvt *data;	276	struct gbaudio_ctl_pvt *data;
277	struct gb_audio_ctl_elem_value gbvalue;	277	struct gb_audio_ctl_elem_value gbvalue;
278	struct gbaudio_module_info *module;	278	struct gbaudio_module_info *module;
279	struct snd_soc_component *comp = snd_soc_kcontrol_component(kcontrol);	279	struct snd_soc_component *comp = snd_kcontrol_chip(kcontrol);
280	struct gbaudio_codec_info *gb = snd_soc_component_get_drvdata(comp);	280	struct gbaudio_codec_info *gb = snd_soc_component_get_drvdata(comp);
281	struct gb_bundle *bundle;	281	struct gb_bundle *bundle;
282		282
@@ -380,7 +380,7 @@ static int gbcodec_mixer_dapm_ctl_get(struct snd_kcontrol *kcontrol, · 97 unmodified lines
380	struct gbaudio_module_info *module;	380	struct gbaudio_module_info *module;
381	struct snd_soc_dapm_widget_list *wlist = snd_kcontrol_chip(kcontrol);	381	struct snd_soc_dapm_widget_list *wlist = snd_kcontrol_chip(kcontrol);
382	struct snd_soc_dapm_widget *widget = wlist->widgets[0];	382	struct snd_soc_dapm_widget *widget = wlist->widgets[0];
383	struct device *codec_dev = widget->dapm->dev;	383	struct device *codec_dev = snd_soc_dapm_to_dev(widget->dapm);
384	struct gbaudio_codec_info *gb = dev_get_drvdata(codec_dev);	384	struct gbaudio_codec_info *gb = dev_get_drvdata(codec_dev);
385	struct gb_bundle *bundle;	385	struct gb_bundle *bundle;
386		386
@@ -393,7 +393,7 @@ static int gbcodec_mixer_dapm_ctl_get(struct snd_kcontrol *kcontrol, · 6 unmodified lines
393	bundle = to_gb_bundle(module->dev);	393	bundle = to_gb_bundle(module->dev);
394		394
395	if (data->vcount == 2)	395	if (data->vcount == 2)
396	dev_warn(widget->dapm->dev,	396	dev_warn(codec_dev,
397	"GB: Control '%s' is stereo, which is not supported\n",	397	"GB: Control '%s' is stereo, which is not supported\n",
398	kcontrol->id.name);	398	kcontrol->id.name);
399		399
@@ -429,7 +429,7 @@ static int gbcodec_mixer_dapm_ctl_put(struct snd_kcontrol *kcontrol, · 29 unmodified lines
429	struct gbaudio_module_info *module;	429	struct gbaudio_module_info *module;
430	struct snd_soc_dapm_widget_list *wlist = snd_kcontrol_chip(kcontrol);	430	struct snd_soc_dapm_widget_list *wlist = snd_kcontrol_chip(kcontrol);
431	struct snd_soc_dapm_widget *widget = wlist->widgets[0];	431	struct snd_soc_dapm_widget *widget = wlist->widgets[0];
432	struct device *codec_dev = widget->dapm->dev;	432	struct device *codec_dev = snd_soc_dapm_to_dev(widget->dapm);
433	struct gbaudio_codec_info *gb = dev_get_drvdata(codec_dev);	433	struct gbaudio_codec_info *gb = dev_get_drvdata(codec_dev);
434	struct gb_bundle *bundle;	434	struct gb_bundle *bundle;
435		435
@@ -443,7 +443,7 @@ static int gbcodec_mixer_dapm_ctl_put(struct snd_kcontrol *kcontrol, · 7 unmodified lines
443	bundle = to_gb_bundle(module->dev);	443	bundle = to_gb_bundle(module->dev);
444		444
445	if (data->vcount == 2)	445	if (data->vcount == 2)
446	dev_warn(widget->dapm->dev,	446	dev_warn(codec_dev,
447	"GB: Control '%s' is stereo, which is not supported\n",	447	"GB: Control '%s' is stereo, which is not supported\n",
448	kcontrol->id.name);	448	kcontrol->id.name);
449		449
@@ -543,7 +543,7 @@ static int gbcodec_enum_ctl_get(struct snd_kcontrol *kcontrol, · 93 unmodified lines
543	struct snd_ctl_elem_value *ucontrol)	543	struct snd_ctl_elem_value *ucontrol)
544	{	544	{
545	int ret, ctl_id;	545	int ret, ctl_id;
546	struct snd_soc_component *comp = snd_soc_kcontrol_component(kcontrol);	546	struct snd_soc_component *comp = snd_kcontrol_chip(kcontrol);
547	struct gbaudio_codec_info *gb = snd_soc_component_get_drvdata(comp);	547	struct gbaudio_codec_info *gb = snd_soc_component_get_drvdata(comp);
548	struct soc_enum e = (struct soc_enum )kcontrol->private_value;	548	struct soc_enum e = (struct soc_enum )kcontrol->private_value;
549	struct gb_audio_ctl_elem_value gbvalue;	549	struct gb_audio_ctl_elem_value gbvalue;
@@ -588,7 +588,7 @@ static int gbcodec_enum_ctl_put(struct snd_kcontrol *kcontrol, · 38 unmodified lines
588	struct snd_ctl_elem_value *ucontrol)	588	struct snd_ctl_elem_value *ucontrol)
589	{	589	{
590	int ret, ctl_id;	590	int ret, ctl_id;
591	struct snd_soc_component *comp = snd_soc_kcontrol_component(kcontrol);	591	struct snd_soc_component *comp = snd_kcontrol_chip(kcontrol);
592	struct gbaudio_codec_info *gb = snd_soc_component_get_drvdata(comp);	592	struct gbaudio_codec_info *gb = snd_soc_component_get_drvdata(comp);
593	struct soc_enum e = (struct soc_enum )kcontrol->private_value;	593	struct soc_enum e = (struct soc_enum )kcontrol->private_value;
594	struct gb_audio_ctl_elem_value gbvalue;	594	struct gb_audio_ctl_elem_value gbvalue;
@@ -712,7 +712,7 @@ static int gbcodec_enum_dapm_ctl_get(struct snd_kcontrol *kcontrol, · 117 unmodified lines
712	struct snd_soc_dapm_widget *widget = wlist->widgets[0];	712	struct snd_soc_dapm_widget *widget = wlist->widgets[0];
713	struct gbaudio_module_info *module;	713	struct gbaudio_module_info *module;
714	struct gb_audio_ctl_elem_value gbvalue;	714	struct gb_audio_ctl_elem_value gbvalue;
715	struct device *codec_dev = widget->dapm->dev;	715	struct device *codec_dev = snd_soc_dapm_to_dev(widget->dapm);
716	struct gbaudio_codec_info *gb = dev_get_drvdata(codec_dev);	716	struct gbaudio_codec_info *gb = dev_get_drvdata(codec_dev);
717	struct soc_enum e = (struct soc_enum )kcontrol->private_value;	717	struct soc_enum e = (struct soc_enum )kcontrol->private_value;
718	struct gb_bundle *bundle;	718	struct gb_bundle *bundle;
@@ -759,7 +759,7 @@ static int gbcodec_enum_dapm_ctl_put(struct snd_kcontrol *kcontrol, · 40 unmodified lines
759	struct snd_soc_dapm_widget *widget = wlist->widgets[0];	759	struct snd_soc_dapm_widget *widget = wlist->widgets[0];
760	struct gb_audio_ctl_elem_value gbvalue;	760	struct gb_audio_ctl_elem_value gbvalue;
761	struct gbaudio_module_info *module;	761	struct gbaudio_module_info *module;
762	struct device *codec_dev = widget->dapm->dev;	762	struct device *codec_dev = snd_soc_dapm_to_dev(widget->dapm);
763	struct gbaudio_codec_info *gb = dev_get_drvdata(codec_dev);	763	struct gbaudio_codec_info *gb = dev_get_drvdata(codec_dev);
764	struct soc_enum e = (struct soc_enum )kcontrol->private_value;	764	struct soc_enum e = (struct soc_enum )kcontrol->private_value;
765	struct gb_bundle *bundle;	765	struct gb_bundle *bundle;
@@ -924,7 +924,7 @@ static int gbaudio_widget_event(struct snd_soc_dapm_widget *w, · 158 unmodified lines
924	{	924	{
925	int wid;	925	int wid;
926	int ret;	926	int ret;
927	struct device *codec_dev = w->dapm->dev;	927	struct device *codec_dev = snd_soc_dapm_to_dev(w->dapm);
928	struct gbaudio_codec_info *gbcodec = dev_get_drvdata(codec_dev);	928	struct gbaudio_codec_info *gbcodec = dev_get_drvdata(codec_dev);
929	struct gbaudio_module_info *module;	929	struct gbaudio_module_info *module;
930	struct gb_bundle *bundle;	930	struct gb_bundle *bundle;

include/linux/firmware/cirrus/cs_dsp.h+3−3

@@ -102,7 +102,7 @@ struct cs_dsp_coeff_ctl { · 101 unmodified lines
102	const char *subname;	102	const char *subname;
103	unsigned int subname_len;	103	unsigned int subname_len;
104	unsigned int offset;	104	unsigned int offset;
105	size_t len;	105	unsigned int len;
106	unsigned int type;	106	unsigned int type;
107	unsigned int flags;	107	unsigned int flags;
108	unsigned int set:1;	108	unsigned int set:1;
@@ -188,8 +188,8 @@ struct cs_dsp { · 79 unmodified lines
188		188
189	#ifdef CONFIG_DEBUG_FS	189	#ifdef CONFIG_DEBUG_FS
190	struct dentry *debugfs_root;	190	struct dentry *debugfs_root;
191	char *wmfw_file_name;	191	const char *wmfw_file_name;
192	char *bin_file_name;	192	const char *bin_file_name;
193	#endif	193	#endif
194	};	194	};
195		195

include/linux/firmware/cirrus/cs_dsp_test_utils.h+9−9

@@ -26,21 +26,21 @@ struct cs_dsp_test { · 25 unmodified lines
26		26
27	struct cs_dsp_test_local *local;	27	struct cs_dsp_test_local *local;
28		28
29	/* Following members are private */	29	/* private: Following members are private */
30	bool saw_bus_write;	30	bool saw_bus_write;
31	};	31	};
32		32
33	/**	33	/**
34	* struct cs_dsp_mock_alg_def - Info for creating a mock algorithm entry.	34	* struct cs_dsp_mock_alg_def - Info for creating a mock algorithm entry.
35	*	35	*
36	* @id Algorithm ID.	36	* @id: Algorithm ID.
37	* @ver; Algorithm version.	37	* @ver: Algorithm version.
38	* @xm_base_words XM base address in DSP words.	38	* @xm_base_words: XM base address in DSP words.
39	* @xm_size_words XM size in DSP words.	39	* @xm_size_words: XM size in DSP words.
40	* @ym_base_words YM base address in DSP words.	40	* @ym_base_words: YM base address in DSP words.
41	* @ym_size_words YM size in DSP words.	41	* @ym_size_words: YM size in DSP words.
42	* @zm_base_words ZM base address in DSP words.	42	* @zm_base_words: ZM base address in DSP words.
43	* @zm_size_words ZM size in DSP words.	43	* @zm_size_words: ZM size in DSP words.
44	*/	44	*/
45	struct cs_dsp_mock_alg_def {	45	struct cs_dsp_mock_alg_def {
46	unsigned int id;	46	unsigned int id;

include/linux/gpio/consumer.h+9−0

 int gpiod_to_irq(const struct gpio_desc *desc);
 int gpiod_set_consumer_name(struct gpio_desc *desc, const char *name);
+bool gpiod_is_shared(const struct gpio_desc *desc);
 /* Convert between the old gpio_ and new gpiod_ interfaces */
 struct gpio_desc *gpio_to_desc(unsigned gpio);
 int desc_to_gpio(const struct gpio_desc *desc);
 	return -EINVAL;
 }
+static inline bool gpiod_is_shared(const struct gpio_desc *desc)
+{
+	/* GPIO can never have been requested */
+	WARN_ON(desc);
+	return false;
+}
 static inline struct gpio_desc *gpio_to_desc(unsigned gpio)
 {
 	return NULL;

include/linux/pci_ids.h+1−0

@@ -3075,6 +3075,7 @@ · 3074 unmodified lines
3075	#define PCI_DEVICE_ID_INTEL_5100_22 0x65f6	3075	#define PCI_DEVICE_ID_INTEL_5100_22 0x65f6
3076	#define PCI_DEVICE_ID_INTEL_IOAT_SCNB 0x65ff	3076	#define PCI_DEVICE_ID_INTEL_IOAT_SCNB 0x65ff
3077	#define PCI_DEVICE_ID_INTEL_HDA_FCL 0x67a8	3077	#define PCI_DEVICE_ID_INTEL_HDA_FCL 0x67a8
		3078	#define PCI_DEVICE_ID_INTEL_HDA_NVL_S 0x6e50
3078	#define PCI_DEVICE_ID_INTEL_82371SB_0 0x7000	3079	#define PCI_DEVICE_ID_INTEL_82371SB_0 0x7000
3079	#define PCI_DEVICE_ID_INTEL_82371SB_1 0x7010	3080	#define PCI_DEVICE_ID_INTEL_82371SB_1 0x7010
3080	#define PCI_DEVICE_ID_INTEL_82371SB_2 0x7020	3081	#define PCI_DEVICE_ID_INTEL_82371SB_2 0x7020

include/linux/regmap.h+11−10

 				 const struct regmap_config *config,
 				 struct lock_class_key *lock_key,
 				 const char *lock_name);
-struct regmap *__regmap_init_sdw_mbq(struct sdw_slave *sdw,
+struct regmap *__regmap_init_sdw_mbq(struct device *dev, struct sdw_slave *sdw,
 				     const struct regmap_config *config,
 				     const struct regmap_sdw_mbq_cfg *mbq_config,
 				     struct lock_class_key *lock_key,
 				 const struct regmap_config *config,
 				 struct lock_class_key *lock_key,
 				 const char *lock_name);
-struct regmap *__devm_regmap_init_sdw_mbq(struct sdw_slave *sdw,
+struct regmap *__devm_regmap_init_sdw_mbq(struct device *dev, struct sdw_slave *sdw,
 					  const struct regmap_config *config,
 					  const struct regmap_sdw_mbq_cfg *mbq_config,
 					  struct lock_class_key *lock_key,
  */
 #define regmap_init_sdw_mbq(sdw, config)					\
 	__regmap_lockdep_wrapper(__regmap_init_sdw_mbq, #config,		\
-				sdw, config, NULL)
+				&sdw->dev, sdw, config, NULL)
 /**
  * regmap_init_sdw_mbq_cfg() - Initialise MBQ SDW register map with config
  * to a struct regmap. The regmap will be automatically freed by the
  * device management code.
  */
-#define regmap_init_sdw_mbq_cfg(sdw, config, mbq_config)		\
+#define regmap_init_sdw_mbq_cfg(dev, sdw, config, mbq_config)		\
 	__regmap_lockdep_wrapper(__regmap_init_sdw_mbq, #config,	\
-				sdw, config, mbq_config)
+				dev, sdw, config, mbq_config)
 /**
  * regmap_init_spi_avmm() - Initialize register map for Intel SPI Slave
  */
 #define devm_regmap_init_sdw_mbq(sdw, config)			\
 	__regmap_lockdep_wrapper(__devm_regmap_init_sdw_mbq, #config,   \
-				sdw, config, NULL)
+				&sdw->dev, sdw, config, NULL)
 /**
  * devm_regmap_init_sdw_mbq_cfg() - Initialise managed MBQ SDW register map with config
  *
- * @sdw: Device that will be interacted with
+ * @dev: Device that will be interacted with
+ * @sdw: SoundWire Device that will be interacted with
  * @config: Configuration for register map
  * @mbq_config: Properties for the MBQ registers
  *
  * to a struct regmap. The regmap will be automatically freed by the
  * device management code.
  */
-#define devm_regmap_init_sdw_mbq_cfg(sdw, config, mbq_config)	\
+#define devm_regmap_init_sdw_mbq_cfg(dev, sdw, config, mbq_config)	\
-	__regmap_lockdep_wrapper(__devm_regmap_init_sdw_mbq,	\
+	__regmap_lockdep_wrapper(__devm_regmap_init_sdw_mbq,		\
-				#config, sdw, config, mbq_config)
+				#config, dev, sdw, config, mbq_config)
 /**
  * devm_regmap_init_slimbus() - Initialise managed register map

include/linux/soundwire/sdw_registers.h+2−0

@@ -355,4 +355,6 @@ · 354 unmodified lines
355	/* Check the reserved and fixed bits in address */	355	/* Check the reserved and fixed bits in address */
356	#define SDW_SDCA_VALID_CTL(reg) (((reg) & (GENMASK(31, 25) \| BIT(18) \| BIT(13))) == BIT(30))	356	#define SDW_SDCA_VALID_CTL(reg) (((reg) & (GENMASK(31, 25) \| BIT(18) \| BIT(13))) == BIT(30))
357		357
		358	#define SDW_SDCA_MAX_REGISTER 0x47FFFFFF
		359
358	#endif /* __SDW_REGISTERS_H */	360	#endif /* __SDW_REGISTERS_H */

include/linux/string.h+18−0

@@ -562,4 +562,22 @@ static inline bool strstarts(const char str, const char prefix) · 561 unmodified lines
562	return strncmp(str, prefix, strlen(prefix)) == 0;	562	return strncmp(str, prefix, strlen(prefix)) == 0;
563	}	563	}
564		564
		565	/**
		566	* strends - Check if a string ends with another string.
		567	* @str - NULL-terminated string to check against @suffix
		568	* @suffix - NULL-terminated string defining the suffix to look for in @str
		569	*
		570	* Returns:
		571	* True if @str ends with @suffix. False in all other cases.
		572	*/
		573	static inline bool strends(const char str, const char suffix)
		574	{
		575	unsigned int str_len = strlen(str), suffix_len = strlen(suffix);
		576
		577	if (str_len < suffix_len)
		578	return false;
		579
		580	return !(strcmp(str + str_len - suffix_len, suffix));
		581	}
		582
565	#endif /* _LINUX_STRING_H_ */	583	#endif /* _LINUX_STRING_H_ */

include/sound/cs-amp-lib.h+24−1

@@ -47,21 +47,44 @@ struct cirrus_amp_cal_controls { · 46 unmodified lines
47	int cs_amp_write_cal_coeffs(struct cs_dsp *dsp,	47	int cs_amp_write_cal_coeffs(struct cs_dsp *dsp,
48	const struct cirrus_amp_cal_controls *controls,	48	const struct cirrus_amp_cal_controls *controls,
49	const struct cirrus_amp_cal_data *data);	49	const struct cirrus_amp_cal_data *data);
		50	int cs_amp_read_cal_coeffs(struct cs_dsp *dsp,
		51	const struct cirrus_amp_cal_controls *controls,
		52	struct cirrus_amp_cal_data *data);
		53	int cs_amp_write_ambient_temp(struct cs_dsp *dsp,
		54	const struct cirrus_amp_cal_controls *controls,
		55	u32 temp);
50	int cs_amp_get_efi_calibration_data(struct device *dev, u64 target_uid, int amp_index,	56	int cs_amp_get_efi_calibration_data(struct device *dev, u64 target_uid, int amp_index,
51	struct cirrus_amp_cal_data *out_data);	57	struct cirrus_amp_cal_data *out_data);
		58	int cs_amp_set_efi_calibration_data(struct device *dev, int amp_index, int num_amps,
		59	const struct cirrus_amp_cal_data *in_data);
52	int cs_amp_get_vendor_spkid(struct device *dev);	60	int cs_amp_get_vendor_spkid(struct device *dev);
		61	struct dentry cs_amp_create_debugfs(struct device dev);
		62
		63	static inline u64 cs_amp_cal_target_u64(const struct cirrus_amp_cal_data *data)
		64	{
		65	return ((u64)data->calTarget[1] << 32) \| data->calTarget[0];
		66	}
53		67
54	struct cs_amp_test_hooks {	68	struct cs_amp_test_hooks {
55	efi_status_t (get_efi_variable)(efi_char16_t name,	69	efi_status_t (get_efi_variable)(efi_char16_t name,
56	efi_guid_t *guid,	70	efi_guid_t *guid,
		71	u32 *returned_attr,
57	unsigned long *size,	72	unsigned long *size,
58	void *buf);	73	void *buf);
		74	efi_status_t (set_efi_variable)(efi_char16_t name,
		75	efi_guid_t *guid,
		76	u32 attr,
		77	unsigned long size,
		78	void *buf);
59		79
60	int (write_cal_coeff)(struct cs_dsp dsp,	80	int (write_cal_coeff)(struct cs_dsp dsp,
61	const struct cirrus_amp_cal_controls *controls,	81	const struct cirrus_amp_cal_controls *controls,
62	const char *ctl_name, u32 val);	82	const char *ctl_name, u32 val);
63	};
64		83
		84	int (read_cal_coeff)(struct cs_dsp dsp,
		85	const struct cirrus_amp_cal_controls *controls,
		86	const char ctl_name, u32 val);
		87	};
65	extern const struct cs_amp_test_hooks * const cs_amp_test_hooks;	88	extern const struct cs_amp_test_hooks * const cs_amp_test_hooks;
66		89
67	#endif /* CS_AMP_LIB_H */	90	#endif /* CS_AMP_LIB_H */

include/sound/cs35l56.h+50−0

 #ifndef __CS35L56_H
 #define __CS35L56_H
+#include <linux/debugfs.h>
 #include <linux/firmware/cirrus/cs_dsp.h>
 #include <linux/regulator/consumer.h>
 #include <linux/regmap.h>
 #include <linux/spi/spi.h>
 #include <sound/cs-amp-lib.h>
+struct snd_ctl_elem_value;
 #define CS35L56_DEVID					0x0000000
 #define CS35L56_REVID					0x0000004
 #define CS35L56_RELID					0x000000C
 #define CS35L56_IRQ1_MASK_8				0x000E0AC
 #define CS35L56_IRQ1_MASK_18				0x000E0D4
 #define CS35L56_IRQ1_MASK_20				0x000E0DC
+#define CS35L56_MIXER_NGATE_CH1_CFG			0x0010004
+#define CS35L56_MIXER_NGATE_CH2_CFG			0x0010008
 #define CS35L56_DSP_MBOX_1_RAW				0x0011000
 #define CS35L56_DSP_VIRTUAL1_MBOX_1			0x0011020
 #define CS35L56_DSP_VIRTUAL1_MBOX_2			0x0011024
 /* IRQ1_EINT_8 */
 #define CS35L56_TEMP_ERR_EINT1_MASK			0x80000000
+/* MIXER_NGATE_CHn_CFG */
+#define CS35L56_AUX_NGATE_CHn_EN			0x00000001
 /* Mixer input sources */
 #define CS35L56_INPUT_SRC_NONE				0x00
 #define CS35L56_INPUT_SRC_ASP1RX1			0x08
 #define CS35L56_MBOX_CMD_AUDIO_PLAY			0x0B000001
 #define CS35L56_MBOX_CMD_AUDIO_PAUSE			0x0B000002
 #define CS35L56_MBOX_CMD_AUDIO_REINIT			0x0B000003
+#define CS35L56_MBOX_CMD_AUDIO_CALIBRATION		0x0B000006
 #define CS35L56_MBOX_CMD_HIBERNATE_NOW			0x02000001
 #define CS35L56_MBOX_CMD_WAKEUP				0x02000002
 #define CS35L56_MBOX_CMD_PREVENT_AUTO_HIBERNATE		0x02000003
 #define CS35L56_PS3_POLL_US				500
 #define CS35L56_PS3_TIMEOUT_US				300000
+#define CS35L56_CAL_STATUS_SUCCESS			1
+#define CS35L56_CAL_STATUS_OUT_OF_RANGE			3
+#define CS35L56_CAL_SET_STATUS_UNKNOWN			0
+#define CS35L56_CAL_SET_STATUS_DEFAULT			1
+#define CS35L56_CAL_SET_STATUS_SET			2
 #define CS35L56_CONTROL_PORT_READY_US			2200
 #define CS35L56_HALO_STATE_POLL_US			1000
 #define CS35L56_HALO_STATE_TIMEOUT_US			250000
 #define CS35L56_RESET_PULSE_MIN_US			1100
 #define CS35L56_WAKE_HOLD_TIME_US			1000
+#define CS35L56_CALIBRATION_POLL_US			(100 * USEC_PER_MSEC)
+#define CS35L56_CALIBRATION_TIMEOUT_US			(5 * USEC_PER_SEC)
 #define CS35L56_SDW1_PLAYBACK_PORT			1
 #define CS35L56_SDW1_CAPTURE_PORT			3
 	unsigned int posture_number;
 };
+struct cs35l56_cal_debugfs_fops {
+	const struct debugfs_short_fops calibrate;
+	const struct debugfs_short_fops cal_temperature;
+	const struct debugfs_short_fops cal_data;
+};
 struct cs35l56_base {
 	struct device *dev;
 	struct regmap *regmap;
+	struct cs_dsp *dsp;
 	int irq;
 	struct mutex irq_lock;
 	u8 type;
 	bool can_hibernate;
 	bool cal_data_valid;
 	s8 cal_index;
+	u8 num_amps;
 	struct cirrus_amp_cal_data cal_data;
 	struct gpio_desc *reset_gpio;
 	struct cs35l56_spi_payload *spi_payload_buf;
 	const struct cs35l56_fw_reg *fw_reg;
 	const struct cirrus_amp_cal_controls *calibration_controls;
+	struct dentry *debugfs;
+	u64 silicon_uid;
 };
 static inline bool cs35l56_is_otp_register(unsigned int reg)
 extern const struct regmap_config cs35l63_regmap_sdw;
 extern const struct cirrus_amp_cal_controls cs35l56_calibration_controls;
+extern const char * const cs35l56_cal_set_status_text[3];
 extern const char * const cs35l56_tx_input_texts[CS35L56_NUM_INPUT_SRC];
 extern const unsigned int cs35l56_tx_input_values[CS35L56_NUM_INPUT_SRC];
 int cs35l56_runtime_resume_common(struct cs35l56_base *cs35l56_base, bool is_soundwire);
 void cs35l56_init_cs_dsp(struct cs35l56_base *cs35l56_base, struct cs_dsp *cs_dsp);
 int cs35l56_get_calibration(struct cs35l56_base *cs35l56_base);
+int cs35l56_stash_calibration(struct cs35l56_base *cs35l56_base,
+			      const struct cirrus_amp_cal_data *data);
+ssize_t cs35l56_calibrate_debugfs_write(struct cs35l56_base *cs35l56_base,
+					const char __user *from, size_t count,
+					loff_t *ppos);
+ssize_t cs35l56_cal_ambient_debugfs_write(struct cs35l56_base *cs35l56_base,
+					  const char __user *from, size_t count,
+					  loff_t *ppos);
+ssize_t cs35l56_cal_data_debugfs_read(struct cs35l56_base *cs35l56_base,
+				      char __user *to, size_t count,
+				      loff_t *ppos);
+ssize_t cs35l56_cal_data_debugfs_write(struct cs35l56_base *cs35l56_base,
+				       const char __user *from, size_t count,
+				       loff_t *ppos);
+void cs35l56_create_cal_debugfs(struct cs35l56_base *cs35l56_base,
+				const struct cs35l56_cal_debugfs_fops *fops);
+void cs35l56_remove_cal_debugfs(struct cs35l56_base *cs35l56_base);
+int cs35l56_cal_set_status_get(struct cs35l56_base *cs35l56_base,
+			       struct snd_ctl_elem_value *uvalue);
 int cs35l56_read_prot_status(struct cs35l56_base *cs35l56_base,
 			     bool *fw_missing, unsigned int *fw_version);
+void cs35l56_warn_if_firmware_missing(struct cs35l56_base *cs35l56_base);
 void cs35l56_log_tuning(struct cs35l56_base *cs35l56_base, struct cs_dsp *cs_dsp);
 int cs35l56_hw_init(struct cs35l56_base *cs35l56_base);
 int cs35l56_get_speaker_id(struct cs35l56_base *cs35l56_base);

include/sound/sdca.h+19−0

 #include <linux/types.h>
 #include <linux/kconfig.h>
+struct acpi_table_swft;
+struct fwnode_handle;
 struct sdw_slave;
+struct sdca_dev;
 #define SDCA_MAX_FUNCTION_COUNT 8
 /**
  * struct sdca_function_desc - short descriptor for an SDCA Function
  * @node: firmware node for the Function.
+ * @func_dev: pointer to SDCA function device.
  * @name: Human-readable string.
  * @type: Function topology type.
  * @adr: ACPI address (used for SDCA register access).
  */
 struct sdca_function_desc {
 	struct fwnode_handle *node;
+	struct sdca_dev *func_dev;
 	const char *name;
 	u32 type;
 	u8 adr;
  * @num_functions: Total number of supported SDCA functions. Invalid/unsupported
  * functions will be skipped.
  * @function: Array of function descriptors.
+ * @swft: Pointer to the SWFT table, if available.
  */
 struct sdca_device_data {
 	u32 interface_revision;
 	int num_functions;
 	struct sdca_function_desc function[SDCA_MAX_FUNCTION_COUNT];
+	struct acpi_table_swft *swft;
 };
 enum sdca_quirk {
 #if IS_ENABLED(CONFIG_ACPI) && IS_ENABLED(CONFIG_SND_SOC_SDCA)
 void sdca_lookup_functions(struct sdw_slave *slave);
+void sdca_lookup_swft(struct sdw_slave *slave);
 void sdca_lookup_interface_revision(struct sdw_slave *slave);
 bool sdca_device_quirk_match(struct sdw_slave *slave, enum sdca_quirk quirk);
+int sdca_dev_register_functions(struct sdw_slave *slave);
+void sdca_dev_unregister_functions(struct sdw_slave *slave);
 #else
 static inline void sdca_lookup_functions(struct sdw_slave *slave) {}
+static inline void sdca_lookup_swft(struct sdw_slave *slave) {}
 static inline void sdca_lookup_interface_revision(struct sdw_slave *slave) {}
 static inline bool sdca_device_quirk_match(struct sdw_slave *slave, enum sdca_quirk quirk)
 {
 	return false;
 }
+static inline int sdca_dev_register_functions(struct sdw_slave *slave)
+{
+	return 0;
+}
+static inline void sdca_dev_unregister_functions(struct sdw_slave *slave) {}
 #endif
 #endif

include/sound/sdca_fdl.h+105−0

@@ -0,0 +1,105 @@
	1	/* SPDX-License-Identifier: GPL-2.0 */
	2	/*
	3	* The MIPI SDCA specification is available for public downloads at
	4	* https://www.mipi.org/mipi-sdca-v1-0-download
	5	*
	6	* Copyright (C) 2025 Cirrus Logic, Inc. and
	7	* Cirrus Logic International Semiconductor Ltd.
	8	*/
	9
	10	#ifndef __SDCA_FDL_H__
	11	#define __SDCA_FDL_H__
	12
	13	#include <linux/completion.h>
	14	#include <linux/workqueue.h>
	15
	16	struct device;
	17	struct regmap;
	18	struct sdca_fdl_set;
	19	struct sdca_function_data;
	20	struct sdca_interrupt;
	21	struct sdca_interrupt_info;
	22
	23	/**
	24	* struct fdl_state - FDL state structure to keep data between interrupts
	25	* @begin: Completion indicating the start of an FDL download cycle.
	26	* @done: Completion indicating the end of an FDL download cycle.
	27	* @timeout: Delayed work used for timing out UMP transactions.
	28	* @lock: Mutex to protect between the timeout work and IRQ handlers.
	29	* @interrupt: Pointer to the interrupt struct to which this FDL is attached.
	30	* @set: Pointer to the FDL set currently being downloaded.
	31	* @file_index: Index of the current file being processed.
	32	*/
	33	struct fdl_state {
	34	struct completion begin;
	35	struct completion done;
	36	struct delayed_work timeout;
	37	struct mutex lock;
	38
	39	struct sdca_interrupt *interrupt;
	40	struct sdca_fdl_set *set;
	41	int file_index;
	42	};
	43
	44	#define SDCA_CTL_XU_FDLH_COMPLETE 0
	45	#define SDCA_CTL_XU_FDLH_MORE_FILES SDCA_CTL_XU_FDLH_SET_IN_PROGRESS
	46	#define SDCA_CTL_XU_FDLH_FILE_AVAILABLE (SDCA_CTL_XU_FDLH_TRANSFERRED_FILE \| \
	47	SDCA_CTL_XU_FDLH_SET_IN_PROGRESS)
	48	#define SDCA_CTL_XU_FDLH_MASK (SDCA_CTL_XU_FDLH_TRANSFERRED_CHUNK \| \
	49	SDCA_CTL_XU_FDLH_TRANSFERRED_FILE \| \
	50	SDCA_CTL_XU_FDLH_SET_IN_PROGRESS \| \
	51	SDCA_CTL_XU_FDLH_RESET_ACK \| \
	52	SDCA_CTL_XU_FDLH_REQ_ABORT)
	53
	54	#define SDCA_CTL_XU_FDLD_COMPLETE 0
	55	#define SDCA_CTL_XU_FDLD_FILE_OK (SDCA_CTL_XU_FDLH_TRANSFERRED_FILE \| \
	56	SDCA_CTL_XU_FDLH_SET_IN_PROGRESS \| \
	57	SDCA_CTL_XU_FDLD_ACK_TRANSFER \| \
	58	SDCA_CTL_XU_FDLD_NEEDS_SET)
	59	#define SDCA_CTL_XU_FDLD_MORE_FILES_OK (SDCA_CTL_XU_FDLH_SET_IN_PROGRESS \| \
	60	SDCA_CTL_XU_FDLD_ACK_TRANSFER \| \
	61	SDCA_CTL_XU_FDLD_NEEDS_SET)
	62	#define SDCA_CTL_XU_FDLD_MASK (SDCA_CTL_XU_FDLD_REQ_RESET \| \
	63	SDCA_CTL_XU_FDLD_REQ_ABORT \| \
	64	SDCA_CTL_XU_FDLD_ACK_TRANSFER \| \
	65	SDCA_CTL_XU_FDLD_NEEDS_SET)
	66
	67	#if IS_ENABLED(CONFIG_SND_SOC_SDCA_FDL)
	68
	69	int sdca_fdl_alloc_state(struct sdca_interrupt *interrupt);
	70	int sdca_fdl_process(struct sdca_interrupt *interrupt);
	71	int sdca_fdl_sync(struct device dev, struct sdca_function_data function,
	72	struct sdca_interrupt_info *info);
	73
	74	int sdca_reset_function(struct device dev, struct sdca_function_data function,
	75	struct regmap *regmap);
	76
	77	#else
	78
	79	static inline int sdca_fdl_alloc_state(struct sdca_interrupt *interrupt)
	80	{
	81	return 0;
	82	}
	83
	84	static inline int sdca_fdl_process(struct sdca_interrupt *interrupt)
	85	{
	86	return 0;
	87	}
	88
	89	static inline int sdca_fdl_sync(struct device *dev,
	90	struct sdca_function_data *function,
	91	struct sdca_interrupt_info *info)
	92	{
	93	return 0;
	94	}
	95
	96	static inline int sdca_reset_function(struct device *dev,
	97	struct sdca_function_data *function,
	98	struct regmap *regmap)
	99	{
	100	return 0;
	101	}
	102
	103	#endif // CONFIG_SND_SOC_SDCA_FDL
	104
	105	#endif // __SDCA_FDL_H__

include/sound/sdca_function.h+124−2

@@ -13,6 +13,7 @@ · 12 unmodified lines
13	#include <linux/types.h>	13	#include <linux/types.h>
14	#include <linux/hid.h>	14	#include <linux/hid.h>
15		15
		16	struct acpi_table_swft;
16	struct device;	17	struct device;
17	struct sdca_entity;	18	struct sdca_entity;
18	struct sdca_function_desc;	19	struct sdca_function_desc;
@@ -63,6 +64,7 @@ struct sdca_function_desc; · 44 unmodified lines
63	* @SDCA_FUNCTION_TYPE_RJ: Retaskable jack.	64	* @SDCA_FUNCTION_TYPE_RJ: Retaskable jack.
64	* @SDCA_FUNCTION_TYPE_SIMPLE_JACK: Subset of UAJ.	65	* @SDCA_FUNCTION_TYPE_SIMPLE_JACK: Subset of UAJ.
65	* @SDCA_FUNCTION_TYPE_HID: Human Interface Device, for e.g. buttons.	66	* @SDCA_FUNCTION_TYPE_HID: Human Interface Device, for e.g. buttons.
		67	* @SDCA_FUNCTION_TYPE_COMPANION_AMP: Sources audio from another amp.
66	* @SDCA_FUNCTION_TYPE_IMP_DEF: Implementation-defined function.	68	* @SDCA_FUNCTION_TYPE_IMP_DEF: Implementation-defined function.
67	*	69	*
68	* SDCA Function Types from SDCA specification v1.0a Section 5.1.2	70	* SDCA Function Types from SDCA specification v1.0a Section 5.1.2
@@ -82,6 +84,7 @@ enum sdca_function_type { · 13 unmodified lines
82	SDCA_FUNCTION_TYPE_RJ = 0x07,	84	SDCA_FUNCTION_TYPE_RJ = 0x07,
83	SDCA_FUNCTION_TYPE_SIMPLE_JACK = 0x08,	85	SDCA_FUNCTION_TYPE_SIMPLE_JACK = 0x08,
84	SDCA_FUNCTION_TYPE_HID = 0x0A,	86	SDCA_FUNCTION_TYPE_HID = 0x0A,
		87	SDCA_FUNCTION_TYPE_COMPANION_AMP = 0x0B,
85	SDCA_FUNCTION_TYPE_IMP_DEF = 0x1F,	88	SDCA_FUNCTION_TYPE_IMP_DEF = 0x1F,
86	};	89	};
87		90
@@ -95,6 +98,7 @@ enum sdca_function_type { · 7 unmodified lines
95	#define SDCA_FUNCTION_TYPE_RJ_NAME "RJ"	98	#define SDCA_FUNCTION_TYPE_RJ_NAME "RJ"
96	#define SDCA_FUNCTION_TYPE_SIMPLE_NAME "SimpleJack"	99	#define SDCA_FUNCTION_TYPE_SIMPLE_NAME "SimpleJack"
97	#define SDCA_FUNCTION_TYPE_HID_NAME "HID"	100	#define SDCA_FUNCTION_TYPE_HID_NAME "HID"
		101	#define SDCA_FUNCTION_TYPE_COMPANION_AMP_NAME "CompanionAmp"
98	#define SDCA_FUNCTION_TYPE_IMP_DEF_NAME "ImplementationDefined"	102	#define SDCA_FUNCTION_TYPE_IMP_DEF_NAME "ImplementationDefined"
99		103
100	/**	104	/**
@@ -133,6 +137,32 @@ struct sdca_init_write { · 32 unmodified lines
133	#define SDCA_CTL_TYPE_S(ent, sel) SDCA_CTL_TYPE(SDCA_ENTITY_TYPE_##ent, \	137	#define SDCA_CTL_TYPE_S(ent, sel) SDCA_CTL_TYPE(SDCA_ENTITY_TYPE_##ent, \
134	SDCA_CTL_##ent##_##sel)	138	SDCA_CTL_##ent##_##sel)
135		139
		140	/**
		141	* enum sdca_messageoffset_range - Column definitions UMP MessageOffset
		142	*/
		143	enum sdca_messageoffset_range {
		144	SDCA_MESSAGEOFFSET_BUFFER_START_ADDRESS = 0,
		145	SDCA_MESSAGEOFFSET_BUFFER_LENGTH = 1,
		146	SDCA_MESSAGEOFFSET_UMP_MODE = 2,
		147	SDCA_MESSAGEOFFSET_NCOLS = 3,
		148	};
		149
		150	/**
		151	* enum sdca_ump_mode - SDCA UMP Mode
		152	*/
		153	enum sdca_ump_mode {
		154	SDCA_UMP_MODE_DIRECT = 0x00,
		155	SDCA_UMP_MODE_INDIRECT = 0x01,
		156	};
		157
		158	/**
		159	* enum sdca_ump_owner - SDCA UMP Owner
		160	*/
		161	enum sdca_ump_owner {
		162	SDCA_UMP_OWNER_HOST = 0x00,
		163	SDCA_UMP_OWNER_DEVICE = 0x01,
		164	};
		165
136	/**	166	/**
137	* enum sdca_it_controls - SDCA Controls for Input Terminal	167	* enum sdca_it_controls - SDCA Controls for Input Terminal
138	*	168	*
@@ -258,6 +288,27 @@ enum sdca_xu_controls { · 119 unmodified lines
258	SDCA_CTL_XU_FDL_STATUS = 0x14,	288	SDCA_CTL_XU_FDL_STATUS = 0x14,
259	SDCA_CTL_XU_FDL_SET_INDEX = 0x15,	289	SDCA_CTL_XU_FDL_SET_INDEX = 0x15,
260	SDCA_CTL_XU_FDL_HOST_REQUEST = 0x16,	290	SDCA_CTL_XU_FDL_HOST_REQUEST = 0x16,
		291
		292	/* FDL Status Host->Device bit definitions */
		293	SDCA_CTL_XU_FDLH_TRANSFERRED_CHUNK = BIT(0),
		294	SDCA_CTL_XU_FDLH_TRANSFERRED_FILE = BIT(1),
		295	SDCA_CTL_XU_FDLH_SET_IN_PROGRESS = BIT(2),
		296	SDCA_CTL_XU_FDLH_RESET_ACK = BIT(4),
		297	SDCA_CTL_XU_FDLH_REQ_ABORT = BIT(5),
		298	/* FDL Status Device->Host bit definitions */
		299	SDCA_CTL_XU_FDLD_REQ_RESET = BIT(4),
		300	SDCA_CTL_XU_FDLD_REQ_ABORT = BIT(5),
		301	SDCA_CTL_XU_FDLD_ACK_TRANSFER = BIT(6),
		302	SDCA_CTL_XU_FDLD_NEEDS_SET = BIT(7),
		303	};
		304
		305	/**
		306	* enum sdca_set_index_range - Column definitions UMP SetIndex
		307	*/
		308	enum sdca_fdl_set_index_range {
		309	SDCA_FDL_SET_INDEX_SET_NUMBER = 0,
		310	SDCA_FDL_SET_INDEX_FILE_SET_ID = 1,
		311	SDCA_FDL_SET_INDEX_NCOLS = 2,
261	};	312	};
262		313
263	/**	314	/**
@@ -542,6 +593,9 @@ enum sdca_entity0_controls { · 278 unmodified lines
542	SDCA_CTL_ENTITY_0_FUNCTION_NEEDS_INITIALIZATION = BIT(5),	593	SDCA_CTL_ENTITY_0_FUNCTION_NEEDS_INITIALIZATION = BIT(5),
543	SDCA_CTL_ENTITY_0_FUNCTION_HAS_BEEN_RESET = BIT(6),	594	SDCA_CTL_ENTITY_0_FUNCTION_HAS_BEEN_RESET = BIT(6),
544	SDCA_CTL_ENTITY_0_FUNCTION_BUSY = BIT(7),	595	SDCA_CTL_ENTITY_0_FUNCTION_BUSY = BIT(7),
		596
		597	/* Function Action Bits */
		598	SDCA_CTL_ENTITY_0_RESET_FUNCTION_NOW = BIT(0),
545	};	599	};
546		600
547	#define SDCA_CTL_MIC_BIAS_NAME "Mic Bias"	601	#define SDCA_CTL_MIC_BIAS_NAME "Mic Bias"
@@ -557,7 +611,7 @@ enum sdca_entity0_controls { · 9 unmodified lines
557	#define SDCA_CTL_NDAI_PACKETTYPE_NAME "NDAI Packet Type"	611	#define SDCA_CTL_NDAI_PACKETTYPE_NAME "NDAI Packet Type"
558	#define SDCA_CTL_MIXER_NAME "Mixer"	612	#define SDCA_CTL_MIXER_NAME "Mixer"
559	#define SDCA_CTL_SELECTOR_NAME "Selector"	613	#define SDCA_CTL_SELECTOR_NAME "Selector"
560	#define SDCA_CTL_MUTE_NAME "Mute"	614	#define SDCA_CTL_MUTE_NAME "Channel"
561	#define SDCA_CTL_CHANNEL_VOLUME_NAME "Channel Volume"	615	#define SDCA_CTL_CHANNEL_VOLUME_NAME "Channel Volume"
562	#define SDCA_CTL_AGC_NAME "AGC"	616	#define SDCA_CTL_AGC_NAME "AGC"
563	#define SDCA_CTL_BASS_BOOST_NAME "Bass Boost"	617	#define SDCA_CTL_BASS_BOOST_NAME "Bass Boost"
@@ -771,6 +825,7 @@ struct sdca_control { · 207 unmodified lines
771	u8 layers;	825	u8 layers;
772		826
773	bool deferrable;	827	bool deferrable;
		828	bool is_volatile;
774	bool has_default;	829	bool has_default;
775	bool has_fixed;	830	bool has_fixed;
776	};	831	};
@@ -1089,6 +1144,27 @@ struct sdca_entity_hide { · 312 unmodified lines
1089	struct hid_descriptor hid_desc;	1144	struct hid_descriptor hid_desc;
1090	};	1145	};
1091		1146
		1147	/**
		1148	* enum sdca_xu_reset_machanism - SDCA FDL Resets
		1149	*/
		1150	enum sdca_xu_reset_mechanism {
		1151	SDCA_XU_RESET_FUNCTION = 0x0,
		1152	SDCA_XU_RESET_DEVICE = 0x1,
		1153	SDCA_XU_RESET_BUS = 0x2,
		1154	};
		1155
		1156	/**
		1157	* struct sdca_entity_xu - information specific to XU Entities
		1158	* @max_delay: the maximum time in microseconds allowed for the Device
		1159	* to change the ownership from Device to Host
		1160	* @reset_mechanism: indicates the type of reset that can be requested
		1161	* the end of an FDL.
		1162	*/
		1163	struct sdca_entity_xu {
		1164	unsigned int max_delay;
		1165	enum sdca_xu_reset_mechanism reset_mechanism;
		1166	};
		1167
1092	/**	1168	/**
1093	* struct sdca_entity - information for one SDCA Entity	1169	* struct sdca_entity - information for one SDCA Entity
1094	* @label: String such as "OT 12".	1170	* @label: String such as "OT 12".
@@ -1105,6 +1181,7 @@ struct sdca_entity_hide { · 10 unmodified lines
1105	* @pde: Power Domain Entity specific Entity properties.	1181	* @pde: Power Domain Entity specific Entity properties.
1106	* @ge: Group Entity specific Entity properties.	1182	* @ge: Group Entity specific Entity properties.
1107	* @hide: HIDE Entity specific Entity properties.	1183	* @hide: HIDE Entity specific Entity properties.
		1184	* @xu: XU Entity specific Entity properties.
1108	*/	1185	*/
1109	struct sdca_entity {	1186	struct sdca_entity {
1110	const char *label;	1187	const char *label;
@@ -1122,6 +1199,7 @@ struct sdca_entity { · 11 unmodified lines
1122	struct sdca_entity_pde pde;	1199	struct sdca_entity_pde pde;
1123	struct sdca_entity_ge ge;	1200	struct sdca_entity_ge ge;
1124	struct sdca_entity_hide hide;	1201	struct sdca_entity_hide hide;
		1202	struct sdca_entity_xu xu;
1125	};	1203	};
1126	};	1204	};
1127		1205
@@ -1288,6 +1366,42 @@ enum sdca_cluster_range { · 160 unmodified lines
1288	SDCA_CLUSTER_NCOLS = 2,	1366	SDCA_CLUSTER_NCOLS = 2,
1289	};	1367	};
1290		1368
		1369	/**
		1370	* struct sdca_fdl_file - information about a file from a fileset used in FDL
		1371	* @vendor_id: Vendor ID of the file.
		1372	* @file_id: File ID of the file.
		1373	* @fdl_offset: Offset information for FDL.
		1374	*/
		1375	struct sdca_fdl_file {
		1376	u16 vendor_id;
		1377	u32 file_id;
		1378	u32 fdl_offset;
		1379	};
		1380
		1381	/**
		1382	* struct sdca_fdl_set - information about a set of files used in FDL
		1383	* @files: Array of files in this FDL set.
		1384	* @num_files: Number of files in this FDL set.
		1385	* @id: ID of the FDL set.
		1386	*/
		1387	struct sdca_fdl_set {
		1388	struct sdca_fdl_file *files;
		1389	int num_files;
		1390	u32 id;
		1391	};
		1392
		1393	/**
		1394	* struct sdca_fdl_data - information about a function's FDL data
		1395	* @swft: Pointer to the SoundWire File Table.
		1396	* @sets: Array of FDL sets used by this function.
		1397	* @num_sets: Number of FDL sets used by this function.
		1398	*/
		1399	struct sdca_fdl_data {
		1400	struct acpi_table_swft *swft;
		1401	struct sdca_fdl_set *sets;
		1402	int num_sets;
		1403	};
		1404
1291	/**	1405	/**
1292	* struct sdca_function_data - top-level information for one SDCA function	1406	* struct sdca_function_data - top-level information for one SDCA function
1293	* @desc: Pointer to short descriptor from initial parsing.	1407	* @desc: Pointer to short descriptor from initial parsing.
@@ -1299,6 +1413,9 @@ enum sdca_cluster_range { · 5 unmodified lines
1299	* @num_clusters: Number of Channel Clusters reported in this Function.	1413	* @num_clusters: Number of Channel Clusters reported in this Function.
1300	* @busy_max_delay: Maximum Function busy delay in microseconds, before an	1414	* @busy_max_delay: Maximum Function busy delay in microseconds, before an
1301	* error should be reported.	1415	* error should be reported.
		1416	* @reset_max_delay: Maximum Function reset delay in microseconds, before an
		1417	* error should be reported.
		1418	* @fdl_data: FDL data for this Function, if available.
1302	*/	1419	*/
1303	struct sdca_function_data {	1420	struct sdca_function_data {
1304	struct sdca_function_desc *desc;	1421	struct sdca_function_desc *desc;
@@ -1311,6 +1428,9 @@ struct sdca_function_data { · 6 unmodified lines
1311	int num_clusters;	1428	int num_clusters;
1312		1429
1313	unsigned int busy_max_delay;	1430	unsigned int busy_max_delay;
		1431	unsigned int reset_max_delay;
		1432
		1433	struct sdca_fdl_data fdl_data;
1314	};	1434	};
1315		1435
1316	static inline u32 sdca_range(struct sdca_control_range *range,	1436	static inline u32 sdca_range(struct sdca_control_range *range,
@@ -1332,10 +1452,12 @@ static inline u32 sdca_range_search(struct sdca_control_range *range, · 15 unmodified lines
1332	return 0;	1452	return 0;
1333	}	1453	}
1334		1454
1335	int sdca_parse_function(struct device *dev,	1455	int sdca_parse_function(struct device dev, struct sdw_slave sdw,
1336	struct sdca_function_desc *desc,	1456	struct sdca_function_desc *desc,
1337	struct sdca_function_data *function);	1457	struct sdca_function_data *function);
1338		1458
		1459	const char *sdca_find_terminal_name(enum sdca_terminal_type type);
		1460
1339	struct sdca_control sdca_selector_find_control(struct device dev,	1461	struct sdca_control sdca_selector_find_control(struct device dev,
1340	struct sdca_entity *entity,	1462	struct sdca_entity *entity,
1341	const int sel);	1463	const int sel);

include/sound/sdca_hid.h+17−4

@@ -8,14 +8,27 @@ · 7 unmodified lines
8	#ifndef __SDCA_HID_H__	8	#ifndef __SDCA_HID_H__
9	#define __SDCA_HID_H__	9	#define __SDCA_HID_H__
10		10
11	#include <linux/types.h>	11	struct device;
12	#include <linux/hid.h>	12	struct sdw_slave;
		13
		14	struct sdca_entity;
		15	struct sdca_interrupt;
13		16
14	#if IS_ENABLED(CONFIG_SND_SOC_SDCA_HID)	17	#if IS_ENABLED(CONFIG_SND_SOC_SDCA_HID)
15	int sdca_add_hid_device(struct device dev, struct sdca_entity entity);	18
		19	int sdca_add_hid_device(struct device dev, struct sdw_slave sdw,
		20	struct sdca_entity *entity);
		21	int sdca_hid_process_report(struct sdca_interrupt *interrupt);
16		22
17	#else	23	#else
18	static inline int sdca_add_hid_device(struct device dev, struct sdca_entity entity)	24
		25	static inline int sdca_add_hid_device(struct device dev, struct sdw_slave sdw,
		26	struct sdca_entity *entity)
		27	{
		28	return 0;
		29	}
		30
		31	static inline int sdca_hid_process_report(struct sdca_interrupt *interrupt)
19	{	32	{
20	return 0;	33	return 0;
21	}	34	}

include/sound/sdca_interrupts.h+14−5

 /**
  * struct sdca_interrupt - contains information about a single SDCA interrupt
  * @name: The name of the interrupt.
+ * @dev: Pointer to the Function device.
+ * @device_regmap: Pointer to the IRQ regmap.
+ * @function_regmap: Pointer to the SDCA Function regmap.
  * @component: Pointer to the ASoC component owns the interrupt.
  * @function: Pointer to the Function that the interrupt is associated with.
  * @entity: Pointer to the Entity that the interrupt is associated with.
  * @control: Pointer to the Control that the interrupt is associated with.
  * @priv: Pointer to private data for use by the handler.
- * @externally_requested: Internal flag used to check if a client driver has
+ * @irq: IRQ number allocated to this interrupt, also used internally to track
- * already requested the interrupt, for custom handling, allowing the core to
+ * the IRQ being assigned.
- * skip handling this interrupt.
  */
 struct sdca_interrupt {
 	const char *name;
+	struct device *dev;
+	struct regmap *device_regmap;
+	struct regmap *function_regmap;
 	struct snd_soc_component *component;
 	struct sdca_function_data *function;
 	struct sdca_entity *entity;
 	void *priv;
-	bool externally_requested;
+	int irq;
 };
 /**
 int sdca_irq_request(struct device *dev, struct sdca_interrupt_info *interrupt_info,
 		     int sdca_irq, const char *name, irq_handler_t handler,
 		     void *data);
-int sdca_irq_data_populate(struct snd_soc_component *component,
+int sdca_irq_data_populate(struct device *dev, struct regmap *function_regmap,
+			   struct snd_soc_component *component,
 			   struct sdca_function_data *function,
 			   struct sdca_entity *entity,
 			   struct sdca_control *control,
 			   struct sdca_interrupt *interrupt);
+int sdca_irq_populate_early(struct device *dev, struct regmap *function_regmap,
+			    struct sdca_function_data *function,
+			    struct sdca_interrupt_info *info);
 int sdca_irq_populate(struct sdca_function_data *function,
 		      struct snd_soc_component *component,
 		      struct sdca_interrupt_info *info);

include/sound/sdca_regmap.h+2−0

@@ -27,5 +27,7 @@ int sdca_regmap_populate_constants(struct device *dev, struct sdca_function_data · 26 unmodified lines
27		27
28	int sdca_regmap_write_defaults(struct device dev, struct regmap regmap,	28	int sdca_regmap_write_defaults(struct device dev, struct regmap regmap,
29	struct sdca_function_data *function);	29	struct sdca_function_data *function);
		30	int sdca_regmap_write_init(struct device dev, struct regmap regmap,
		31	struct sdca_function_data *function);
30		32
31	#endif // __SDCA_REGMAP_H__	33	#endif // __SDCA_REGMAP_H__

include/sound/sdca_ump.h+50−0

@@ -0,0 +1,50 @@
	1	/* SPDX-License-Identifier: GPL-2.0 */
	2	/*
	3	* The MIPI SDCA specification is available for public downloads at
	4	* https://www.mipi.org/mipi-sdca-v1-0-download
	5	*
	6	* Copyright (C) 2025 Cirrus Logic, Inc. and
	7	* Cirrus Logic International Semiconductor Ltd.
	8	*/
	9
	10	#ifndef __SDCA_UMP_H__
	11	#define __SDCA_UMP_H__
	12
	13	struct regmap;
	14	struct sdca_control;
	15	struct sdca_entity;
	16	struct sdca_function_data;
	17	struct snd_soc_component;
	18	struct delayed_work;
	19
	20	int sdca_ump_get_owner_host(struct device *dev,
	21	struct regmap *function_regmap,
	22	struct sdca_function_data *function,
	23	struct sdca_entity *entity,
	24	struct sdca_control *control);
	25	int sdca_ump_set_owner_device(struct device *dev,
	26	struct regmap *function_regmap,
	27	struct sdca_function_data *function,
	28	struct sdca_entity *entity,
	29	struct sdca_control *control);
	30	int sdca_ump_read_message(struct device *dev,
	31	struct regmap *device_regmap,
	32	struct regmap *function_regmap,
	33	struct sdca_function_data *function,
	34	struct sdca_entity *entity,
	35	unsigned int offset_sel, unsigned int length_sel,
	36	void **msg);
	37	int sdca_ump_write_message(struct device *dev,
	38	struct regmap *device_regmap,
	39	struct regmap *function_regmap,
	40	struct sdca_function_data *function,
	41	struct sdca_entity *entity,
	42	unsigned int offset_sel, unsigned int msg_offset,
	43	unsigned int length_sel,
	44	void *msg, int msg_len);
	45
	46	void sdca_ump_cancel_timeout(struct delayed_work *work);
	47	void sdca_ump_schedule_timeout(struct delayed_work *work,
	48	unsigned int timeout_us);
	49
	50	#endif // __SDCA_UMP_H__

include/sound/soc-acpi-intel-match.h+2−0

 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_lnl_machines[];
 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_arl_machines[];
 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_machines[];
+extern struct snd_soc_acpi_mach snd_soc_acpi_intel_nvl_machines[];
 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_sdw_machines[];
 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cfl_sdw_machines[];
 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_lnl_sdw_machines[];
 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_arl_sdw_machines[];
 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[];
+extern struct snd_soc_acpi_mach snd_soc_acpi_intel_nvl_sdw_machines[];
 /*
  * generic table used for HDA codec-based platforms, possibly with

include/sound/soc-acpi.h+4−4

@@ -114,8 +114,8 @@ struct snd_soc_acpi_endpoint { · 113 unmodified lines
114	* @name_prefix: string used for codec controls	114	* @name_prefix: string used for codec controls
115	*/	115	*/
116	struct snd_soc_acpi_adr_device {	116	struct snd_soc_acpi_adr_device {
117	const u64 adr;	117	u64 adr;
118	const u8 num_endpoints;	118	u8 num_endpoints;
119	const struct snd_soc_acpi_endpoint *endpoints;	119	const struct snd_soc_acpi_endpoint *endpoints;
120	const char *name_prefix;	120	const char *name_prefix;
121	};	121	};
@@ -131,8 +131,8 @@ struct snd_soc_acpi_adr_device { · 9 unmodified lines
131	*/	131	*/
132		132
133	struct snd_soc_acpi_link_adr {	133	struct snd_soc_acpi_link_adr {
134	const u32 mask;	134	u32 mask;
135	const u32 num_adr;	135	u32 num_adr;
136	const struct snd_soc_acpi_adr_device *adr_d;	136	const struct snd_soc_acpi_adr_device *adr_d;
137	};	137	};
138		138

include/sound/soc.h+19−20

 #define SOC_VALUE_ENUM_EXT(xname, xenum, xhandler_get, xhandler_put) \
 	SOC_ENUM_EXT(xname, xenum, xhandler_get, xhandler_put)
+#define SOC_ENUM_EXT_ACC(xname, xenum, xhandler_get, xhandler_put, xaccess) \
+{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
+	.access = xaccess, \
+	.info = snd_soc_info_enum_double, \
+	.get = xhandler_get, .put = xhandler_put, \
+	.private_value = (unsigned long)&xenum }
 #define SND_SOC_BYTES(xname, xbase, xregs)		      \
 {	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,   \
 	.info = snd_soc_bytes_info, .get = snd_soc_bytes_get, \
 	.put = xhandler_put, .private_value = \
 		((unsigned long)&(struct soc_bytes) \
 		{.base = xbase, .num_regs = xregs }) }
+#define SND_SOC_BYTES_E_ACC(xname, xbase, xregs, xhandler_get, xhandler_put, xaccess) \
+{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
+	.access = xaccess, \
+	.info = snd_soc_bytes_info, .get = xhandler_get, \
+	.put = xhandler_put, .private_value = \
+		((unsigned long)&(struct soc_bytes) \
+		{.base = xbase, .num_regs = xregs }) }
 #define SND_SOC_BYTES_MASK(xname, xbase, xregs, xmask)	      \
 {	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,   \
 	unsigned int sign_bit;
 	unsigned int invert:1;
 	unsigned int autodisable:1;
+	unsigned int sdca_q78:1;
 #ifdef CONFIG_SND_SOC_TOPOLOGY
 	struct snd_soc_dobj dobj;
 #endif
 	return e->values[item];
 }
-/**
- * snd_soc_kcontrol_component() - Returns the component that registered the
- *  control
- * @kcontrol: The control for which to get the component
- *
- * Note: This function will work correctly if the control has been registered
- * for a component. With snd_soc_add_codec_controls() or via table based
- * setup for either a CODEC or component driver. Otherwise the behavior is
- * undefined.
- */
-static inline struct snd_soc_component *snd_soc_kcontrol_component(
-	struct snd_kcontrol *kcontrol)
-{
-	return snd_kcontrol_chip(kcontrol);
-}
 int snd_soc_util_init(void);
 void snd_soc_util_exit(void);
 static inline void _snd_soc_dapm_mutex_lock_root_d(struct snd_soc_dapm_context *dapm)
 {
-	_snd_soc_dapm_mutex_lock_root_c(dapm->card);
+	_snd_soc_dapm_mutex_lock_root_c(snd_soc_dapm_to_card(dapm));
 }
 static inline void _snd_soc_dapm_mutex_lock_d(struct snd_soc_dapm_context *dapm)
 {
-	_snd_soc_dapm_mutex_lock_c(dapm->card);
+	_snd_soc_dapm_mutex_lock_c(snd_soc_dapm_to_card(dapm));
 }
 static inline void _snd_soc_dapm_mutex_unlock_d(struct snd_soc_dapm_context *dapm)
 {
-	_snd_soc_dapm_mutex_unlock_c(dapm->card);
+	_snd_soc_dapm_mutex_unlock_c(snd_soc_dapm_to_card(dapm));
 }
 static inline void _snd_soc_dapm_mutex_assert_held_d(struct snd_soc_dapm_context *dapm)
 {
-	_snd_soc_dapm_mutex_assert_held_c(dapm->card);
+	_snd_soc_dapm_mutex_assert_held_c(snd_soc_dapm_to_card(dapm));
 }
 #define snd_soc_dapm_mutex_lock_root(x) _Generic((x),			\

include/sound/soc_sdw_utils.h+16−3

 #include <sound/soc-acpi.h>
 #define SOC_SDW_MAX_DAI_NUM             8
+#define SOC_SDW_MAX_AUX_NUM		2
 #define SOC_SDW_MAX_NO_PROPS		2
 #define SOC_SDW_JACK_JDSRC(quirk)	((quirk) & GENMASK(3, 0))
 struct asoc_sdw_dai_info {
 	const bool direction[2]; /* playback & capture support */
+	const char *codec_name;
 	const char *dai_name;
 	const char *component_name;
 	const int dai_type;
 	bool quirk_exclude;
 };
+struct asoc_sdw_aux_info {
+	const char *codec_name;
+};
 struct asoc_sdw_codec_info {
 	const int part_id;
 	const int version_id;
-	const char *codec_name;
+	const char *name_prefix;
 	int amp_num;
 	const u8 acpi_id[ACPI_ID_LEN];
 	const bool ignore_internal_dmic;
 	const struct snd_soc_ops *ops;
 	struct asoc_sdw_dai_info dais[SOC_SDW_MAX_DAI_NUM];
 	const int dai_num;
+	struct asoc_sdw_aux_info auxs[SOC_SDW_MAX_AUX_NUM];
+	const int aux_num;
 	int (*codec_card_late_probe)(struct snd_soc_card *card);
 void asoc_sdw_shutdown(struct snd_pcm_substream *substream);
 const char *asoc_sdw_get_codec_name(struct device *dev,
-				    const struct asoc_sdw_codec_info *codec_info,
+				    const struct asoc_sdw_dai_info *dai_info,
 				    const struct snd_soc_acpi_link_adr *adr_link,
 				    int adr_index);
 				  int no_pcm, int (*init)(struct snd_soc_pcm_runtime *rtd),
 				  const struct snd_soc_ops *ops);
-int asoc_sdw_count_sdw_endpoints(struct snd_soc_card *card, int *num_devs, int *num_ends);
+int asoc_sdw_count_sdw_endpoints(struct snd_soc_card *card,
+				 int *num_devs, int *num_ends, int *num_aux);
 struct asoc_sdw_dailink *asoc_sdw_find_dailink(struct asoc_sdw_dailink *dailinks,
 					       const struct snd_soc_acpi_endpoint *new);
+int asoc_sdw_get_dai_type(u32 type);
 int asoc_sdw_parse_sdw_endpoints(struct snd_soc_card *card,
+				 struct snd_soc_aux_dev *soc_aux,
 				 struct asoc_sdw_dailink *soc_dais,
 				 struct asoc_sdw_endpoint *soc_ends,
 				 int *num_devs);
 int asoc_sdw_cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
 int asoc_sdw_cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
 int asoc_sdw_cs42l43_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int asoc_sdw_cs42l45_hs_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int asoc_sdw_cs42l45_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
 int asoc_sdw_cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
 int asoc_sdw_maxim_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
 /* TI */

include/sound/tas2781.h+7−1

 	TAS2120,
 	TAS2320,
 	TAS2563,
+	TAS2568,
 	TAS2570,
 	TAS2572,
+	TAS2574,
 	TAS2781,
 	TAS5802,
+	TAS5806M,
+	TAS5806MD,
 	TAS5815,
+	TAS5822,
 	TAS5825,
 	TAS5827,
 	TAS5828,
+	TAS5830,
 	TAS_OTHERS,
 };
 	struct acoustic_data acou_data;
 #endif
 	struct tasdevice_fw *fmw;
-	struct gpio_desc *speaker_id;
 	struct gpio_desc *reset;
 	struct mutex codec_lock;
 	struct regmap *regmap;
 	unsigned int magic_num;
 	unsigned int chip_id;
 	unsigned int sysclk;
+	int speaker_id;
 	int irq;
 	int cur_prog;

include/trace/events/asoc.h+2−2

@@ -27,8 +27,8 @@ DECLARE_EVENT_CLASS(snd_soc_dapm, · 26 unmodified lines
27	TP_ARGS(dapm, val),	27	TP_ARGS(dapm, val),
28		28
29	TP_STRUCT__entry(	29	TP_STRUCT__entry(
30	__string( card_name, dapm->card->name)	30	__string( card_name, snd_soc_dapm_to_card(dapm)->name)
31	__string( comp_name, dapm->component ? dapm->component->name : "(none)")	31	__string( comp_name, snd_soc_dapm_to_component(dapm) ? snd_soc_dapm_to_component(dapm)->name : "(none)")
32	__field( int, val)	32	__field( int, val)
33	),	33	),
34		34

include/uapi/sound/intel/avs/tokens.h+6−0

 	AVS_TKN_MANIFEST_NUM_BINDINGS_U32		= 8,
 	AVS_TKN_MANIFEST_NUM_CONDPATH_TMPLS_U32		= 9,
 	AVS_TKN_MANIFEST_NUM_INIT_CONFIGS_U32		= 10,
+	AVS_TKN_MANIFEST_NUM_NHLT_CONFIGS_U32		= 11,
 	/* struct avs_tplg_library */
 	AVS_TKN_LIBRARY_ID_U32				= 101,
 	AVS_TKN_MOD_KCONTROL_ID_U32			= 1707,
 	AVS_TKN_MOD_INIT_CONFIG_NUM_IDS_U32		= 1708,
 	AVS_TKN_MOD_INIT_CONFIG_ID_U32			= 1709,
+	AVS_TKN_MOD_NHLT_CONFIG_ID_U32			= 1710,
 	/* struct avs_tplg_path_template */
 	AVS_TKN_PATH_TMPL_ID_U32			= 1801,
 	AVS_TKN_INIT_CONFIG_ID_U32			= 2401,
 	AVS_TKN_INIT_CONFIG_PARAM_U8			= 2402,
 	AVS_TKN_INIT_CONFIG_LENGTH_U32			= 2403,
+	/* struct avs_tplg_nhlt_config */
+	AVS_TKN_NHLT_CONFIG_ID_U32			= 2501,
+	AVS_TKN_NHLT_CONFIG_SIZE_U32			= 2502,
 };
 #endif

lib/tests/string_kunit.c+13−0

@@ -602,6 +602,18 @@ static void string_test_memtostr(struct kunit *test) · 601 unmodified lines
602	KUNIT_EXPECT_EQ(test, dest[7], '\0');	602	KUNIT_EXPECT_EQ(test, dest[7], '\0');
603	}	603	}
604		604
		605	static void string_test_strends(struct kunit *test)
		606	{
		607	KUNIT_EXPECT_TRUE(test, strends("foo-bar", "bar"));
		608	KUNIT_EXPECT_TRUE(test, strends("foo-bar", "-bar"));
		609	KUNIT_EXPECT_TRUE(test, strends("foobar", "foobar"));
		610	KUNIT_EXPECT_TRUE(test, strends("foobar", ""));
		611	KUNIT_EXPECT_FALSE(test, strends("bar", "foobar"));
		612	KUNIT_EXPECT_FALSE(test, strends("", "foo"));
		613	KUNIT_EXPECT_FALSE(test, strends("foobar", "ba"));
		614	KUNIT_EXPECT_TRUE(test, strends("", ""));
		615	}
		616
605	static struct kunit_case string_test_cases[] = {	617	static struct kunit_case string_test_cases[] = {
606	KUNIT_CASE(string_test_memset16),	618	KUNIT_CASE(string_test_memset16),
607	KUNIT_CASE(string_test_memset32),	619	KUNIT_CASE(string_test_memset32),
@@ -623,6 +635,7 @@ static struct kunit_case string_test_cases[] = { · 15 unmodified lines
623	KUNIT_CASE(string_test_strlcat),	635	KUNIT_CASE(string_test_strlcat),
624	KUNIT_CASE(string_test_strtomem),	636	KUNIT_CASE(string_test_strtomem),
625	KUNIT_CASE(string_test_memtostr),	637	KUNIT_CASE(string_test_memtostr),
		638	KUNIT_CASE(string_test_strends),
626	{}	639	{}
627	};	640	};
628		641

sound/ac97_bus.c+8−5

  * @id_mask: Mask that is applied to the device ID before comparing to @id
  *
  * This function resets the AC'97 device. If @try_warm is true the function
- * first performs a warm reset. If the warm reset is successful the function
+ * first performs a warm reset. If @try_warm is false the function issues
- * returns 1. Otherwise or if @try_warm is false the function issues cold reset
+ * cold reset followed by a warm reset. If @id is 0 any valid device ID
- * followed by a warm reset. If this is successful the function returns 0,
+ * will be accepted, otherwise only the ID that matches @id and @id_mask
- * otherwise a negative error code. If @id is 0 any valid device ID will be
+ * is accepted.
- * accepted, otherwise only the ID that matches @id and @id_mask is accepted.
+ * Returns:
+ * * %1 - if warm reset is successful
+ * * %0 - if cold reset and warm reset is successful
+ * * %-ENODEV - if @id and @id_mask not matching
  */
 int snd_ac97_reset(struct snd_ac97 *ac97, bool try_warm, unsigned int id,
 	unsigned int id_mask)

sound/core/pcm_drm_eld.c+1−1

@@ -379,7 +379,7 @@ int snd_parse_eld(struct device dev, struct snd_parsed_hdmi_eld e, · 378 unmodified lines
379	* in console or for audio devices. Assume the highest speakers	379	* in console or for audio devices. Assume the highest speakers
380	* configuration, to _not_ prohibit multi-channel audio playback.	380	* configuration, to _not_ prohibit multi-channel audio playback.
381	*/	381	*/
382	if (!e->spk_alloc)	382	if (!e->spk_alloc && e->sad_count)
383	e->spk_alloc = 0xffff;	383	e->spk_alloc = 0xffff;
384		384
385	return 0;	385	return 0;

sound/core/rawmidi.c+1−4

 static int __init alsa_rawmidi_init(void)
 {
 	snd_ctl_register_ioctl(snd_rawmidi_control_ioctl);
 	snd_ctl_register_ioctl_compat(snd_rawmidi_control_ioctl);
 #ifdef CONFIG_SND_OSSEMUL
-	{ int i;
 	/* check device map table */
-	for (i = 0; i < SNDRV_CARDS; i++) {
+	for (int i = 0; i < SNDRV_CARDS; i++) {
 		if (midi_map[i] < 0 || midi_map[i] >= SNDRV_RAWMIDI_DEVICES) {
 			pr_err("ALSA: rawmidi: invalid midi_map[%d] = %d\n",
 			       i, midi_map[i]);
 			amidi_map[i] = 1;
 		}
 	}
-	}
 #endif /* CONFIG_SND_OSSEMUL */
 	return 0;
 }

sound/drivers/pcmtest.c+2−2

@@ -696,10 +696,10 @@ static int setup_patt_bufs(void) · 695 unmodified lines
696	size_t i;	696	size_t i;
697		697
698	for (i = 0; i < ARRAY_SIZE(patt_bufs); i++) {	698	for (i = 0; i < ARRAY_SIZE(patt_bufs); i++) {
699	patt_bufs[i].buf = kzalloc(MAX_PATTERN_LEN, GFP_KERNEL);	699	patt_bufs[i].buf = kmalloc(MAX_PATTERN_LEN, GFP_KERNEL);
700	if (!patt_bufs[i].buf)	700	if (!patt_bufs[i].buf)
701	break;	701	break;
702	strcpy(patt_bufs[i].buf, DEFAULT_PATTERN);	702	strscpy_pad(patt_bufs[i].buf, DEFAULT_PATTERN, MAX_PATTERN_LEN);
703	patt_bufs[i].len = DEFAULT_PATTERN_LEN;	703	patt_bufs[i].len = DEFAULT_PATTERN_LEN;
704	}	704	}
705		705

sound/firewire/dice/Makefile+1−1

@@ -2,5 +2,5 @@ · 1 unmodified line
2	snd-dice-y := dice-transaction.o dice-stream.o dice-proc.o dice-midi.o \	2	snd-dice-y := dice-transaction.o dice-stream.o dice-proc.o dice-midi.o \
3	dice-pcm.o dice-hwdep.o dice.o dice-tcelectronic.o \	3	dice-pcm.o dice-hwdep.o dice.o dice-tcelectronic.o \
4	dice-alesis.o dice-extension.o dice-mytek.o dice-presonus.o \	4	dice-alesis.o dice-extension.o dice-mytek.o dice-presonus.o \
5	dice-harman.o dice-focusrite.o dice-weiss.o	5	dice-harman.o dice-focusrite.o dice-weiss.o dice-teac.o
6	obj-$(CONFIG_SND_DICE) += snd-dice.o	6	obj-$(CONFIG_SND_DICE) += snd-dice.o

sound/firewire/dice/dice-extension.c+2−2

@@ -116,7 +116,7 @@ static int detect_stream_formats(struct snd_dice *dice, u64 section_addr) · 115 unmodified lines
116	break;	116	break;
117		117
118	base_offset += EXT_APP_STREAM_ENTRIES;	118	base_offset += EXT_APP_STREAM_ENTRIES;
119	stream_count = be32_to_cpu(reg[0]);	119	stream_count = min_t(unsigned int, be32_to_cpu(reg[0]), MAX_STREAMS);
120	err = read_stream_entries(dice, section_addr, base_offset,	120	err = read_stream_entries(dice, section_addr, base_offset,
121	stream_count, mode,	121	stream_count, mode,
122	dice->tx_pcm_chs,	122	dice->tx_pcm_chs,
@@ -125,7 +125,7 @@ static int detect_stream_formats(struct snd_dice *dice, u64 section_addr) · 2 unmodified lines
125	break;	125	break;
126		126
127	base_offset += stream_count * EXT_APP_STREAM_ENTRY_SIZE;	127	base_offset += stream_count * EXT_APP_STREAM_ENTRY_SIZE;
128	stream_count = be32_to_cpu(reg[1]);	128	stream_count = min_t(unsigned int, be32_to_cpu(reg[1]), MAX_STREAMS);
129	err = read_stream_entries(dice, section_addr, base_offset,	129	err = read_stream_entries(dice, section_addr, base_offset,
130	stream_count,	130	stream_count,
131	mode, dice->rx_pcm_chs,	131	mode, dice->rx_pcm_chs,

sound/firewire/dice/dice-teac.c+43−0

@@ -0,0 +1,43 @@
	1	// SPDX-License-Identifier: GPL-2.0
	2	// dice-teac.c - a part of driver for DICE based devices
	3	//
	4	// Copyright (c) 2025 Takashi Sakamoto
	5
	6	#include "dice.h"
	7
	8	int snd_dice_detect_teac_formats(struct snd_dice *dice)
	9	{
	10	__be32 reg;
	11	u32 data;
	12	int err;
	13
	14	err = snd_dice_transaction_read_tx(dice, TX_NUMBER, &reg, sizeof(reg));
	15	if (err < 0)
	16	return err;
	17
	18	dice->tx_pcm_chs[0][SND_DICE_RATE_MODE_LOW] = 16;
	19	dice->tx_pcm_chs[0][SND_DICE_RATE_MODE_MIDDLE] = 16;
	20	dice->tx_midi_ports[0] = 1;
	21
	22	data = be32_to_cpu(reg);
	23	if (data > 1) {
	24	dice->tx_pcm_chs[1][SND_DICE_RATE_MODE_LOW] = 16;
	25	dice->tx_pcm_chs[1][SND_DICE_RATE_MODE_MIDDLE] = 16;
	26	}
	27
	28	err = snd_dice_transaction_read_rx(dice, RX_NUMBER, &reg, sizeof(reg));
	29	if (err < 0)
	30	return err;
	31
	32	dice->rx_pcm_chs[0][SND_DICE_RATE_MODE_LOW] = 16;
	33	dice->rx_pcm_chs[0][SND_DICE_RATE_MODE_MIDDLE] = 16;
	34	dice->rx_midi_ports[0] = 1;
	35
	36	data = be32_to_cpu(reg);
	37	if (data > 1) {
	38	dice->rx_pcm_chs[1][SND_DICE_RATE_MODE_LOW] = 16;
	39	dice->rx_pcm_chs[1][SND_DICE_RATE_MODE_MIDDLE] = 16;
	40	}
	41
	42	return 0;
	43	}

sound/firewire/dice/dice.c+13−0

@@ -22,6 +22,7 @@ MODULE_LICENSE("GPL"); · 21 unmodified lines
22	#define OUI_PRESONUS 0x000a92	22	#define OUI_PRESONUS 0x000a92
23	#define OUI_HARMAN 0x000fd7	23	#define OUI_HARMAN 0x000fd7
24	#define OUI_AVID 0x00a07e	24	#define OUI_AVID 0x00a07e
		25	#define OUI_TEAC 0x00022e
25		26
26	#define DICE_CATEGORY_ID 0x04	27	#define DICE_CATEGORY_ID 0x04
27	#define WEISS_CATEGORY_ID 0x00	28	#define WEISS_CATEGORY_ID 0x00
@@ -458,6 +459,18 @@ static const struct ieee1394_device_id dice_id_table[] = { · 430 unmodified lines
458	.match_flags = IEEE1394_MATCH_VERSION,	459	.match_flags = IEEE1394_MATCH_VERSION,
459	.version = DICE_INTERFACE,	460	.version = DICE_INTERFACE,
460	},	461	},
		462	// Tascam IF-FW/DM MkII for DM-3200 and DM-4800.
		463	{
		464	.match_flags = IEEE1394_MATCH_VENDOR_ID \|
		465	IEEE1394_MATCH_MODEL_ID \|
		466	IEEE1394_MATCH_SPECIFIER_ID \|
		467	IEEE1394_MATCH_VERSION,
		468	.vendor_id = OUI_TEAC,
		469	.model_id = OUI_TEAC,
		470	.specifier_id = OUI_TEAC,
		471	.version = 0x800006,
		472	.driver_data = (kernel_ulong_t)snd_dice_detect_teac_formats,
		473	},
461	{ }	474	{ }
462	};	475	};
463	MODULE_DEVICE_TABLE(ieee1394, dice_id_table);	476	MODULE_DEVICE_TABLE(ieee1394, dice_id_table);

sound/firewire/dice/dice.h+1−0

@@ -233,5 +233,6 @@ int snd_dice_detect_presonus_formats(struct snd_dice *dice); · 232 unmodified lines
233	int snd_dice_detect_harman_formats(struct snd_dice *dice);	233	int snd_dice_detect_harman_formats(struct snd_dice *dice);
234	int snd_dice_detect_focusrite_pro40_tcd3070_formats(struct snd_dice *dice);	234	int snd_dice_detect_focusrite_pro40_tcd3070_formats(struct snd_dice *dice);
235	int snd_dice_detect_weiss_formats(struct snd_dice *dice);	235	int snd_dice_detect_weiss_formats(struct snd_dice *dice);
		236	int snd_dice_detect_teac_formats(struct snd_dice *dice);
236		237
237	#endif	238	#endif

sound/hda/codecs/hdmi/intelhdmi.c+1−0

@@ -793,6 +793,7 @@ static const struct hda_device_id snd_hda_id_intelhdmi[] = { · 792 unmodified lines
793	HDA_CODEC_ID_MODEL(0x80862820, "Lunar Lake HDMI", MODEL_ADLP),	793	HDA_CODEC_ID_MODEL(0x80862820, "Lunar Lake HDMI", MODEL_ADLP),
794	HDA_CODEC_ID_MODEL(0x80862822, "Panther Lake HDMI", MODEL_ADLP),	794	HDA_CODEC_ID_MODEL(0x80862822, "Panther Lake HDMI", MODEL_ADLP),
795	HDA_CODEC_ID_MODEL(0x80862823, "Wildcat Lake HDMI", MODEL_ADLP),	795	HDA_CODEC_ID_MODEL(0x80862823, "Wildcat Lake HDMI", MODEL_ADLP),
		796	HDA_CODEC_ID_MODEL(0x80862824, "Nova Lake HDMI", MODEL_ADLP),
796	HDA_CODEC_ID_MODEL(0x80862882, "Valleyview2 HDMI", MODEL_BYT),	797	HDA_CODEC_ID_MODEL(0x80862882, "Valleyview2 HDMI", MODEL_BYT),
797	HDA_CODEC_ID_MODEL(0x80862883, "Braswell HDMI", MODEL_BYT),	798	HDA_CODEC_ID_MODEL(0x80862883, "Braswell HDMI", MODEL_BYT),
798	{} /* terminator */	799	{} /* terminator */

sound/hda/codecs/realtek/alc269.c+101−10

@@ -3406,7 +3406,42 @@ static void alc287_fixup_lenovo_thinkpad_with_alc1318(struct hda_codec *codec, · 3405 unmodified lines
3406	spec->power_hook = alc287_s4_power_gpio3_default;	3406	spec->power_hook = alc287_s4_power_gpio3_default;
3407	spec->gen.pcm_playback_hook = alc287_alc1318_playback_pcm_hook;	3407	spec->gen.pcm_playback_hook = alc287_alc1318_playback_pcm_hook;
3408	}	3408	}
		3409	/* GPIO2: mute led GPIO3: micmute led */
		3410	static void alc245_tas2781_spi_hp_fixup_muteled(struct hda_codec *codec,
		3411	const struct hda_fixup *fix, int action)
		3412	{
		3413	struct alc_spec *spec = codec->spec;
		3414	static const hda_nid_t conn[] = { 0x02 };
		3415
		3416	switch (action) {
		3417	case HDA_FIXUP_ACT_PRE_PROBE:
		3418	spec->gen.auto_mute_via_amp = 1;
		3419	snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn), conn);
		3420	break;
		3421	}
		3422
		3423	tas2781_fixup_spi(codec, fix, action);
		3424	alc_fixup_hp_gpio_led(codec, action, 0x04, 0x0);
		3425	alc285_fixup_hp_coef_micmute_led(codec, fix, action);
		3426	}
		3427	/* JD2: mute led GPIO3: micmute led */
		3428	static void alc245_tas2781_i2c_hp_fixup_muteled(struct hda_codec *codec,
		3429	const struct hda_fixup *fix, int action)
		3430	{
		3431	struct alc_spec *spec = codec->spec;
		3432	static const hda_nid_t conn[] = { 0x02 };
		3433
		3434	switch (action) {
		3435	case HDA_FIXUP_ACT_PRE_PROBE:
		3436	spec->gen.auto_mute_via_amp = 1;
		3437	snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn), conn);
		3438	break;
		3439	}
3409		3440
		3441	tas2781_fixup_txnw_i2c(codec, fix, action);
		3442	alc245_fixup_hp_mute_led_coefbit(codec, fix, action);
		3443	alc285_fixup_hp_coef_micmute_led(codec, fix, action);
		3444	}
3410	/*	3445	/*
3411	* Clear COEF 0x0d (PCBEEP passthrough) bit 0x40 where BIOS sets it wrongly	3446	* Clear COEF 0x0d (PCBEEP passthrough) bit 0x40 where BIOS sets it wrongly
3412	* at PM resume	3447	* at PM resume
@@ -3418,6 +3453,21 @@ static void alc283_fixup_dell_hp_resume(struct hda_codec *codec, · 5 unmodified lines
3418	alc_write_coef_idx(codec, 0xd, 0x2800);	3453	alc_write_coef_idx(codec, 0xd, 0x2800);
3419	}	3454	}
3420		3455
		3456	/* Swap DAC assignments for HP and speaker */
		3457	static void alc288_fixup_surface_swap_dacs(struct hda_codec *codec,
		3458	const struct hda_fixup *fix, int action)
		3459	{
		3460	struct alc_spec *spec = codec->spec;
		3461	static hda_nid_t preferred_pairs[] = {
		3462	0x21, 0x03, 0x14, 0x02, 0
		3463	};
		3464
		3465	if (action != HDA_FIXUP_ACT_PRE_PROBE)
		3466	return;
		3467
		3468	spec->gen.preferred_dacs = preferred_pairs;
		3469	}
		3470
3421	enum {	3471	enum {
3422	ALC269_FIXUP_GPIO2,	3472	ALC269_FIXUP_GPIO2,
3423	ALC269_FIXUP_SONY_VAIO,	3473	ALC269_FIXUP_SONY_VAIO,
@@ -3737,6 +3787,10 @@ enum { · 313 unmodified lines
3737	ALC269_FIXUP_POSITIVO_P15X_HEADSET_MIC,	3787	ALC269_FIXUP_POSITIVO_P15X_HEADSET_MIC,
3738	ALC289_FIXUP_ASUS_ZEPHYRUS_DUAL_SPK,	3788	ALC289_FIXUP_ASUS_ZEPHYRUS_DUAL_SPK,
3739	ALC256_FIXUP_VAIO_RPL_MIC_NO_PRESENCE,	3789	ALC256_FIXUP_VAIO_RPL_MIC_NO_PRESENCE,
		3790	ALC245_FIXUP_HP_TAS2781_SPI_MUTE_LED,
		3791	ALC245_FIXUP_HP_TAS2781_I2C_MUTE_LED,
		3792	ALC288_FIXUP_SURFACE_SWAP_DACS,
		3793	ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO,
3740	};	3794	};
3741		3795
3742	/* A special fixup for Lenovo C940 and Yoga Duet 7;	3796	/* A special fixup for Lenovo C940 and Yoga Duet 7;
@@ -5270,6 +5324,12 @@ static const struct hda_fixup alc269_fixups[] = { · 1527 unmodified lines
5270	.type = HDA_FIXUP_FUNC,	5324	.type = HDA_FIXUP_FUNC,
5271	.v.func = alc236_fixup_hp_mute_led_micmute_vref,	5325	.v.func = alc236_fixup_hp_mute_led_micmute_vref,
5272	},	5326	},
		5327	[ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO] = {
		5328	.type = HDA_FIXUP_FUNC,
		5329	.v.func = alc236_fixup_hp_mute_led_coefbit2,
		5330	.chained = true,
		5331	.chain_id = ALC236_FIXUP_HP_GPIO_LED,
		5332	},
5273	[ALC236_FIXUP_LENOVO_INV_DMIC] = {	5333	[ALC236_FIXUP_LENOVO_INV_DMIC] = {
5274	.type = HDA_FIXUP_FUNC,	5334	.type = HDA_FIXUP_FUNC,
5275	.v.func = alc_fixup_inv_dmic,	5335	.v.func = alc_fixup_inv_dmic,
@@ -6183,7 +6243,19 @@ static const struct hda_fixup alc269_fixups[] = { · 907 unmodified lines
6183	},	6243	},
6184	.chained = true,	6244	.chained = true,
6185	.chain_id = ALC269_FIXUP_LIMIT_INT_MIC_BOOST	6245	.chain_id = ALC269_FIXUP_LIMIT_INT_MIC_BOOST
6186	}	6246	},
		6247	[ALC245_FIXUP_HP_TAS2781_SPI_MUTE_LED] = {
		6248	.type = HDA_FIXUP_FUNC,
		6249	.v.func = alc245_tas2781_spi_hp_fixup_muteled,
		6250	},
		6251	[ALC245_FIXUP_HP_TAS2781_I2C_MUTE_LED] = {
		6252	.type = HDA_FIXUP_FUNC,
		6253	.v.func = alc245_tas2781_i2c_hp_fixup_muteled,
		6254	},
		6255	[ALC288_FIXUP_SURFACE_SWAP_DACS] = {
		6256	.type = HDA_FIXUP_FUNC,
		6257	.v.func = alc288_fixup_surface_swap_dacs,
		6258	},
6187	};	6259	};
6188		6260
6189	static const struct hda_quirk alc269_fixup_tbl[] = {	6261	static const struct hda_quirk alc269_fixup_tbl[] = {
@@ -6526,6 +6598,8 @@ static const struct hda_quirk alc269_fixup_tbl[] = { · 336 unmodified lines
6526	SND_PCI_QUIRK(0x103c, 0x8a6e, "HP EDNA 360", ALC287_FIXUP_CS35L41_I2C_4),	6598	SND_PCI_QUIRK(0x103c, 0x8a6e, "HP EDNA 360", ALC287_FIXUP_CS35L41_I2C_4),
6527	SND_PCI_QUIRK(0x103c, 0x8a74, "HP ProBook 440 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),	6599	SND_PCI_QUIRK(0x103c, 0x8a74, "HP ProBook 440 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),
6528	SND_PCI_QUIRK(0x103c, 0x8a75, "HP ProBook 450 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),	6600	SND_PCI_QUIRK(0x103c, 0x8a75, "HP ProBook 450 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),
		6601	SND_PCI_QUIRK(0x103c, 0x8a76, "HP ProBook 440 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),
		6602	SND_PCI_QUIRK(0x103c, 0x8a77, "HP ProBook 450 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),
6529	SND_PCI_QUIRK(0x103c, 0x8a78, "HP Dev One", ALC285_FIXUP_HP_LIMIT_INT_MIC_BOOST),	6603	SND_PCI_QUIRK(0x103c, 0x8a78, "HP Dev One", ALC285_FIXUP_HP_LIMIT_INT_MIC_BOOST),
6530	SND_PCI_QUIRK(0x103c, 0x8aa0, "HP ProBook 440 G9 (MB 8A9E)", ALC236_FIXUP_HP_GPIO_LED),	6604	SND_PCI_QUIRK(0x103c, 0x8aa0, "HP ProBook 440 G9 (MB 8A9E)", ALC236_FIXUP_HP_GPIO_LED),
6531	SND_PCI_QUIRK(0x103c, 0x8aa3, "HP ProBook 450 G9 (MB 8AA1)", ALC236_FIXUP_HP_GPIO_LED),	6605	SND_PCI_QUIRK(0x103c, 0x8aa3, "HP ProBook 450 G9 (MB 8AA1)", ALC236_FIXUP_HP_GPIO_LED),
@@ -6696,15 +6770,29 @@ static const struct hda_quirk alc269_fixup_tbl[] = { · 164 unmodified lines
6696	SND_PCI_QUIRK(0x103c, 0x8e60, "HP Trekker ", ALC287_FIXUP_CS35L41_I2C_2),	6770	SND_PCI_QUIRK(0x103c, 0x8e60, "HP Trekker ", ALC287_FIXUP_CS35L41_I2C_2),
6697	SND_PCI_QUIRK(0x103c, 0x8e61, "HP Trekker ", ALC287_FIXUP_CS35L41_I2C_2),	6771	SND_PCI_QUIRK(0x103c, 0x8e61, "HP Trekker ", ALC287_FIXUP_CS35L41_I2C_2),
6698	SND_PCI_QUIRK(0x103c, 0x8e62, "HP Trekker ", ALC287_FIXUP_CS35L41_I2C_2),	6772	SND_PCI_QUIRK(0x103c, 0x8e62, "HP Trekker ", ALC287_FIXUP_CS35L41_I2C_2),
6699	SND_PCI_QUIRK(0x103c, 0x8ed5, "HP Merino13X", ALC245_FIXUP_TAS2781_SPI_2),	6773	SND_PCI_QUIRK(0x103c, 0x8eb6, "HP Abe A6U", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO),
6700	SND_PCI_QUIRK(0x103c, 0x8ed6, "HP Merino13", ALC245_FIXUP_TAS2781_SPI_2),	6774	SND_PCI_QUIRK(0x103c, 0x8eb7, "HP Abe A6U", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO),
6701	SND_PCI_QUIRK(0x103c, 0x8ed7, "HP Merino14", ALC245_FIXUP_TAS2781_SPI_2),	6775	SND_PCI_QUIRK(0x103c, 0x8eb8, "HP Abe A6U", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO),
6702	SND_PCI_QUIRK(0x103c, 0x8ed8, "HP Merino16", ALC245_FIXUP_TAS2781_SPI_2),	6776	SND_PCI_QUIRK(0x103c, 0x8ec1, "HP 200 G2i", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO),
6703	SND_PCI_QUIRK(0x103c, 0x8ed9, "HP Merino14W", ALC245_FIXUP_TAS2781_SPI_2),	6777	SND_PCI_QUIRK(0x103c, 0x8ec4, "HP Bantie I6U", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO),
6704	SND_PCI_QUIRK(0x103c, 0x8eda, "HP Merino16W", ALC245_FIXUP_TAS2781_SPI_2),	6778	SND_PCI_QUIRK(0x103c, 0x8ec5, "HP Bantie I6U", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO),
6705	SND_PCI_QUIRK(0x103c, 0x8f40, "HP Lampas14", ALC287_FIXUP_TXNW2781_I2C),	6779	SND_PCI_QUIRK(0x103c, 0x8ece, "HP Abe I6U", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO),
6706	SND_PCI_QUIRK(0x103c, 0x8f41, "HP Lampas16", ALC287_FIXUP_TXNW2781_I2C),	6780	SND_PCI_QUIRK(0x103c, 0x8ecf, "HP Abe I6U", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO),
6707	SND_PCI_QUIRK(0x103c, 0x8f42, "HP LampasW14", ALC287_FIXUP_TXNW2781_I2C),	6781	SND_PCI_QUIRK(0x103c, 0x8ed2, "HP Abe I6U", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO),
		6782	SND_PCI_QUIRK(0x103c, 0x8ed5, "HP EliteBook 8 Flip G2i 13", ALC245_FIXUP_HP_TAS2781_SPI_MUTE_LED),
		6783	SND_PCI_QUIRK(0x103c, 0x8ed6, "HP EliteBook 8 G2i 13", ALC245_FIXUP_HP_TAS2781_SPI_MUTE_LED),
		6784	SND_PCI_QUIRK(0x103c, 0x8ed7, "HP EliteBook 8 G2i 14", ALC245_FIXUP_HP_TAS2781_SPI_MUTE_LED),
		6785	SND_PCI_QUIRK(0x103c, 0x8ed8, "HP EliteBook 8 G2i 16", ALC245_FIXUP_HP_TAS2781_SPI_MUTE_LED),
		6786	SND_PCI_QUIRK(0x103c, 0x8ed9, "HP ZBook Firefly 14W", ALC245_FIXUP_HP_TAS2781_SPI_MUTE_LED),
		6787	SND_PCI_QUIRK(0x103c, 0x8eda, "HP ZBook Firefly 16W", ALC245_FIXUP_HP_TAS2781_SPI_MUTE_LED),
		6788	SND_PCI_QUIRK(0x103c, 0x8ee4, "HP Bantie A6U", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO),
		6789	SND_PCI_QUIRK(0x103c, 0x8ee5, "HP Bantie A6U", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_GPIO),
		6790	SND_PCI_QUIRK(0x103c, 0x8f0c, "HP ZBook X G2i 16W", ALC236_FIXUP_HP_GPIO_LED),
		6791	SND_PCI_QUIRK(0x103c, 0x8f0e, "HP ZBook X G2i 16W", ALC236_FIXUP_HP_GPIO_LED),
		6792	SND_PCI_QUIRK(0x103c, 0x8f40, "HP ZBook 8 G2a 14", ALC245_FIXUP_HP_TAS2781_I2C_MUTE_LED),
		6793	SND_PCI_QUIRK(0x103c, 0x8f41, "HP ZBook 8 G2a 16", ALC245_FIXUP_HP_TAS2781_I2C_MUTE_LED),
		6794	SND_PCI_QUIRK(0x103c, 0x8f42, "HP ZBook 8 G2a 14W", ALC245_FIXUP_HP_TAS2781_I2C_MUTE_LED),
		6795	SND_PCI_QUIRK(0x103c, 0x8f62, "HP ZBook 8 G2a 16W", ALC245_FIXUP_HP_TAS2781_I2C_MUTE_LED),
6708	SND_PCI_QUIRK(0x1043, 0x1032, "ASUS VivoBook X513EA", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),	6796	SND_PCI_QUIRK(0x1043, 0x1032, "ASUS VivoBook X513EA", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),
6709	SND_PCI_QUIRK(0x1043, 0x1034, "ASUS GU605C", ALC285_FIXUP_ASUS_GU605_SPI_SPEAKER2_TO_DAC1),	6797	SND_PCI_QUIRK(0x1043, 0x1034, "ASUS GU605C", ALC285_FIXUP_ASUS_GU605_SPI_SPEAKER2_TO_DAC1),
6710	SND_PCI_QUIRK(0x1043, 0x103e, "ASUS X540SA", ALC256_FIXUP_ASUS_MIC),	6798	SND_PCI_QUIRK(0x1043, 0x103e, "ASUS X540SA", ALC256_FIXUP_ASUS_MIC),
@@ -6736,6 +6824,8 @@ static const struct hda_quirk alc269_fixup_tbl[] = { · 25 unmodified lines
6736	SND_PCI_QUIRK(0x1043, 0x12f0, "ASUS X541UV", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),	6824	SND_PCI_QUIRK(0x1043, 0x12f0, "ASUS X541UV", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),
6737	SND_PCI_QUIRK(0x1043, 0x1313, "Asus K42JZ", ALC269VB_FIXUP_ASUS_MIC_NO_PRESENCE),	6825	SND_PCI_QUIRK(0x1043, 0x1313, "Asus K42JZ", ALC269VB_FIXUP_ASUS_MIC_NO_PRESENCE),
6738	SND_PCI_QUIRK(0x1043, 0x1314, "ASUS GA605K", ALC285_FIXUP_ASUS_GA605K_HEADSET_MIC),	6826	SND_PCI_QUIRK(0x1043, 0x1314, "ASUS GA605K", ALC285_FIXUP_ASUS_GA605K_HEADSET_MIC),
		6827	SND_PCI_QUIRK(0x1043, 0x1384, "ASUS RC73XA", ALC287_FIXUP_TXNW2781_I2C),
		6828	SND_PCI_QUIRK(0x1043, 0x1394, "ASUS RC73YA", ALC287_FIXUP_TXNW2781_I2C),
6739	SND_PCI_QUIRK(0x1043, 0x13b0, "ASUS Z550SA", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),	6829	SND_PCI_QUIRK(0x1043, 0x13b0, "ASUS Z550SA", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),
6740	SND_PCI_QUIRK(0x1043, 0x1427, "Asus Zenbook UX31E", ALC269VB_FIXUP_ASUS_ZENBOOK),	6830	SND_PCI_QUIRK(0x1043, 0x1427, "Asus Zenbook UX31E", ALC269VB_FIXUP_ASUS_ZENBOOK),
6741	SND_PCI_QUIRK(0x1043, 0x1433, "ASUS GX650PY/PZ/PV/PU/PYV/PZV/PIV/PVV", ALC285_FIXUP_ASUS_I2C_HEADSET_MIC),	6831	SND_PCI_QUIRK(0x1043, 0x1433, "ASUS GX650PY/PZ/PV/PU/PYV/PZV/PIV/PVV", ALC285_FIXUP_ASUS_I2C_HEADSET_MIC),
@@ -6883,6 +6973,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { · 141 unmodified lines
6883	SND_PCI_QUIRK(0x10ec, 0x12cc, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK),	6973	SND_PCI_QUIRK(0x10ec, 0x12cc, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK),
6884	SND_PCI_QUIRK(0x10ec, 0x12f6, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK),	6974	SND_PCI_QUIRK(0x10ec, 0x12f6, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK),
6885	SND_PCI_QUIRK(0x10f7, 0x8338, "Panasonic CF-SZ6", ALC269_FIXUP_ASPIRE_HEADSET_MIC),	6975	SND_PCI_QUIRK(0x10f7, 0x8338, "Panasonic CF-SZ6", ALC269_FIXUP_ASPIRE_HEADSET_MIC),
		6976	SND_PCI_QUIRK(0x1414, 0x9c20, "Microsoft Surface Pro 2/3", ALC288_FIXUP_SURFACE_SWAP_DACS),
6886	SND_PCI_QUIRK(0x144d, 0xc109, "Samsung Ativ book 9 (NP900X3G)", ALC269_FIXUP_INV_DMIC),	6977	SND_PCI_QUIRK(0x144d, 0xc109, "Samsung Ativ book 9 (NP900X3G)", ALC269_FIXUP_INV_DMIC),
6887	SND_PCI_QUIRK(0x144d, 0xc169, "Samsung Notebook 9 Pen (NP930SBE-K01US)", ALC298_FIXUP_SAMSUNG_AMP),	6978	SND_PCI_QUIRK(0x144d, 0xc169, "Samsung Notebook 9 Pen (NP930SBE-K01US)", ALC298_FIXUP_SAMSUNG_AMP),
6888	SND_PCI_QUIRK(0x144d, 0xc176, "Samsung Notebook 9 Pro (NP930MBE-K04US)", ALC298_FIXUP_SAMSUNG_AMP),	6979	SND_PCI_QUIRK(0x144d, 0xc176, "Samsung Notebook 9 Pro (NP930MBE-K04US)", ALC298_FIXUP_SAMSUNG_AMP),

sound/hda/codecs/senarytech.c+6−3

 #include "hda_jack.h"
 #include "generic.h"
+/* GPIO node ID */
+#define SENARY_GPIO_NODE	0x01
 struct senary_spec {
 	struct hda_gen_spec gen;
 	unsigned int mask = spec->gpio_mute_led_mask | spec->gpio_mic_led_mask;
 	if (mask) {
-		snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_MASK,
+		snd_hda_codec_write(codec, SENARY_GPIO_NODE, 0, AC_VERB_SET_GPIO_MASK,
 				    mask);
-		snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DIRECTION,
+		snd_hda_codec_write(codec, SENARY_GPIO_NODE, 0, AC_VERB_SET_GPIO_DIRECTION,
 				    mask);
-		snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA,
+		snd_hda_codec_write(codec, SENARY_GPIO_NODE, 0, AC_VERB_SET_GPIO_DATA,
 				    spec->gpio_led);
 	}
 }

sound/hda/codecs/side-codecs/Kconfig+15−0

@@ -88,6 +88,21 @@ config SND_HDA_SCODEC_CS35L56_SPI · 87 unmodified lines
88	Say Y or M here to include CS35L56 amplifier support with	88	Say Y or M here to include CS35L56 amplifier support with
89	SPI control.	89	SPI control.
90		90
		91	menu "CS35L56 driver options"
		92	depends on SND_HDA_SCODEC_CS35L56
		93
		94	config SND_HDA_SCODEC_CS35L56_CAL_DEBUGFS
		95	bool "CS35L56 create debugfs for factory calibration"
		96	default N
		97	depends on DEBUG_FS
		98	select SND_SOC_CS35L56_CAL_DEBUGFS_COMMON
		99	help
		100	Create debugfs entries used during factory-line manufacture
		101	for factory calibration.
		102
		103	If unsure select "N".
		104	endmenu
		105
91	config SND_HDA_SCODEC_TAS2781	106	config SND_HDA_SCODEC_TAS2781
92	tristate	107	tristate
93	select SND_HDA_GENERIC	108	select SND_HDA_GENERIC

sound/hda/codecs/side-codecs/cs35l56_hda.c+110−6

@@ -548,20 +548,24 @@ static void cs35l56_hda_release_firmware_files(const struct firmware *wmfw_firmw · 547 unmodified lines
548	kfree(coeff_filename);	548	kfree(coeff_filename);
549	}	549	}
550		550
551	static void cs35l56_hda_apply_calibration(struct cs35l56_hda *cs35l56)	551	static int cs35l56_hda_apply_calibration(struct cs35l56_hda *cs35l56)
552	{	552	{
553	int ret;	553	int ret;
554		554
555	if (!cs35l56->base.cal_data_valid \|\| cs35l56->base.secured)	555	if (!cs35l56->base.cal_data_valid \|\| cs35l56->base.secured)
556	return;	556	return -EACCES;
557		557
558	ret = cs_amp_write_cal_coeffs(&cs35l56->cs_dsp,	558	ret = cs_amp_write_cal_coeffs(&cs35l56->cs_dsp,
559	&cs35l56_calibration_controls,	559	&cs35l56_calibration_controls,
560	&cs35l56->base.cal_data);	560	&cs35l56->base.cal_data);
561	if (ret < 0)	561	if (ret < 0) {
562	dev_warn(cs35l56->base.dev, "Failed to write calibration: %d\n", ret);	562	dev_warn(cs35l56->base.dev, "Failed to write calibration: %d\n", ret);
563	else	563	return ret;
564	dev_info(cs35l56->base.dev, "Calibration applied\n");	564	}
		565
		566	dev_info(cs35l56->base.dev, "Calibration applied\n");
		567
		568	return 0;
565	}	569	}
566		570
567	static void cs35l56_hda_fw_load(struct cs35l56_hda *cs35l56)	571	static void cs35l56_hda_fw_load(struct cs35l56_hda *cs35l56)
@@ -669,7 +673,9 @@ static void cs35l56_hda_fw_load(struct cs35l56_hda *cs35l56) · 101 unmodified lines
669	if (ret)	673	if (ret)
670	dev_dbg(cs35l56->base.dev, "%s: cs_dsp_run ret %d\n", __func__, ret);	674	dev_dbg(cs35l56->base.dev, "%s: cs_dsp_run ret %d\n", __func__, ret);
671		675
		676	/* Don't need to check return code, it's not fatal if this fails */
672	cs35l56_hda_apply_calibration(cs35l56);	677	cs35l56_hda_apply_calibration(cs35l56);
		678
673	ret = cs35l56_mbox_send(&cs35l56->base, CS35L56_MBOX_CMD_AUDIO_REINIT);	679	ret = cs35l56_mbox_send(&cs35l56->base, CS35L56_MBOX_CMD_AUDIO_REINIT);
674	if (ret)	680	if (ret)
675	cs_dsp_stop(&cs35l56->cs_dsp);	681	cs_dsp_stop(&cs35l56->cs_dsp);
@@ -695,6 +701,100 @@ static void cs35l56_hda_dsp_work(struct work_struct *work) · 19 unmodified lines
695	cs35l56_hda_fw_load(cs35l56);	701	cs35l56_hda_fw_load(cs35l56);
696	}	702	}
697		703
		704	static ssize_t cs35l56_hda_debugfs_calibrate_write(struct file *file,
		705	const char __user *from,
		706	size_t count, loff_t *ppos)
		707	{
		708	struct cs35l56_base *cs35l56_base = file->private_data;
		709	ssize_t ret;
		710
		711	ret = pm_runtime_resume_and_get(cs35l56_base->dev);
		712	if (ret)
		713	return ret;
		714
		715	ret = cs35l56_calibrate_debugfs_write(cs35l56_base, from, count, ppos);
		716	pm_runtime_autosuspend(cs35l56_base->dev);
		717
		718	return ret;
		719	}
		720
		721	static ssize_t cs35l56_hda_debugfs_cal_temperature_write(struct file *file,
		722	const char __user *from,
		723	size_t count, loff_t *ppos)
		724	{
		725	struct cs35l56_base *cs35l56_base = file->private_data;
		726	ssize_t ret;
		727
		728	ret = pm_runtime_resume_and_get(cs35l56_base->dev);
		729	if (ret)
		730	return ret;
		731
		732	ret = cs35l56_cal_ambient_debugfs_write(cs35l56_base, from, count, ppos);
		733	pm_runtime_autosuspend(cs35l56_base->dev);
		734
		735	return ret;
		736	}
		737
		738	static ssize_t cs35l56_hda_debugfs_cal_data_read(struct file *file,
		739	char __user *to,
		740	size_t count, loff_t *ppos)
		741	{
		742	struct cs35l56_base *cs35l56_base = file->private_data;
		743	ssize_t ret;
		744
		745	ret = pm_runtime_resume_and_get(cs35l56_base->dev);
		746	if (ret)
		747	return ret;
		748
		749	ret = cs35l56_cal_data_debugfs_read(cs35l56_base, to, count, ppos);
		750	pm_runtime_autosuspend(cs35l56_base->dev);
		751
		752	return ret;
		753	}
		754
		755	static ssize_t cs35l56_hda_debugfs_cal_data_write(struct file *file,
		756	const char __user *from,
		757	size_t count, loff_t *ppos)
		758	{
		759	struct cs35l56_base *cs35l56_base = file->private_data;
		760	struct cs35l56_hda *cs35l56 = cs35l56_hda_from_base(cs35l56_base);
		761	ssize_t ret;
		762
		763	ret = cs35l56_cal_data_debugfs_write(cs35l56_base, from, count, ppos);
		764	if (ret == -ENODATA)
		765	return count; /* Ignore writes of empty cal blobs */
		766
		767	if (ret < 0)
		768	return ret;
		769
		770	ret = pm_runtime_resume_and_get(cs35l56_base->dev);
		771	if (ret)
		772	return ret;
		773
		774	ret = cs35l56_hda_apply_calibration(cs35l56);
		775	if (ret == 0)
		776	cs35l56_mbox_send(cs35l56_base, CS35L56_MBOX_CMD_AUDIO_REINIT);
		777	else
		778	count = -EIO;
		779
		780	pm_runtime_autosuspend(cs35l56_base->dev);
		781
		782	return count;
		783	}
		784
		785	static const struct cs35l56_cal_debugfs_fops cs35l56_hda_cal_debugfs_fops = {
		786	.calibrate = {
		787	.write = cs35l56_hda_debugfs_calibrate_write,
		788	},
		789	.cal_temperature = {
		790	.write = cs35l56_hda_debugfs_cal_temperature_write,
		791	},
		792	.cal_data = {
		793	.read = cs35l56_hda_debugfs_cal_data_read,
		794	.write = cs35l56_hda_debugfs_cal_data_write,
		795	},
		796	};
		797
698	static int cs35l56_hda_bind(struct device dev, struct device master, void *master_data)	798	static int cs35l56_hda_bind(struct device dev, struct device master, void *master_data)
699	{	799	{
700	struct cs35l56_hda *cs35l56 = dev_get_drvdata(dev);	800	struct cs35l56_hda *cs35l56 = dev_get_drvdata(dev);
@@ -722,6 +822,9 @@ static int cs35l56_hda_bind(struct device dev, struct device master, void *mas · 21 unmodified lines
722	cs_dsp_init_debugfs(&cs35l56->cs_dsp, cs35l56->debugfs_root);	822	cs_dsp_init_debugfs(&cs35l56->cs_dsp, cs35l56->debugfs_root);
723	#endif	823	#endif
724		824
		825	if (IS_ENABLED(CONFIG_SND_HDA_SCODEC_CS35L56_CAL_DEBUGFS))
		826	cs35l56_create_cal_debugfs(&cs35l56->base, &cs35l56_hda_cal_debugfs_fops);
		827
725	dev_dbg(cs35l56->base.dev, "Bound\n");	828	dev_dbg(cs35l56->base.dev, "Bound\n");
726		829
727	return 0;	830	return 0;
@@ -735,6 +838,7 @@ static void cs35l56_hda_unbind(struct device dev, struct device master, void * · 7 unmodified lines
735		838
736	cancel_work_sync(&cs35l56->dsp_work);	839	cancel_work_sync(&cs35l56->dsp_work);
737		840
		841	cs35l56_remove_cal_debugfs(&cs35l56->base);
738	cs35l56_hda_remove_controls(cs35l56);	842	cs35l56_hda_remove_controls(cs35l56);
739		843
740	#if IS_ENABLED(CONFIG_SND_DEBUG)	844	#if IS_ENABLED(CONFIG_SND_DEBUG)
@@ -1050,7 +1154,7 @@ int cs35l56_hda_common_probe(struct cs35l56_hda *cs35l56, int hid, int id) · 309 unmodified lines
1050	}	1154	}
1051		1155
1052	cs35l56->base.type = hid & 0xff;	1156	cs35l56->base.type = hid & 0xff;
1053	cs35l56->base.cal_index = -1;	1157	cs35l56->base.cal_index = cs35l56->index;
1054		1158
1055	cs35l56_init_cs_dsp(&cs35l56->base, &cs35l56->cs_dsp);	1159	cs35l56_init_cs_dsp(&cs35l56->base, &cs35l56->cs_dsp);
1056	cs35l56->cs_dsp.client_ops = &cs35l56_hda_client_ops;	1160	cs35l56->cs_dsp.client_ops = &cs35l56_hda_client_ops;

sound/hda/codecs/side-codecs/cs35l56_hda.h+6−0

 #ifndef __CS35L56_HDA_H__
 #define __CS35L56_HDA_H__
+#include <linux/container_of.h>
 #include <linux/device.h>
 #include <linux/gpio/consumer.h>
 #include <linux/firmware/cirrus/cs_dsp.h>
 #endif
 };
+static inline struct cs35l56_hda *cs35l56_hda_from_base(struct cs35l56_base *cs35l56_base)
+{
+	return container_of(cs35l56_base, struct cs35l56_hda, base);
+}
 extern const struct dev_pm_ops cs35l56_hda_pm_ops;
 int cs35l56_hda_common_probe(struct cs35l56_hda *cs35l56, int hid, int id);

sound/hda/codecs/side-codecs/tas2781_hda_i2c.c+25−19

@@ -87,6 +87,7 @@ static const struct acpi_gpio_mapping tas2781_speaker_id_gpios[] = { · 86 unmodified lines
87		87
88	static int tas2781_read_acpi(struct tasdevice_priv p, const char hid)	88	static int tas2781_read_acpi(struct tasdevice_priv p, const char hid)
89	{	89	{
		90	struct gpio_desc *speaker_id;
90	struct acpi_device *adev;	91	struct acpi_device *adev;
91	struct device *physdev;	92	struct device *physdev;
92	LIST_HEAD(resources);	93	LIST_HEAD(resources);
@@ -119,19 +120,31 @@ static int tas2781_read_acpi(struct tasdevice_priv p, const char hid) · 26 unmodified lines
119	/* Speaker id was needed for ASUS projects. */	120	/* Speaker id was needed for ASUS projects. */
120	ret = kstrtou32(sub, 16, &subid);	121	ret = kstrtou32(sub, 16, &subid);
121	if (!ret && upper_16_bits(subid) == PCI_VENDOR_ID_ASUSTEK) {	122	if (!ret && upper_16_bits(subid) == PCI_VENDOR_ID_ASUSTEK) {
122	ret = devm_acpi_dev_add_driver_gpios(p->dev,	123	ret = acpi_dev_add_driver_gpios(adev, tas2781_speaker_id_gpios);
123	tas2781_speaker_id_gpios);	124	if (ret < 0) {
124	if (ret < 0)
125	dev_err(p->dev, "Failed to add driver gpio %d.\n",	125	dev_err(p->dev, "Failed to add driver gpio %d.\n",
126	ret);	126	ret);
127	p->speaker_id = devm_gpiod_get(p->dev, "speakerid", GPIOD_IN);	127	p->speaker_id = -1;
128	if (IS_ERR(p->speaker_id)) {	128	goto end_2563;
129	dev_err(p->dev, "Failed to get Speaker id.\n");	129	}
130	ret = PTR_ERR(p->speaker_id);	130
131	goto err;	131	speaker_id = fwnode_gpiod_get_index(acpi_fwnode_handle(adev),
		132	"speakerid", 0, GPIOD_IN, NULL);
		133	if (!IS_ERR(speaker_id)) {
		134	p->speaker_id = gpiod_get_value_cansleep(speaker_id);
		135	dev_dbg(p->dev, "Got speaker id gpio from ACPI: %d.\n",
		136	p->speaker_id);
		137	gpiod_put(speaker_id);
		138	} else {
		139	p->speaker_id = -1;
		140	ret = PTR_ERR(speaker_id);
		141	dev_err(p->dev, "Get speaker id gpio failed %d.\n",
		142	ret);
132	}	143	}
		144
		145	acpi_dev_remove_driver_gpios(adev);
133	} else {	146	} else {
134	p->speaker_id = NULL;	147	p->speaker_id = -1;
135	}	148	}
136		149
137	end_2563:	150	end_2563:
@@ -432,23 +445,16 @@ static void tasdevice_dspfw_init(void *context) · 294 unmodified lines
432	struct tas2781_hda *tas_hda = dev_get_drvdata(tas_priv->dev);	445	struct tas2781_hda *tas_hda = dev_get_drvdata(tas_priv->dev);
433	struct tas2781_hda_i2c_priv *hda_priv = tas_hda->hda_priv;	446	struct tas2781_hda_i2c_priv *hda_priv = tas_hda->hda_priv;
434	struct hda_codec *codec = tas_priv->codec;	447	struct hda_codec *codec = tas_priv->codec;
435	int ret, spk_id;	448	int ret;
436		449
437	tasdevice_dsp_remove(tas_priv);	450	tasdevice_dsp_remove(tas_priv);
438	tas_priv->fw_state = TASDEVICE_DSP_FW_PENDING;	451	tas_priv->fw_state = TASDEVICE_DSP_FW_PENDING;
439	if (tas_priv->speaker_id != NULL) {	452	if (tas_priv->speaker_id >= 0) {
440	// Speaker id need to be checked for ASUS only.
441	spk_id = gpiod_get_value(tas_priv->speaker_id);
442	if (spk_id < 0) {
443	// Speaker id is not valid, use default.
444	dev_dbg(tas_priv->dev, "Wrong spk_id = %d\n", spk_id);
445	spk_id = 0;
446	}
447	snprintf(tas_priv->coef_binaryname,	453	snprintf(tas_priv->coef_binaryname,
448	sizeof(tas_priv->coef_binaryname),	454	sizeof(tas_priv->coef_binaryname),
449	"TAS2XXX%04X%d.bin",	455	"TAS2XXX%04X%d.bin",
450	lower_16_bits(codec->core.subsystem_id),	456	lower_16_bits(codec->core.subsystem_id),
451	spk_id);	457	tas_priv->speaker_id);
452	} else {	458	} else {
453	snprintf(tas_priv->coef_binaryname,	459	snprintf(tas_priv->coef_binaryname,
454	sizeof(tas_priv->coef_binaryname),	460	sizeof(tas_priv->coef_binaryname),

sound/hda/controllers/intel.c+2−0

 	{ PCI_DEVICE_DATA(INTEL, HDA_PTL_H, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_LNL) },
 	/* Wildcat Lake */
 	{ PCI_DEVICE_DATA(INTEL, HDA_WCL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_LNL) },
+	/* Nova Lake */
+	{ PCI_DEVICE_DATA(INTEL, HDA_NVL_S, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_LNL) },
 	/* Apollolake (Broxton-P) */
 	{ PCI_DEVICE_DATA(INTEL, HDA_APL, AZX_DRIVER_SKL | AZX_DCAPS_INTEL_BROXTON) },
 	/* Gemini-Lake */

sound/hda/core/intel-dsp-config.c+8−0

@@ -578,6 +578,14 @@ static const struct config_entry config_table[] = { · 577 unmodified lines
578		578
579	#endif	579	#endif
580		580
		581	/* Nova Lake */
		582	#if IS_ENABLED(CONFIG_SND_SOC_SOF_NOVALAKE)
		583	{
		584	.flags = FLAG_SOF \| FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
		585	.device = PCI_DEVICE_ID_INTEL_HDA_NVL_S,
		586	},
		587	#endif
		588
581	};	589	};
582		590
583	static const struct config_entry *snd_intel_dsp_find_config	591	static const struct config_entry *snd_intel_dsp_find_config

sound/isa/gus/gus_reset.c+0−3

@@ -9,9 +9,6 @@ · 8 unmodified lines
9	#include <sound/core.h>	9	#include <sound/core.h>
10	#include <sound/gus.h>	10	#include <sound/gus.h>
11		11
12	extern int snd_gf1_synth_init(struct snd_gus_card * gus);
13	extern void snd_gf1_synth_done(struct snd_gus_card * gus);
14
15	/*	12	/*
16	* ok.. default interrupt handlers...	13	* ok.. default interrupt handlers...
17	*/	14	*/

sound/isa/wavefront/wavefront_midi.c+2−0

 	        return -EIO;
 	guard(spinlock_irqsave)(&midi->open);
+	midi->substream_input[mpu] = NULL;
 	midi->mode[mpu] &= ~MPU401_MODE_INPUT;
 	return 0;
 	        return -EIO;
 	guard(spinlock_irqsave)(&midi->open);
+	midi->substream_output[mpu] = NULL;
 	midi->mode[mpu] &= ~MPU401_MODE_OUTPUT;
 	return 0;
 }

sound/isa/wavefront/wavefront_synth.c+2−2

@@ -950,9 +950,9 @@ wavefront_send_sample (snd_wavefront_t *dev, · 949 unmodified lines
950	if (header->size) {	950	if (header->size) {
951	dev->freemem = wavefront_freemem (dev);	951	dev->freemem = wavefront_freemem (dev);
952		952
953	if (dev->freemem < (int)header->size) {	953	if (dev->freemem < 0 \|\| dev->freemem < header->size) {
954	dev_err(dev->card->dev,	954	dev_err(dev->card->dev,
955	"insufficient memory to load %d byte sample.\n",	955	"insufficient memory to load %u byte sample.\n",
956	header->size);	956	header->size);
957	return -ENOMEM;	957	return -ENOMEM;
958	}	958	}

sound/pci/au88x0/au88x0_eq.c+1−1

@@ -568,7 +568,7 @@ static int vortex_Eqlzr_SetAllBandsFromActiveCoeffSet(vortex_t * vortex) · 567 unmodified lines
568	eqlzr_t *eq = &(vortex->eq);	568	eqlzr_t *eq = &(vortex->eq);
569		569
570	vortex_EqHw_SetLeftGainsTarget(vortex, eq->this130);	570	vortex_EqHw_SetLeftGainsTarget(vortex, eq->this130);
571	vortex_EqHw_SetRightGainsTarget(vortex, &(eq->this130[eq->this10]));	571	vortex_EqHw_SetRightGainsTarget(vortex, eq->this130 + eq->this10);
572		572
573	return 0;	573	return 0;
574	}	574	}

sound/pci/ctxfi/ctatc.c+71−26

 #include <sound/control.h>
 #include <sound/asoundef.h>
+#define NUM_ATC_SRCS	6
+#define NUM_ATC_PCM		(2 * 4)
 #define MONO_SUM_SCALE	0x19a8	/* 2^(-0.5) in 14-bit floating format */
 #define MAX_MULTI_CHN	8
 	SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_CREATIVE, 0xf000,
 			   PCI_SUBDEVICE_ID_CREATIVE_HENDRIX, "HENDRIX",
 			   CTHENDRIX),
+	SND_PCI_QUIRK(0x160b, 0x0101, "OK0010", CTOK0010),
 	{ } /* terminator */
 };
 	[CTHENDRIX]	= "Hendrix",
 	[CTSB0880]	= "SB0880",
 	[CTSB1270]      = "SB1270",
+	[CTOK0010]    = "OK0010",
 	[CT20K2_UNKNOWN] = "Unknown",
 };
 	return hw->capabilities(hw);
 }
+static void atc_dedicated_rca_select(struct ct_atc *atc)
+{
+	struct dao *dao;
+	struct ct_mixer *mixer = atc->mixer;
+	struct rsc *rscs[2] = {NULL};
+	dao = container_of(atc->daios[atc->rca_state ? RCA : LINEO1],
+		struct dao, daio);
+	dao->ops->clear_left_input(dao);
+	dao->ops->clear_right_input(dao);
+	mixer->get_output_ports(mixer, MIX_WAVE_FRONT, &rscs[0], &rscs[1]);
+	dao = container_of(atc->daios[atc->rca_state ? LINEO1 : RCA],
+		struct dao, daio);
+	dao->ops->set_left_input(dao, rscs[0]);
+	dao->ops->set_right_input(dao, rscs[1]);
+}
 static int atc_output_switch_get(struct ct_atc *atc)
 {
 	struct hw *hw = atc->hw;
 	return atc_daio_unmute(atc, state, MIC);
 }
+static int atc_rca_unmute(struct ct_atc *atc, unsigned char state)
+{
+	return atc_daio_unmute(atc, state, RCA);
+}
 static int atc_spdif_out_unmute(struct ct_atc *atc, unsigned char state)
 {
 	return atc_daio_unmute(atc, state, SPDIFOO);
 	if (atc->daios) {
 		daio_mgr = (struct daio_mgr *)atc->rsc_mgrs[DAIO];
-		for (i = 0; i < atc->n_daio; i++) {
+		for (i = 0; i < NUM_DAIOTYP; i++) {
 			daio = atc->daios[i];
-			if (daio->type < LINEIM) {
+			if (!daio)
+				continue;
+			if (daio->output) {
 				dao = container_of(daio, struct dao, daio);
 				dao->ops->clear_left_input(dao);
 				dao->ops->clear_right_input(dao);
 	if (atc->pcm) {
 		sum_mgr = atc->rsc_mgrs[SUM];
-		for (i = 0; i < atc->n_pcm; i++)
+		for (i = 0; i < NUM_ATC_PCM; i++)
-			sum_mgr->put_sum(sum_mgr, atc->pcm[i]);
+			if (atc->pcm[i])
+				sum_mgr->put_sum(sum_mgr, atc->pcm[i]);
 		kfree(atc->pcm);
 		atc->pcm = NULL;
 	if (atc->srcs) {
 		src_mgr = atc->rsc_mgrs[SRC];
-		for (i = 0; i < atc->n_src; i++)
+		for (i = 0; i < NUM_ATC_SRCS; i++)
-			src_mgr->put_src(src_mgr, atc->srcs[i]);
+			if (atc->srcs[i])
+				src_mgr->put_src(src_mgr, atc->srcs[i]);
 		kfree(atc->srcs);
 		atc->srcs = NULL;
 	if (atc->srcimps) {
 		srcimp_mgr = atc->rsc_mgrs[SRCIMP];
-		for (i = 0; i < atc->n_srcimp; i++) {
+		for (i = 0; i < NUM_ATC_SRCS; i++) {
+			if (!atc->srcimps[i])
+				continue;
 			srcimp = atc->srcimps[i];
 			srcimp->ops->unmap(srcimp);
 			srcimp_mgr->put_srcimp(srcimp_mgr, atc->srcimps[i]);
 	dev_info(atc->card->dev, "chip %s model %s (%04x:%04x) is found\n",
 		   atc->chip_name, atc->model_name,
 		   vendor_id, device_id);
+	atc->rca_state = 0;
 	return 0;
 }
 	struct srcimp_mgr *srcimp_mgr;
 	struct sum_desc sum_dsc = {0};
 	struct sum_mgr *sum_mgr;
-	int err, i, num_srcs, num_daios;
+	struct capabilities cap;
+	int err, i;
-	num_daios = ((atc->model == CTSB1270) ? 8 : 7);
+	cap = atc->capabilities(atc);
-	num_srcs = ((atc->model == CTSB1270) ? 6 : 4);
-	atc->daios = kcalloc(num_daios, sizeof(void *), GFP_KERNEL);
+	atc->daios = kcalloc(NUM_DAIOTYP, sizeof(void *), GFP_KERNEL);
 	if (!atc->daios)
 		return -ENOMEM;
-	atc->srcs = kcalloc(num_srcs, sizeof(void *), GFP_KERNEL);
+	atc->srcs = kcalloc(NUM_ATC_SRCS, sizeof(void *), GFP_KERNEL);
 	if (!atc->srcs)
 		return -ENOMEM;
-	atc->srcimps = kcalloc(num_srcs, sizeof(void *), GFP_KERNEL);
+	atc->srcimps = kcalloc(NUM_ATC_SRCS, sizeof(void *), GFP_KERNEL);
 	if (!atc->srcimps)
 		return -ENOMEM;
-	atc->pcm = kcalloc(2 * 4, sizeof(void *), GFP_KERNEL);
+	atc->pcm = kcalloc(NUM_ATC_PCM, sizeof(void *), GFP_KERNEL);
 	if (!atc->pcm)
 		return -ENOMEM;
 	daio_mgr = (struct daio_mgr *)atc->rsc_mgrs[DAIO];
 	da_desc.msr = atc->msr;
-	for (i = 0, atc->n_daio = 0; i < num_daios; i++) {
+	for (i = 0; i < NUM_DAIOTYP; i++) {
+		if (((i == MIC) && !cap.dedicated_mic) || ((i == RCA) && !cap.dedicated_rca))
+			continue;
 		da_desc.type = (atc->model != CTSB073X) ? i :
 			     ((i == SPDIFIO) ? SPDIFI1 : i);
+		da_desc.output = (i < LINEIM) || (i == RCA);
 		err = daio_mgr->get_daio(daio_mgr, &da_desc,
 					(struct daio **)&atc->daios[i]);
 		if (err) {
 				i);
 			return err;
 		}
-		atc->n_daio++;
 	}
 	src_mgr = atc->rsc_mgrs[SRC];
 	src_dsc.multi = 1;
 	src_dsc.msr = atc->msr;
 	src_dsc.mode = ARCRW;
-	for (i = 0, atc->n_src = 0; i < num_srcs; i++) {
+	for (i = 0; i < NUM_ATC_SRCS; i++) {
+		if (((i > 3) && !cap.dedicated_mic))
+			continue;
 		err = src_mgr->get_src(src_mgr, &src_dsc,
 					(struct src **)&atc->srcs[i]);
 		if (err)
 			return err;
-		atc->n_src++;
 	}
 	srcimp_mgr = atc->rsc_mgrs[SRCIMP];
 	srcimp_dsc.msr = 8;
-	for (i = 0, atc->n_srcimp = 0; i < num_srcs; i++) {
+	for (i = 0; i < NUM_ATC_SRCS; i++) {
+		if (((i > 3) && !cap.dedicated_mic))
+			continue;
 		err = srcimp_mgr->get_srcimp(srcimp_mgr, &srcimp_dsc,
 					(struct srcimp **)&atc->srcimps[i]);
 		if (err)
 			return err;
-		atc->n_srcimp++;
 	}
 	sum_mgr = atc->rsc_mgrs[SUM];
 	sum_dsc.msr = atc->msr;
-	for (i = 0, atc->n_pcm = 0; i < (2*4); i++) {
+	for (i = 0; i < NUM_ATC_PCM; i++) {
 		err = sum_mgr->get_sum(sum_mgr, &sum_dsc,
 					(struct sum **)&atc->pcm[i]);
 		if (err)
 			return err;
-		atc->n_pcm++;
 	}
 	return 0;
 	struct sum *sum;
 	struct ct_mixer *mixer;
 	struct rsc *rscs[2] = {NULL};
+	struct capabilities cap;
 	int i, j;
 	mixer = atc->mixer;
+	cap = atc->capabilities(atc);
 	for (i = MIX_WAVE_FRONT, j = LINEO1; i <= MIX_SPDIF_OUT; i++, j++) {
 		mixer->get_output_ports(mixer, i, &rscs[0], &rscs[1]);
 		dao->ops->set_right_input(dao, rscs[1]);
 	}
+	if (cap.dedicated_rca) {
+		/* SE-300PCIE has a dedicated DAC for the RCA. */
+		atc_dedicated_rca_select(atc);
+	}
 	dai = container_of(atc->daios[LINEIM], struct dai, daio);
 	atc_connect_dai(atc->rsc_mgrs[SRC], dai,
 			(struct src **)&atc->srcs[2],
 	src = atc->srcs[3];
 	mixer->set_input_right(mixer, MIX_LINE_IN, &src->rsc);
-	if (atc->model == CTSB1270) {
+	if (cap.dedicated_mic) {
 		/* Titanium HD has a dedicated ADC for the Mic. */
+		/* SE-300PCIE has a 4-channel ADC. */
 		dai = container_of(atc->daios[MIC], struct dai, daio);
 		atc_connect_dai(atc->rsc_mgrs[SRC], dai,
 			(struct src **)&atc->srcs[4],
 	.line_rear_unmute = atc_line_rear_unmute,
 	.line_in_unmute = atc_line_in_unmute,
 	.mic_unmute = atc_mic_unmute,
+	.rca_unmute = atc_rca_unmute,
 	.spdif_out_unmute = atc_spdif_out_unmute,
 	.spdif_in_unmute = atc_spdif_in_unmute,
 	.spdif_out_get_status = atc_spdif_out_get_status,
 	.spdif_out_set_status = atc_spdif_out_set_status,
 	.spdif_out_passthru = atc_spdif_out_passthru,
 	.capabilities = atc_capabilities,
+	.dedicated_rca_select = atc_dedicated_rca_select,
 	.output_switch_get = atc_output_switch_get,
 	.output_switch_put = atc_output_switch_put,
 	.mic_source_switch_get = atc_mic_source_switch_get,

sound/pci/ctxfi/ctatc.h+4−4

 	const char *chip_name;
 	const char *model_name;
+	unsigned char rca_state; /* 0 = dedicated RCA, 1 = 7.1ch Front */
 	struct ct_vm *vm; /* device virtual memory manager for this card */
 	int (*map_audio_buffer)(struct ct_atc *atc, struct ct_atc_pcm *apcm);
 	void (*unmap_audio_buffer)(struct ct_atc *atc, struct ct_atc_pcm *apcm);
 	int (*line_rear_unmute)(struct ct_atc *atc, unsigned char state);
 	int (*line_in_unmute)(struct ct_atc *atc, unsigned char state);
 	int (*mic_unmute)(struct ct_atc *atc, unsigned char state);
+	int (*rca_unmute)(struct ct_atc *atc, unsigned char state);
 	int (*spdif_out_unmute)(struct ct_atc *atc, unsigned char state);
 	int (*spdif_in_unmute)(struct ct_atc *atc, unsigned char state);
 	int (*spdif_out_get_status)(struct ct_atc *atc, unsigned int *status);
 	int (*spdif_out_set_status)(struct ct_atc *atc, unsigned int status);
 	int (*spdif_out_passthru)(struct ct_atc *atc, unsigned char state);
 	struct capabilities (*capabilities)(struct ct_atc *atc);
+	void (*dedicated_rca_select)(struct ct_atc *atc);
 	int (*output_switch_get)(struct ct_atc *atc);
 	int (*output_switch_put)(struct ct_atc *atc, int position);
 	int (*mic_source_switch_get)(struct ct_atc *atc);
 	void **pcm;		/* SUMs for collecting all pcm stream */
 	void **srcs;		/* Sample Rate Converters for input signal */
 	void **srcimps;		/* input mappers for SRCs */
-	unsigned char n_daio;
-	unsigned char n_src;
-	unsigned char n_srcimp;
-	unsigned char n_pcm;
 	struct ct_timer *timer;

sound/pci/ctxfi/ctdaio.c+10−8

 #include <linux/slab.h>
 #include <linux/kernel.h>
-#define DAIO_OUT_MAX		SPDIFOO
 struct daio_usage {
 	unsigned short data;
 };
 	[LINEO4] = {.left = 0x70, .right = 0x71},
 	[LINEIM] = {.left = 0x45, .right = 0xc5},
 	[MIC]	 = {.left = 0x55, .right = 0xd5},
+	[RCA]	 = {.left = 0x30, .right = 0x31},
 	[SPDIFOO] = {.left = 0x00, .right = 0x01},
 	[SPDIFIO] = {.left = 0x05, .right = 0x85},
 };
 		case LINEO4:	return 6;
 		case LINEIM:	return 4;
 		case MIC:	return 5;
+		case RCA:	return 3;
 		default:	return -EINVAL;
 		}
 	default:
 		goto error1;
 	/* Set daio->rscl/r->ops to daio specific ones */
-	if (desc->type <= DAIO_OUT_MAX) {
+	if (desc->output) {
 		daio->rscl.ops = daio->rscr.ops = &daio_out_rsc_ops;
 	} else {
 		switch (hw->chip_type) {
 		}
 	}
 	daio->type = desc->type;
+	daio->output = desc->output;
 	return 0;
 	hw->daio_mgr_commit_write(hw, mgr->mgr.ctrl_blk);
 	conf = (desc->msr & 0x7) | (desc->passthru << 3);
-	hw->daio_mgr_dao_init(mgr->mgr.ctrl_blk,
+	hw->daio_mgr_dao_init(hw, mgr->mgr.ctrl_blk,
 			daio_device_index(dao->daio.type, hw), conf);
 	hw->daio_mgr_enb_dao(mgr->mgr.ctrl_blk,
 			daio_device_index(dao->daio.type, hw));
 	dsc.type = dao->daio.type;
 	dsc.msr = desc->msr;
 	dsc.passthru = desc->passthru;
+	dsc.output = dao->daio.output;
 	dao_rsc_uninit(dao);
 	return dao_rsc_init(dao, &dsc, mgr);
 }
 	err = -ENOMEM;
 	/* Allocate mem for daio resource */
-	if (desc->type <= DAIO_OUT_MAX) {
+	if (desc->output) {
 		struct dao *dao = kzalloc(sizeof(*dao), GFP_KERNEL);
 		if (!dao)
 			goto error;
 		daio_mgr_put_rsc(&mgr->mgr, daio->type);
 	}
-	if (daio->type <= DAIO_OUT_MAX) {
+	if (daio->output) {
 		dao_rsc_uninit(container_of(daio, struct dao, daio));
 		kfree(container_of(daio, struct dao, daio));
 	} else {
 {
 	struct hw *hw = mgr->mgr.hw;
-	if (DAIO_OUT_MAX >= daio->type) {
+	if (daio->output) {
 		hw->daio_mgr_enb_dao(mgr->mgr.ctrl_blk,
 				daio_device_index(daio->type, hw));
 	} else {
 {
 	struct hw *hw = mgr->mgr.hw;
-	if (DAIO_OUT_MAX >= daio->type) {
+	if (daio->output) {
 		hw->daio_mgr_dsb_dao(mgr->mgr.ctrl_blk,
 				daio_device_index(daio->type, hw));
 	} else {

sound/pci/ctxfi/ctdaio.h+3−0

 	LINEIM,
 	SPDIFIO,	/* S/PDIF In (Flexijack/Optical) on the card */
 	MIC,		/* Dedicated mic on Titanium HD */
+	RCA,		/* Dedicated RCA on SE-300PCIE */
 	SPDIFI1,	/* S/PDIF In on internal Drive Bay */
 	NUM_DAIOTYP
 };
 	struct rsc rscl;	/* Basic resource info for left TX/RX */
 	struct rsc rscr;	/* Basic resource info for right TX/RX */
 	enum DAIOTYP type;
+	unsigned char output;
 };
 struct dao {
 	unsigned int type:4;
 	unsigned int msr:4;
 	unsigned int passthru:1;
+	unsigned int output:1;
 };
 struct daio_mgr {

sound/pci/ctxfi/cthardware.h+3−1

 	CTHENDRIX,
 	CTSB0880,
 	CTSB1270,
+	CTOK0010,
 	CT20K2_UNKNOWN,
 	NUM_CTCARDS		/* This should always be the last */
 };
 struct capabilities {
 	unsigned int digit_io_switch:1;
 	unsigned int dedicated_mic:1;
+	unsigned int dedicated_rca:1;
 	unsigned int output_switch:1;
 	unsigned int mic_source_switch:1;
 };
 	int (*daio_mgr_dsb_dai)(void *blk, unsigned int idx);
 	int (*daio_mgr_enb_dao)(void *blk, unsigned int idx);
 	int (*daio_mgr_dsb_dao)(void *blk, unsigned int idx);
-	int (*daio_mgr_dao_init)(void *blk, unsigned int idx,
+	int (*daio_mgr_dao_init)(struct hw *hw, void *blk, unsigned int idx,
 						unsigned int conf);
 	int (*daio_mgr_set_imaparc)(void *blk, unsigned int slot);
 	int (*daio_mgr_set_imapnxt)(void *blk, unsigned int next);

sound/pci/ctxfi/cthw20k1.c+2−1

 	return 0;
 }
-static int daio_mgr_dao_init(void *blk, unsigned int idx, unsigned int conf)
+static int daio_mgr_dao_init(struct hw *hw __maybe_unused, void *blk, unsigned int idx, unsigned int conf)
 {
 	struct daio_mgr_ctrl_blk *ctl = blk;
 	/* SB073x and Vista compatible cards have no digit IO switch */
 	cap.digit_io_switch = !(hw->model == CTSB073X || hw->model == CTUAA);
 	cap.dedicated_mic = 0;
+	cap.dedicated_rca = 0;
 	cap.output_switch = 0;
 	cap.mic_source_switch = 0;

sound/pci/ctxfi/cthw20k2.c+62−19

 	struct dao_ctrl_blk *ctl = blk;
 	if (ctl->dirty.bf.atxcsl) {
-		if (idx < 4) {
+		if ((idx < 4) && ((hw->model != CTOK0010) || (idx < 3))) {
 			/* S/PDIF SPOSx */
 			hw_write_20kx(hw, AUDIO_IO_TX_CSTAT_L+0x40*idx,
 							ctl->atxcsl);
 	return 0;
 }
-static int daio_mgr_dao_init(void *blk, unsigned int idx, unsigned int conf)
+static int daio_mgr_dao_init(struct hw *hw, void *blk, unsigned int idx, unsigned int conf)
 {
 	struct daio_mgr_ctrl_blk *ctl = blk;
-	if (idx < 4) {
+	/* Port 3 is dedicated to RCA on SE-300PCIE */
+	if ((idx < 4) && ((hw->model != CTOK0010) || (idx < 3))) {
 		/* S/PDIF output */
 		switch ((conf & 0xf)) {
 		case 1:
 		hw_write_20kx(hw, AUDIO_IO_MCLK, 0x21011111);
 		hw_write_20kx(hw, AUDIO_IO_TX_BLRCLK, 0x21212121);
 		hw_write_20kx(hw, AUDIO_IO_RX_BLRCLK, 0);
+	} else if ((4 == info->msr) && (hw->model == CTOK0010)) {
+		hw_write_20kx(hw, AUDIO_IO_MCLK, 0x21212121);
+		hw_write_20kx(hw, AUDIO_IO_TX_BLRCLK, 0x21212121);
+		hw_write_20kx(hw, AUDIO_IO_RX_BLRCLK, 0);
 	} else {
 		dev_alert(hw->card->dev,
 			  "ERROR!!! Invalid sampling rate!!!\n");
 	}
 	for (i = 0; i < 8; i++) {
-		if (i <= 3) {
+		/* Port 3 is configured as I2S on SE-300PCIE */
+		if ((i < 4) && ((hw->model != CTOK0010) || (i < 3))) {
 			/* This comment looks wrong since loop is over 4  */
 			/* channels and emu20k2 supports 4 spdif IOs.     */
 			/* 1st 3 channels are SPDIFs (SB0960) */
 		hw_write_20kx(hw, GPIO_DATA, data);
 		hw_dac_start(hw);
 		return 0;
+	} else if (hw->model == CTOK0010) {
+		hw_dac_stop(hw);
+		data = hw_read_20kx(hw, GPIO_DATA);
+		data |= 0x1000;
+		hw_write_20kx(hw, GPIO_DATA, data);
+		hw_dac_start(hw);
+		return 0;
 	}
 	/* Set DAC reset bit as output */
 static int hw_is_adc_input_selected(struct hw *hw, enum ADCSRC type)
 {
 	u32 data;
-	if (hw->model == CTSB1270) {
+	if ((hw->model == CTSB1270) || (hw->model == CTOK0010)) {
 		/* Titanium HD has two ADC chips, one for line in and one */
-		/* for MIC. We don't need to switch the ADC input. */
+		/* for MIC. Also, SE-300PCIE has a single ADC chip that */
+		/* simultaneously supports 4-channel input. We don't need */
+		/* to switch the ADC input. */
 		return 1;
 	}
 	data = hw_read_20kx(hw, GPIO_DATA);
 	return 0;
 }
+static void hw_adc_stop(struct hw *hw)
+{
+	u32 data;
+	/* Reset the ADC (reset is active low). */
+	data = hw_read_20kx(hw, GPIO_DATA);
+	data &= ~(0x1 << 15);
+	hw_write_20kx(hw, GPIO_DATA, data);
+	usleep_range(10000, 11000);
+}
+static void hw_adc_start(struct hw *hw)
+{
+	u32 data;
+	/* Return the ADC to normal operation. */
+	data = hw_read_20kx(hw, GPIO_DATA);
+	data |= (0x1 << 15);
+	hw_write_20kx(hw, GPIO_DATA, data);
+	msleep(50);
+}
+static void hw_adc_reset(struct hw *hw)
+{
+	hw_adc_stop(hw);
+	hw_adc_start(hw);
+}
 static int hw_adc_init(struct hw *hw, const struct adc_conf *info)
 {
 	int err;
 	data |= (0x1 << 15);
 	hw_write_20kx(hw, GPIO_CTRL, data);
+	if (hw->model == CTOK0010) {
+		/* Manual ADC setup for SE-300PCIE is not needed. */
+		hw_adc_reset(hw);
+		return 0;
+	}
 	/* Initialize I2C */
 	err = hw20k2_i2c_init(hw, 0x1A, 1, 1);
 	if (err < 0) {
 		goto error;
 	}
-	/* Reset the ADC (reset is active low). */
+	hw_adc_stop(hw);
-	data = hw_read_20kx(hw, GPIO_DATA);
-	data &= ~(0x1 << 15);
-	hw_write_20kx(hw, GPIO_DATA, data);
 	if (hw->model == CTSB1270) {
 		/* Set up the PCM4220 ADC on Titanium HD */
 		hw_write_20kx(hw, GPIO_DATA, data);
 	}
-	usleep_range(10000, 11000);
+	hw_adc_start(hw);
-	/* Return the ADC to normal operation. */
-	data |= (0x1 << 15);
-	hw_write_20kx(hw, GPIO_DATA, data);
-	msleep(50);
 	/* I2C write to register offset 0x0B to set ADC LRCLK polarity */
 	/* invert bit, interface format to I2S, word length to 24-bit, */
 	struct capabilities cap;
 	cap.digit_io_switch = 0;
-	cap.dedicated_mic = hw->model == CTSB1270;
+	cap.dedicated_mic = (hw->model == CTSB1270) || (hw->model == CTOK0010);
+	cap.dedicated_rca = hw->model == CTOK0010;
 	cap.output_switch = hw->model == CTSB1270;
 	cap.mic_source_switch = hw->model == CTSB1270;
 	/* Reset all SRC pending interrupts */
 	hw_write_20kx(hw, SRC_IP, 0);
-	if (hw->model != CTSB1270) {
+	if (hw->model == CTSB1270) {
+		hw_write_20kx(hw, GPIO_CTRL, 0x9E5F);
+	} else if (hw->model == CTOK0010) {
+		hw_write_20kx(hw, GPIO_CTRL, 0x9902);
+	} else {
 		/* TODO: detect the card ID and configure GPIO accordingly. */
 		/* Configures GPIO (0xD802 0x98028) */
 		/*hw_write_20kx(hw, GPIO_CTRL, 0x7F07);*/
 		/* Configures GPIO (SB0880) */
 		/*hw_write_20kx(hw, GPIO_CTRL, 0xFF07);*/
 		hw_write_20kx(hw, GPIO_CTRL, 0xD802);
-	} else {
-		hw_write_20kx(hw, GPIO_CTRL, 0x9E5F);
 	}
 	/* Enable audio ring */
 	hw_write_20kx(hw, MIXER_AR_ENABLE, 0x01);

sound/pci/ctxfi/ctmixer.c+70−3

@@ -547,8 +547,14 @@ static void do_switch(struct ct_atc *atc, enum CTALSA_MIXER_CTL type, int state) · 546 unmodified lines
547	atc->mic_unmute(atc, state);	547	atc->mic_unmute(atc, state);
548	else if (MIXER_SPDIFI_C_S == type)	548	else if (MIXER_SPDIFI_C_S == type)
549	atc->spdif_in_unmute(atc, state);	549	atc->spdif_in_unmute(atc, state);
550	else if (MIXER_WAVEF_P_S == type)	550	else if (MIXER_WAVEF_P_S == type) {
551	atc->line_front_unmute(atc, state);	551	if (cap.dedicated_rca) {
		552	atc->rca_unmute(atc, atc->rca_state ? 0 : state);
		553	atc->line_front_unmute(atc, atc->rca_state ? state : 0);
		554	} else {
		555	atc->line_front_unmute(atc, state);
		556	}
		557	}
552	else if (MIXER_WAVES_P_S == type)	558	else if (MIXER_WAVES_P_S == type)
553	atc->line_surround_unmute(atc, state);	559	atc->line_surround_unmute(atc, state);
554	else if (MIXER_WAVEC_P_S == type)	560	else if (MIXER_WAVEC_P_S == type)
@@ -612,6 +618,57 @@ static struct snd_kcontrol_new swh_ctl = { · 57 unmodified lines
612	.put = ct_alsa_mix_switch_put	618	.put = ct_alsa_mix_switch_put
613	};	619	};
614		620
		621	static int dedicated_rca_info(struct snd_kcontrol *kcontrol,
		622	struct snd_ctl_elem_info *info)
		623	{
		624	static const char *const names[2] = {
		625	"RCA", "Front"
		626	};
		627
		628	return snd_ctl_enum_info(info, 1, 2, names);
		629	}
		630
		631	static int dedicated_rca_get(struct snd_kcontrol *kcontrol,
		632	struct snd_ctl_elem_value *ucontrol)
		633	{
		634	struct ct_atc *atc = snd_kcontrol_chip(kcontrol);
		635
		636	ucontrol->value.enumerated.item[0] = atc->rca_state;
		637	return 0;
		638	}
		639
		640	static int dedicated_rca_put(struct snd_kcontrol *kcontrol,
		641	struct snd_ctl_elem_value *ucontrol)
		642	{
		643	struct ct_atc *atc = snd_kcontrol_chip(kcontrol);
		644	unsigned int rca_state = ucontrol->value.enumerated.item[0];
		645	unsigned char state;
		646
		647	if (rca_state > 1)
		648	return -EINVAL;
		649
		650	if (rca_state == atc->rca_state)
		651	return 0;
		652
		653	state = get_switch_state(atc->mixer, MIXER_WAVEF_P_S);
		654	do_switch(atc, MIXER_WAVEF_P_S, 0);
		655
		656	atc->rca_state = rca_state;
		657	atc->dedicated_rca_select(atc);
		658
		659	do_switch(atc, MIXER_WAVEF_P_S, state);
		660
		661	return 1;
		662	}
		663
		664	static struct snd_kcontrol_new rca_ctl = {
		665	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
		666	.name = "Analog Playback Route",
		667	.info = dedicated_rca_info,
		668	.get = dedicated_rca_get,
		669	.put = dedicated_rca_put,
		670	};
		671
615	static int ct_spdif_info(struct snd_kcontrol *kcontrol,	672	static int ct_spdif_info(struct snd_kcontrol *kcontrol,
616	struct snd_ctl_elem_info *uinfo)	673	struct snd_ctl_elem_info *uinfo)
617	{	674	{
@@ -784,7 +841,17 @@ static int ct_mixer_kcontrols_create(struct ct_mixer *mixer) · 166 unmodified lines
784	if (err)	841	if (err)
785	return err;	842	return err;
786	}	843	}
787	atc->line_front_unmute(atc, 1);	844
		845	if (cap.dedicated_rca) {
		846	err = ct_mixer_kcontrol_new(mixer, &rca_ctl);
		847	if (err)
		848	return err;
		849
		850	atc->line_front_unmute(atc, 0);
		851	atc->rca_unmute(atc, 1);
		852	} else {
		853	atc->line_front_unmute(atc, 1);
		854	}
788	set_switch_state(mixer, MIXER_WAVEF_P_S, 1);	855	set_switch_state(mixer, MIXER_WAVEF_P_S, 1);
789	atc->line_surround_unmute(atc, 0);	856	atc->line_surround_unmute(atc, 0);
790	set_switch_state(mixer, MIXER_WAVES_P_S, 0);	857	set_switch_state(mixer, MIXER_WAVES_P_S, 0);

sound/pci/maestro3.c+3−3

@@ -2571,9 +2571,9 @@ snd_m3_create(struct snd_card card, struct pci_dev pci, · 2570 unmodified lines
2571		2571
2572	if (IS_ENABLED(CONFIG_PM_SLEEP)) {	2572	if (IS_ENABLED(CONFIG_PM_SLEEP)) {
2573	chip->suspend_mem =	2573	chip->suspend_mem =
2574	vmalloc(array_size(sizeof(u16),	2574	vmalloc_array(REV_B_CODE_MEMORY_LENGTH +
2575	REV_B_CODE_MEMORY_LENGTH +	2575	REV_B_DATA_MEMORY_LENGTH,
2576	REV_B_DATA_MEMORY_LENGTH));	2576	sizeof(u16));
2577	if (!chip->suspend_mem)	2577	if (!chip->suspend_mem)
2578	dev_warn(card->dev, "can't allocate apm buffer\n");	2578	dev_warn(card->dev, "can't allocate apm buffer\n");
2579	}	2579	}

sound/soc/Kconfig+1−0

@@ -127,6 +127,7 @@ source "sound/soc/renesas/Kconfig" · 126 unmodified lines
127	source "sound/soc/rockchip/Kconfig"	127	source "sound/soc/rockchip/Kconfig"
128	source "sound/soc/samsung/Kconfig"	128	source "sound/soc/samsung/Kconfig"
129	source "sound/soc/sdca/Kconfig"	129	source "sound/soc/sdca/Kconfig"
		130	source "sound/soc/spacemit/Kconfig"
130	source "sound/soc/spear/Kconfig"	131	source "sound/soc/spear/Kconfig"
131	source "sound/soc/sprd/Kconfig"	132	source "sound/soc/sprd/Kconfig"
132	source "sound/soc/starfive/Kconfig"	133	source "sound/soc/starfive/Kconfig"

sound/soc/Makefile+1−0

@@ -70,6 +70,7 @@ obj-$(CONFIG_SND_SOC) += rockchip/ · 69 unmodified lines
70	obj-$(CONFIG_SND_SOC) += samsung/	70	obj-$(CONFIG_SND_SOC) += samsung/
71	obj-$(CONFIG_SND_SOC) += sdca/	71	obj-$(CONFIG_SND_SOC) += sdca/
72	obj-$(CONFIG_SND_SOC) += sof/	72	obj-$(CONFIG_SND_SOC) += sof/
		73	obj-$(CONFIG_SND_SOC) += spacemit/
73	obj-$(CONFIG_SND_SOC) += spear/	74	obj-$(CONFIG_SND_SOC) += spear/
74	obj-$(CONFIG_SND_SOC) += sprd/	75	obj-$(CONFIG_SND_SOC) += sprd/
75	obj-$(CONFIG_SND_SOC) += starfive/	76	obj-$(CONFIG_SND_SOC) += starfive/

sound/soc/amd/acp/acp-mach-common.c+23−17

 static int acp_card_rt5682_init(struct snd_soc_pcm_runtime *rtd)
 {
 	struct snd_soc_card *card = rtd->card;
+	struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card);
 	struct acp_card_drvdata *drvdata = card->drvdata;
 	struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0);
 	struct snd_soc_component *component = codec_dai->component;
 	drvdata->wclk = clk_get(component->dev, "rt5682-dai-wclk");
 	drvdata->bclk = clk_get(component->dev, "rt5682-dai-bclk");
-	ret = snd_soc_dapm_new_controls(&card->dapm, rt5682_widgets,
+	ret = snd_soc_dapm_new_controls(dapm, rt5682_widgets,
 					ARRAY_SIZE(rt5682_widgets));
 	if (ret) {
 		dev_err(rtd->dev, "unable to add widget dapm controls, ret %d\n", ret);
 		return ret;
 	}
-	return snd_soc_dapm_add_routes(&rtd->card->dapm, rt5682_map, ARRAY_SIZE(rt5682_map));
+	return snd_soc_dapm_add_routes(dapm, rt5682_map, ARRAY_SIZE(rt5682_map));
 }
 static int acp_card_hs_startup(struct snd_pcm_substream *substream)
 static int acp_card_rt5682s_init(struct snd_soc_pcm_runtime *rtd)
 {
 	struct snd_soc_card *card = rtd->card;
+	struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card);
 	struct acp_card_drvdata *drvdata = card->drvdata;
 	struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0);
 	struct snd_soc_component *component = codec_dai->component;
 		drvdata->bclk = clk_get(component->dev, "rt5682-dai-bclk");
 	}
-	ret = snd_soc_dapm_new_controls(&card->dapm, rt5682s_widgets,
+	ret = snd_soc_dapm_new_controls(dapm, rt5682s_widgets,
 					ARRAY_SIZE(rt5682s_widgets));
 	if (ret) {
 		dev_err(rtd->dev, "unable to add widget dapm controls, ret %d\n", ret);
 		return ret;
 	}
-	return snd_soc_dapm_add_routes(&rtd->card->dapm, rt5682s_map, ARRAY_SIZE(rt5682s_map));
+	return snd_soc_dapm_add_routes(dapm, rt5682s_map, ARRAY_SIZE(rt5682s_map));
 }
 static int acp_card_rt5682s_hw_params(struct snd_pcm_substream *substream,
 static int acp_card_rt1019_init(struct snd_soc_pcm_runtime *rtd)
 {
 	struct snd_soc_card *card = rtd->card;
+	struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card);
 	struct acp_card_drvdata *drvdata = card->drvdata;
 	int ret;
 	if (drvdata->amp_codec_id != RT1019)
 		return -EINVAL;
-	ret = snd_soc_dapm_new_controls(&card->dapm, rt1019_widgets,
+	ret = snd_soc_dapm_new_controls(dapm, rt1019_widgets,
 					ARRAY_SIZE(rt1019_widgets));
 	if (ret) {
 		dev_err(rtd->dev, "unable to add widget dapm controls, ret %d\n", ret);
 		return ret;
 	}
-	return snd_soc_dapm_add_routes(&rtd->card->dapm, rt1019_map_lr,
+	return snd_soc_dapm_add_routes(dapm, rt1019_map_lr,
 				       ARRAY_SIZE(rt1019_map_lr));
 }
 static int acp_card_maxim_init(struct snd_soc_pcm_runtime *rtd)
 {
 	struct snd_soc_card *card = rtd->card;
+	struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card);
 	struct acp_card_drvdata *drvdata = card->drvdata;
 	int ret;
 	if (drvdata->amp_codec_id != MAX98360A)
 		return -EINVAL;
-	ret = snd_soc_dapm_new_controls(&card->dapm, max98360a_widgets,
+	ret = snd_soc_dapm_new_controls(dapm, max98360a_widgets,
 					ARRAY_SIZE(max98360a_widgets));
 	if (ret) {
 		dev_err(rtd->dev, "unable to add widget dapm controls, ret %d\n", ret);
 		return ret;
 	}
-	return snd_soc_dapm_add_routes(&rtd->card->dapm, max98360a_map,
+	return snd_soc_dapm_add_routes(dapm, max98360a_map,
 				       ARRAY_SIZE(max98360a_map));
 }
 static int acp_card_max98388_init(struct snd_soc_pcm_runtime *rtd)
 {
 	struct snd_soc_card *card = rtd->card;
+	struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card);
 	struct acp_card_drvdata *drvdata = card->drvdata;
 	int ret;
 	if (drvdata->amp_codec_id != MAX98388)
 		return -EINVAL;
-	ret = snd_soc_dapm_new_controls(&card->dapm, max98388_widgets,
+	ret = snd_soc_dapm_new_controls(dapm, max98388_widgets,
 					ARRAY_SIZE(max98388_widgets));
 	if (ret) {
 		return ret;
 	}
-	return snd_soc_dapm_add_routes(&rtd->card->dapm, max98388_map,
+	return snd_soc_dapm_add_routes(dapm, max98388_map,
 				       ARRAY_SIZE(max98388_map));
 }
 static int acp_card_nau8825_init(struct snd_soc_pcm_runtime *rtd)
 {
 	struct snd_soc_card *card = rtd->card;
+	struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card);
 	struct acp_card_drvdata *drvdata = card->drvdata;
 	struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0);
 	struct snd_soc_component *component = codec_dai->component;
 	if (drvdata->hs_codec_id != NAU8825)
 		return -EINVAL;
-	ret = snd_soc_dapm_new_controls(&card->dapm, nau8825_widgets,
+	ret = snd_soc_dapm_new_controls(dapm, nau8825_widgets,
 					ARRAY_SIZE(nau8825_widgets));
 	if (ret) {
 		dev_err(rtd->dev, "unable to add widget dapm controls, ret %d\n", ret);
 		return ret;
 	}
-	return snd_soc_dapm_add_routes(&rtd->card->dapm, nau8825_map, ARRAY_SIZE(nau8825_map));
+	return snd_soc_dapm_add_routes(dapm, nau8825_map, ARRAY_SIZE(nau8825_map));
 }
 static int acp_nau8825_hw_params(struct snd_pcm_substream *substream,
 static int platform_clock_control(struct snd_soc_dapm_widget *w,
 				  struct snd_kcontrol *k, int  event)
 {
-	struct snd_soc_dapm_context *dapm = w->dapm;
+	struct snd_soc_card *card = snd_soc_dapm_to_card(w->dapm);
-	struct snd_soc_card *card = dapm->card;
 	struct snd_soc_dai *codec_dai;
 	int ret = 0;
 static int acp_8821_init(struct snd_soc_pcm_runtime *rtd)
 {
 	struct snd_soc_card *card = rtd->card;
+	struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card);
 	struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0);
 	struct snd_soc_component *component = codec_dai->component;
 	int ret;
 	dev_info(rtd->dev, "codec dai name = %s\n", codec_dai->name);
-	ret = snd_soc_dapm_new_controls(&card->dapm, nau8821_widgets,
+	ret = snd_soc_dapm_new_controls(dapm, nau8821_widgets,
 					ARRAY_SIZE(nau8821_widgets));
 	if (ret) {
 		dev_err(rtd->dev, "unable to add widget dapm controls, ret %d\n", ret);
 	nau8821_enable_jack_detect(component, &nau8821_jack);
-	return snd_soc_dapm_add_routes(&rtd->card->dapm, nau8821_audio_route,
+	return snd_soc_dapm_add_routes(dapm, nau8821_audio_route,
 				       ARRAY_SIZE(nau8821_audio_route));
 }
 				  struct snd_soc_dapm_context *dapm,
 				  enum snd_soc_bias_level level)
 {
-	struct snd_soc_component *component = dapm->component;
+	struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
 	struct acp_card_drvdata *drvdata = card->drvdata;
 	int ret = 0;

sound/soc/amd/acp/acp-sdw-legacy-mach.c+19−4

 	struct snd_soc_acpi_mach_params *mach_params = &mach->mach_params;
 	struct asoc_sdw_endpoint *soc_ends __free(kfree) = NULL;
 	struct asoc_sdw_dailink *soc_dais __free(kfree) = NULL;
+	struct snd_soc_aux_dev *soc_aux;
 	struct snd_soc_codec_conf *codec_conf;
 	struct snd_soc_dai_link *dai_links;
 	int num_devs = 0;
 	int num_ends = 0;
+	int num_aux = 0;
+	int num_confs;
 	int num_links;
 	int be_id = 0;
 	int ret;
-	ret = asoc_sdw_count_sdw_endpoints(card, &num_devs, &num_ends);
+	ret = asoc_sdw_count_sdw_endpoints(card, &num_devs, &num_ends, &num_aux);
 	if (ret < 0) {
 		dev_err(dev, "failed to count devices/endpoints: %d\n", ret);
 		return ret;
 	}
+	num_confs = num_ends;
 	/* One per DAI link, worst case is a DAI link for every endpoint */
 	soc_dais = kcalloc(num_ends, sizeof(*soc_dais), GFP_KERNEL);
 	if (!soc_dais)
 	if (!soc_ends)
 		return -ENOMEM;
-	ret = asoc_sdw_parse_sdw_endpoints(card, soc_dais, soc_ends, &num_devs);
+	soc_aux = devm_kcalloc(dev, num_aux, sizeof(*soc_aux), GFP_KERNEL);
+	if (!soc_aux)
+		return -ENOMEM;
+	ret = asoc_sdw_parse_sdw_endpoints(card, soc_aux, soc_dais, soc_ends, &num_confs);
 	if (ret < 0)
 		return ret;
 	dev_dbg(dev, "sdw %d, dmic %d", sdw_be_num, dmic_num);
-	codec_conf = devm_kcalloc(dev, num_devs, sizeof(*codec_conf), GFP_KERNEL);
+	codec_conf = devm_kcalloc(dev, num_confs, sizeof(*codec_conf), GFP_KERNEL);
 	if (!codec_conf)
 		return -ENOMEM;
 		return -ENOMEM;
 	card->codec_conf = codec_conf;
-	card->num_configs = num_devs;
+	card->num_configs = num_confs;
 	card->dai_link = dai_links;
 	card->num_links = num_links;
+	card->aux_dev = soc_aux;
+	card->num_aux_devs = num_aux;
 	/* SDW */
 	if (sdw_be_num) {
 	card->late_probe = asoc_sdw_card_late_probe;
 	snd_soc_card_set_drvdata(card, ctx);
+	if (mach->mach_params.subsystem_id_set)
+		snd_soc_card_set_pci_ssid(card,
+					  mach->mach_params.subsystem_vendor,
+					  mach->mach_params.subsystem_device);
 	dmi_check_system(soc_sdw_quirk_table);

sound/soc/amd/acp/acp-sdw-sof-mach.c+10−2

 	struct snd_soc_acpi_mach_params *mach_params = &mach->mach_params;
 	struct asoc_sdw_endpoint *sof_ends __free(kfree) = NULL;
 	struct asoc_sdw_dailink *sof_dais __free(kfree) = NULL;
+	struct snd_soc_aux_dev *sof_aux;
 	struct snd_soc_codec_conf *codec_conf;
 	struct snd_soc_dai_link *dai_links;
 	int num_devs = 0;
 	int num_ends = 0;
+	int num_aux = 0;
 	int num_links;
 	int be_id = 0;
 	int ret;
-	ret = asoc_sdw_count_sdw_endpoints(card, &num_devs, &num_ends);
+	ret = asoc_sdw_count_sdw_endpoints(card, &num_devs, &num_ends, &num_aux);
 	if (ret < 0) {
 		dev_err(dev, "failed to count devices/endpoints: %d\n", ret);
 		return ret;
 	if (!sof_ends)
 		return -ENOMEM;
-	ret = asoc_sdw_parse_sdw_endpoints(card, sof_dais, sof_ends, &num_devs);
+	sof_aux = devm_kcalloc(dev, num_aux, sizeof(*sof_aux), GFP_KERNEL);
+	if (!sof_aux)
+		return -ENOMEM;
+	ret = asoc_sdw_parse_sdw_endpoints(card, sof_aux, sof_dais, sof_ends, &num_devs);
 	if (ret < 0)
 		return ret;
 	card->num_configs = num_devs;
 	card->dai_link = dai_links;
 	card->num_links = num_links;
+	card->aux_dev = sof_aux;
+	card->num_aux_devs = num_aux;
 	/* SDW */
 	if (sdw_be_num) {

sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.c+7−3

 static int acp3x_es83xx_headphone_power_event(struct snd_soc_dapm_widget *w,
 					      struct snd_kcontrol *kcontrol, int event)
 {
-	struct acp3x_es83xx_private *priv = get_mach_priv(w->dapm->card);
+	struct snd_soc_card *card = snd_soc_dapm_to_card(w->dapm);
+	struct acp3x_es83xx_private *priv = get_mach_priv(card);
 	dev_dbg(priv->codec_dev, "headphone power event = %d\n", event);
 	if (SND_SOC_DAPM_EVENT_ON(event))
 static int acp3x_es83xx_speaker_power_event(struct snd_soc_dapm_widget *w,
 					    struct snd_kcontrol *kcontrol, int event)
 {
-	struct acp3x_es83xx_private *priv = get_mach_priv(w->dapm->card);
+	struct snd_soc_card *card = snd_soc_dapm_to_card(w->dapm);
+	struct acp3x_es83xx_private *priv = get_mach_priv(card);
 	dev_dbg(priv->codec_dev, "speaker power event: %d\n", event);
 	if (SND_SOC_DAPM_EVENT_ON(event))
 	num_routes = acp3x_es83xx_configure_mics(priv);
 	if (num_routes > 0) {
-		ret = snd_soc_dapm_add_routes(&card->dapm, priv->mic_map, num_routes);
+		struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card);
+		ret = snd_soc_dapm_add_routes(dapm, priv->mic_map, num_routes);
 		if (ret != 0)
 			device_remove_software_node(priv->codec_dev);
 	}

sound/soc/amd/ps/acp63.h+2−0

 	u32 addr;
 	u32 reg_range;
 	u32 acp_rev;
+	u32 subsystem_vendor;
+	u32 subsystem_device;
 	u32 acp_sw_pad_keeper_en;
 	u32 acp_pad_pulldown_ctrl;
 	u16 acp63_sdw0_dma_intr_stat[ACP63_SDW0_DMA_MAX_STREAMS];

sound/soc/amd/ps/pci-ps.c+9−0

 			mach->mach_params.links = mach->links;
 			mach->mach_params.link_mask = mach->link_mask;
 			mach->mach_params.subsystem_rev = acp_data->acp_rev;
+			mach->mach_params.subsystem_vendor = acp_data->subsystem_vendor;
+			mach->mach_params.subsystem_device = acp_data->subsystem_device;
+			mach->mach_params.subsystem_id_set = true;
+			dev_dbg(dev, "SSID %x%x\n", mach->mach_params.subsystem_vendor,
+				mach->mach_params.subsystem_device);
 			return mach;
 		}
 	}
 	adata->addr = addr;
 	adata->reg_range = ACP63_REG_END - ACP63_REG_START;
 	adata->acp_rev = pci->revision;
+	adata->subsystem_vendor = pci->subsystem_vendor;
+	adata->subsystem_device = pci->subsystem_device;
 	pci_set_master(pci);
 	pci_set_drvdata(pci, adata);
 	mutex_init(&adata->acp_lock);

sound/soc/amd/vangogh/acp5x-mach.c+1−2

@@ -61,8 +61,7 @@ static const struct snd_kcontrol_new acp5x_8821_controls[] = { · 60 unmodified lines
61	static int platform_clock_control(struct snd_soc_dapm_widget *w,	61	static int platform_clock_control(struct snd_soc_dapm_widget *w,
62	struct snd_kcontrol *k, int event)	62	struct snd_kcontrol *k, int event)
63	{	63	{
64	struct snd_soc_dapm_context *dapm = w->dapm;	64	struct snd_soc_card *card = snd_soc_dapm_to_card(w->dapm);
65	struct snd_soc_card *card = dapm->card;
66	struct snd_soc_dai *dai;	65	struct snd_soc_dai *dai;
67	int ret = 0;	66	int ret = 0;
68		67

sound/soc/atmel/atmel-pdmic.c+2−2

@@ -280,7 +280,7 @@ static const DECLARE_TLV_DB_RANGE(mic_gain_tlv, · 279 unmodified lines
280	static int pdmic_get_mic_volsw(struct snd_kcontrol *kcontrol,	280	static int pdmic_get_mic_volsw(struct snd_kcontrol *kcontrol,
281	struct snd_ctl_elem_value *ucontrol)	281	struct snd_ctl_elem_value *ucontrol)
282	{	282	{
283	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	283	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
284	unsigned int dgain_val, scale_val;	284	unsigned int dgain_val, scale_val;
285	int i;	285	int i;
286		286
@@ -304,7 +304,7 @@ static int pdmic_put_mic_volsw(struct snd_kcontrol *kcontrol, · 17 unmodified lines
304	{	304	{
305	struct soc_mixer_control *mc =	305	struct soc_mixer_control *mc =
306	(struct soc_mixer_control *)kcontrol->private_value;	306	(struct soc_mixer_control *)kcontrol->private_value;
307	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	307	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
308	int max = mc->max;	308	int max = mc->max;
309	unsigned int val;	309	unsigned int val;
310	int ret;	310	int ret;

sound/soc/atmel/sam9g20_wm8731.c+1−1

@@ -80,7 +80,7 @@ static int at91sam9g20ek_wm8731_init(struct snd_soc_pcm_runtime *rtd) · 79 unmodified lines
80	}	80	}
81		81
82	#ifndef ENABLE_MIC_INPUT	82	#ifndef ENABLE_MIC_INPUT
83	snd_soc_dapm_nc_pin(&rtd->card->dapm, "Int Mic");	83	snd_soc_dapm_disable_pin(snd_soc_card_to_dapm(rtd->card), "Int Mic");
84	#endif	84	#endif
85		85
86	return 0;	86	return 0;

sound/soc/atmel/tse850-pcm5142.c+16−16

sound/soc/codecs/88pm860x-codec.c+6−5

 {
 	struct soc_mixer_control *mc =
 		(struct soc_mixer_control *)kcontrol->private_value;
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	unsigned int reg = mc->reg;
 	unsigned int reg2 = mc->rreg;
 	int val[2], val2[2], i;
 {
 	struct soc_mixer_control *mc =
 		(struct soc_mixer_control *)kcontrol->private_value;
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	unsigned int reg = mc->reg;
 	unsigned int reg2 = mc->rreg;
 	int err;
 {
 	struct soc_mixer_control *mc =
 		(struct soc_mixer_control *)kcontrol->private_value;
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	unsigned int reg = mc->reg;
 	unsigned int reg2 = mc->rreg;
 	unsigned int shift = mc->shift;
 {
 	struct soc_mixer_control *mc =
 		(struct soc_mixer_control *)kcontrol->private_value;
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	unsigned int reg = mc->reg;
 	unsigned int reg2 = mc->rreg;
 	unsigned int shift = mc->shift;
 				 enum snd_soc_bias_level level)
 {
 	struct pm860x_priv *pm860x = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	int data;
 	switch (level) {
 		break;
 	case SND_SOC_BIAS_STANDBY:
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) {
 			/* Enable Audio PLL & Audio section */
 			data = AUDIO_PLL | AUDIO_SECTION_ON;
 			pm860x_reg_write(pm860x->i2c, REG_MISC2, data);

sound/soc/codecs/Kconfig+50−0

@@ -106,6 +106,7 @@ config SND_SOC_ALL_CODECS · 105 unmodified lines
106	imply SND_SOC_CS48L32	106	imply SND_SOC_CS48L32
107	imply SND_SOC_CS53L30	107	imply SND_SOC_CS53L30
108	imply SND_SOC_CS530X_I2C	108	imply SND_SOC_CS530X_I2C
		109	imply SND_SOC_CS530X_SPI
109	imply SND_SOC_CX20442	110	imply SND_SOC_CX20442
110	imply SND_SOC_CX2072X	111	imply SND_SOC_CX2072X
111	imply SND_SOC_DA7210	112	imply SND_SOC_DA7210
@@ -170,6 +171,7 @@ config SND_SOC_ALL_CODECS · 58 unmodified lines
170	imply SND_SOC_MT6359	171	imply SND_SOC_MT6359
171	imply SND_SOC_MT6660	172	imply SND_SOC_MT6660
172	imply SND_SOC_NAU8315	173	imply SND_SOC_NAU8315
		174	imply SND_SOC_NAU8325
173	imply SND_SOC_NAU8540	175	imply SND_SOC_NAU8540
174	imply SND_SOC_NAU8810	176	imply SND_SOC_NAU8810
175	imply SND_SOC_NAU8821	177	imply SND_SOC_NAU8821
@@ -896,6 +898,38 @@ config SND_SOC_CS35L56_SDW · 720 unmodified lines
896	help	898	help
897	Enable support for Cirrus Logic CS35L56 boosted amplifier with SoundWire control	899	Enable support for Cirrus Logic CS35L56 boosted amplifier with SoundWire control
898		900
		901	config SND_SOC_CS35L56_CAL_DEBUGFS_COMMON
		902	bool
		903
		904	menu "CS35L56 driver options"
		905	depends on SND_SOC_CS35L56
		906
		907	config SND_SOC_CS35L56_CAL_DEBUGFS
		908	bool "CS35L56 create debugfs for factory calibration"
		909	default N
		910	depends on DEBUG_FS
		911	select SND_SOC_CS35L56_CAL_DEBUGFS_COMMON
		912	help
		913	Create debugfs entries used during factory-line manufacture
		914	for factory calibration.
		915
		916	If unsure select "N".
		917
		918	config SND_SOC_CS35L56_CAL_SET_CTRL
		919	bool "CS35L56 ALSA control to restore factory calibration"
		920	default N
		921	select SND_SOC_CS35L56_CAL_SYSFS_COMMON
		922	help
		923	Allow restoring factory calibration data through an ALSA
		924	control. This is only needed on platforms without UEFI or
		925	some other method of non-volatile storage that the driver
		926	can access directly.
		927
		928	On most platforms this is not needed.
		929
		930	If unsure select "N".
		931	endmenu
		932
899	config SND_SOC_CS40L50	933	config SND_SOC_CS40L50
900	tristate "Cirrus Logic CS40L50 CODEC"	934	tristate "Cirrus Logic CS40L50 CODEC"
901	depends on MFD_CS40L50_CORE	935	depends on MFD_CS40L50_CORE
@@ -1082,6 +1116,15 @@ config SND_SOC_CS530X_I2C · 180 unmodified lines
1082	Enable support for Cirrus Logic CS530X ADCs	1116	Enable support for Cirrus Logic CS530X ADCs
1083	with I2C control.	1117	with I2C control.
1084		1118
		1119	config SND_SOC_CS530X_SPI
		1120	tristate "Cirrus Logic CS530x ADCs (SPI)"
		1121	depends on SPI_MASTER
		1122	select REGMAP_SPI
		1123	select SND_SOC_CS530X
		1124	help
		1125	Enable support for Cirrus Logic CS530X ADCs
		1126	with SPI control.
		1127
1085	config SND_SOC_CX20442	1128	config SND_SOC_CX20442
1086	tristate	1129	tristate
1087	depends on TTY	1130	depends on TTY
@@ -1567,6 +1610,7 @@ config SND_SOC_PEB2466 · 479 unmodified lines
1567		1610
1568	config SND_SOC_PM4125	1611	config SND_SOC_PM4125
1569	depends on SND_SOC_PM4125_SDW	1612	depends on SND_SOC_PM4125_SDW
		1613	select SND_SOC_WCD_COMMON
1570	tristate	1614	tristate
1571	depends on SOUNDWIRE \|\| !SOUNDWIRE	1615	depends on SOUNDWIRE \|\| !SOUNDWIRE
1572		1616
@@ -1575,6 +1619,7 @@ config SND_SOC_PM4125_SDW · 2 unmodified lines
1575	select SND_SOC_PM4125	1619	select SND_SOC_PM4125
1576	select SND_SOC_WCD_MBHC	1620	select SND_SOC_WCD_MBHC
1577	select REGMAP_IRQ	1621	select REGMAP_IRQ
		1622	select SND_SOC_WCD_COMMON
1578	depends on SOUNDWIRE	1623	depends on SOUNDWIRE
1579	select REGMAP_SOUNDWIRE	1624	select REGMAP_SOUNDWIRE
1580	help	1625	help
@@ -2310,6 +2355,7 @@ config SND_SOC_WCD934X · 729 unmodified lines
2310	tristate "WCD9340/WCD9341 Codec"	2355	tristate "WCD9340/WCD9341 Codec"
2311	depends on COMMON_CLK	2356	depends on COMMON_CLK
2312	depends on SLIMBUS	2357	depends on SLIMBUS
		2358	depends on SOUNDWIRE \|\| !SOUNDWIRE
2313	select REGMAP_IRQ	2359	select REGMAP_IRQ
2314	select REGMAP_SLIMBUS	2360	select REGMAP_SLIMBUS
2315	select SND_SOC_WCD_CLASSH	2361	select SND_SOC_WCD_CLASSH
@@ -2715,6 +2761,10 @@ config SND_SOC_MT6660 · 399 unmodified lines
2715	config SND_SOC_NAU8315	2761	config SND_SOC_NAU8315
2716	tristate "Nuvoton Technology Corporation NAU8315 CODEC"	2762	tristate "Nuvoton Technology Corporation NAU8315 CODEC"
2717		2763
		2764	config SND_SOC_NAU8325
		2765	tristate "Nuvoton Technology Corporation NAU8325 CODEC"
		2766	depends on I2C
		2767
2718	config SND_SOC_NAU8540	2768	config SND_SOC_NAU8540
2719	tristate "Nuvoton Technology Corporation NAU85L40 CODEC"	2769	tristate "Nuvoton Technology Corporation NAU85L40 CODEC"
2720	depends on I2C	2770	depends on I2C

sound/soc/codecs/Makefile+6−2

 snd-soc-aw8738-y := aw8738.o
 snd-soc-aw87390-y := aw87390.o
 snd-soc-aw88081-y := aw88081.o
-snd-soc-aw88395-lib-y := aw88395/aw88395_lib.o
+snd-soc-aw88395-lib-y := aw88395/aw88395_lib.o \
-snd-soc-aw88395-y := aw88395/aw88395.o \
 			aw88395/aw88395_device.o
+snd-soc-aw88395-y := aw88395/aw88395.o
 snd-soc-aw88166-y := aw88166.o
 snd-soc-aw88261-y := aw88261.o
 snd-soc-aw88399-y := aw88399.o
 snd-soc-cs53l30-y := cs53l30.o
 snd-soc-cs530x-y := cs530x.o
 snd-soc-cs530x-i2c-y := cs530x-i2c.o
+snd-soc-cs530x-spi-y := cs530x-spi.o
 snd-soc-cx20442-y := cx20442.o
 snd-soc-cx2072x-y := cx2072x.o
 snd-soc-da7210-y := da7210.o
 snd-soc-mt6359-accdet-y := mt6359-accdet.o
 snd-soc-mt6660-y := mt6660.o
 snd-soc-nau8315-y := nau8315.o
+snd-soc-nau8325-y := nau8325.o
 snd-soc-nau8540-y := nau8540.o
 snd-soc-nau8810-y := nau8810.o
 snd-soc-nau8821-y := nau8821.o
 obj-$(CONFIG_SND_SOC_CS53L30)	+= snd-soc-cs53l30.o
 obj-$(CONFIG_SND_SOC_CS530X)	+= snd-soc-cs530x.o
 obj-$(CONFIG_SND_SOC_CS530X_I2C)	+= snd-soc-cs530x-i2c.o
+obj-$(CONFIG_SND_SOC_CS530X_SPI)	+= snd-soc-cs530x-spi.o
 obj-$(CONFIG_SND_SOC_CX20442)	+= snd-soc-cx20442.o
 obj-$(CONFIG_SND_SOC_CX2072X)	+= snd-soc-cx2072x.o
 obj-$(CONFIG_SND_SOC_DA7210)	+= snd-soc-da7210.o
 obj-$(CONFIG_SND_SOC_MT6359_ACCDET) += mt6359-accdet.o
 obj-$(CONFIG_SND_SOC_MT6660)	+= snd-soc-mt6660.o
 obj-$(CONFIG_SND_SOC_NAU8315)   += snd-soc-nau8315.o
+obj-$(CONFIG_SND_SOC_NAU8325)   += snd-soc-nau8325.o
 obj-$(CONFIG_SND_SOC_NAU8540)   += snd-soc-nau8540.o
 obj-$(CONFIG_SND_SOC_NAU8810)   += snd-soc-nau8810.o
 obj-$(CONFIG_SND_SOC_NAU8821)   += snd-soc-nau8821.o

sound/soc/codecs/ab8500-codec.c+9−9

sound/soc/codecs/ad1836.c+1−1

@@ -250,7 +250,7 @@ static int ad1836_resume(struct snd_soc_component *component) · 249 unmodified lines
250	static int ad1836_probe(struct snd_soc_component *component)	250	static int ad1836_probe(struct snd_soc_component *component)
251	{	251	{
252	struct ad1836_priv *ad1836 = snd_soc_component_get_drvdata(component);	252	struct ad1836_priv *ad1836 = snd_soc_component_get_drvdata(component);
253	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	253	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
254	int num_dacs, num_adcs;	254	int num_dacs, num_adcs;
255	int ret = 0;	255	int ret = 0;
256	int i;	256	int i;

sound/soc/codecs/ad193x.c+2−2

@@ -282,7 +282,7 @@ static int ad193x_set_dai_sysclk(struct snd_soc_dai *codec_dai, · 281 unmodified lines
282	int clk_id, unsigned int freq, int dir)	282	int clk_id, unsigned int freq, int dir)
283	{	283	{
284	struct snd_soc_component *component = codec_dai->component;	284	struct snd_soc_component *component = codec_dai->component;
285	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	285	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
286	struct ad193x_priv *ad193x = snd_soc_component_get_drvdata(component);	286	struct ad193x_priv *ad193x = snd_soc_component_get_drvdata(component);
287		287
288	if (clk_id == AD193X_SYSCLK_MCLK) {	288	if (clk_id == AD193X_SYSCLK_MCLK) {
@@ -476,7 +476,7 @@ static void ad193x_reg_default_init(struct ad193x_priv *ad193x) · 187 unmodified lines
476	static int ad193x_component_probe(struct snd_soc_component *component)	476	static int ad193x_component_probe(struct snd_soc_component *component)
477	{	477	{
478	struct ad193x_priv *ad193x = snd_soc_component_get_drvdata(component);	478	struct ad193x_priv *ad193x = snd_soc_component_get_drvdata(component);
479	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	479	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
480	int num, ret;	480	int num, ret;
481		481
482	/* default setting for ad193x */	482	/* default setting for ad193x */

sound/soc/codecs/adau1761.c+5−4

 				 enum snd_soc_bias_level level)
 {
 	struct adau *adau = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	switch (level) {
 	case SND_SOC_BIAS_ON:
 		regmap_update_bits(adau->regmap, ADAU17X1_CLOCK_CONTROL,
 			ADAU17X1_CLOCK_CONTROL_SYSCLK_EN,
 			ADAU17X1_CLOCK_CONTROL_SYSCLK_EN);
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF)
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF)
 			regcache_sync(adau->regmap);
 		break;
 	case SND_SOC_BIAS_OFF:
 static int adau1761_setup_digmic_jackdetect(struct snd_soc_component *component)
 {
-	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	struct adau1761_platform_data *pdata = component->dev->platform_data;
 	struct adau *adau = snd_soc_component_get_drvdata(component);
 	enum adau1761_digmic_jackdet_pin_mode mode;
 static int adau1761_setup_headphone_mode(struct snd_soc_component *component)
 {
-	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	struct adau *adau = snd_soc_component_get_drvdata(component);
 	struct adau1761_platform_data *pdata = component->dev->platform_data;
 	enum adau1761_output_mode mode;
 static int adau1761_component_probe(struct snd_soc_component *component)
 {
-	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	struct adau1761_platform_data *pdata = component->dev->platform_data;
 	struct adau *adau = snd_soc_component_get_drvdata(component);
 	int ret;

sound/soc/codecs/adau1781.c+1−1

@@ -381,7 +381,7 @@ static int adau1781_set_input_mode(struct adau *adau, unsigned int reg, · 380 unmodified lines
381		381
382	static int adau1781_component_probe(struct snd_soc_component *component)	382	static int adau1781_component_probe(struct snd_soc_component *component)
383	{	383	{
384	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	384	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
385	struct adau1781_platform_data *pdata = dev_get_platdata(component->dev);	385	struct adau1781_platform_data *pdata = dev_get_platdata(component->dev);
386	struct adau *adau = snd_soc_component_get_drvdata(component);	386	struct adau *adau = snd_soc_component_get_drvdata(component);
387	int ret;	387	int ret;

sound/soc/codecs/adau17x1.c+7−7

sound/soc/codecs/adau1977.c+3−2

 	enum snd_soc_bias_level level)
 {
 	struct adau1977 *adau1977 = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	int ret = 0;
 	switch (level) {
 	case SND_SOC_BIAS_PREPARE:
 		break;
 	case SND_SOC_BIAS_STANDBY:
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF)
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF)
 			ret = adau1977_power_enable(adau1977);
 		break;
 	case SND_SOC_BIAS_OFF:
 static int adau1977_component_probe(struct snd_soc_component *component)
 {
-	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	struct adau1977 *adau1977 = snd_soc_component_get_drvdata(component);
 	int ret;

sound/soc/codecs/adau7118.c+3−4

 				   enum snd_soc_bias_level level)
 {
 	struct adau7118_data *st = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	int ret = 0;
 	dev_dbg(st->dev, "Set bias level %d\n", level);
 		break;
 	case SND_SOC_BIAS_STANDBY:
-		if (snd_soc_component_get_bias_level(component) ==
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) {
-							SND_SOC_BIAS_OFF) {
 			/* power on */
 			ret = regulator_enable(st->iovdd);
 			if (ret)
 static int adau7118_component_probe(struct snd_soc_component *component)
 {
 	struct adau7118_data *st = snd_soc_component_get_drvdata(component);
-	struct snd_soc_dapm_context *dapm =
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
-					snd_soc_component_get_dapm(component);
 	int ret = 0;
 	if (st->hw_mode) {

sound/soc/codecs/adav80x.c+5−5

sound/soc/codecs/ak4458.c+2−2

@@ -187,7 +187,7 @@ static const struct soc_enum ak4458_dif_enum = · 186 unmodified lines
187	static int get_digfil(struct snd_kcontrol *kcontrol,	187	static int get_digfil(struct snd_kcontrol *kcontrol,
188	struct snd_ctl_elem_value *ucontrol)	188	struct snd_ctl_elem_value *ucontrol)
189	{	189	{
190	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	190	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
191	struct ak4458_priv *ak4458 = snd_soc_component_get_drvdata(component);	191	struct ak4458_priv *ak4458 = snd_soc_component_get_drvdata(component);
192		192
193	ucontrol->value.enumerated.item[0] = ak4458->digfil;	193	ucontrol->value.enumerated.item[0] = ak4458->digfil;
@@ -198,7 +198,7 @@ static int get_digfil(struct snd_kcontrol *kcontrol, · 4 unmodified lines
198	static int set_digfil(struct snd_kcontrol *kcontrol,	198	static int set_digfil(struct snd_kcontrol *kcontrol,
199	struct snd_ctl_elem_value *ucontrol)	199	struct snd_ctl_elem_value *ucontrol)
200	{	200	{
201	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	201	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
202	struct ak4458_priv *ak4458 = snd_soc_component_get_drvdata(component);	202	struct ak4458_priv *ak4458 = snd_soc_component_get_drvdata(component);
203	int num;	203	int num;
204		204

sound/soc/codecs/ak4619.c+2−2

@@ -257,7 +257,7 @@ static void ak4619_set_deemph(struct snd_soc_component *component) · 256 unmodified lines
257	static int ak4619_put_deemph(struct snd_kcontrol *kcontrol,	257	static int ak4619_put_deemph(struct snd_kcontrol *kcontrol,
258	struct snd_ctl_elem_value *ucontrol)	258	struct snd_ctl_elem_value *ucontrol)
259	{	259	{
260	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	260	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
261	struct ak4619_priv *ak4619 = snd_soc_component_get_drvdata(component);	261	struct ak4619_priv *ak4619 = snd_soc_component_get_drvdata(component);
262	int deemph_en = ucontrol->value.integer.value[0];	262	int deemph_en = ucontrol->value.integer.value[0];
263	int ret = 0;	263	int ret = 0;
@@ -282,7 +282,7 @@ static int ak4619_put_deemph(struct snd_kcontrol *kcontrol, · 18 unmodified lines
282	static int ak4619_get_deemph(struct snd_kcontrol *kcontrol,	282	static int ak4619_get_deemph(struct snd_kcontrol *kcontrol,
283	struct snd_ctl_elem_value *ucontrol)	283	struct snd_ctl_elem_value *ucontrol)
284	{	284	{
285	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	285	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
286	struct ak4619_priv *ak4619 = snd_soc_component_get_drvdata(component);	286	struct ak4619_priv *ak4619 = snd_soc_component_get_drvdata(component);
287		287
288	ucontrol->value.integer.value[0] = ak4619->deemph_en;	288	ucontrol->value.integer.value[0] = ak4619->deemph_en;

sound/soc/codecs/ak4641.c+4−3

 static int ak4641_put_deemph(struct snd_kcontrol *kcontrol,
 				struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct ak4641_priv *ak4641 = snd_soc_component_get_drvdata(component);
 	int deemph = ucontrol->value.integer.value[0];
 static int ak4641_get_deemph(struct snd_kcontrol *kcontrol,
 				struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct ak4641_priv *ak4641 = snd_soc_component_get_drvdata(component);
 	ucontrol->value.integer.value[0] = ak4641->deemph;
 static int ak4641_set_bias_level(struct snd_soc_component *component,
 	enum snd_soc_bias_level level)
 {
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	struct ak4641_priv *ak4641 = snd_soc_component_get_drvdata(component);
 	struct ak4641_platform_data *pdata = component->dev->platform_data;
 	int ret;
 		snd_soc_component_update_bits(component, AK4641_DAC, 0x20, 0x20);
 		break;
 	case SND_SOC_BIAS_STANDBY:
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) {
 			if (pdata && gpio_is_valid(pdata->gpio_power))
 				gpio_set_value(pdata->gpio_power, 1);
 			mdelay(1);

sound/soc/codecs/alc5623.c+1−1

@@ -888,7 +888,7 @@ static int alc5623_resume(struct snd_soc_component *component) · 887 unmodified lines
888	static int alc5623_probe(struct snd_soc_component *component)	888	static int alc5623_probe(struct snd_soc_component *component)
889	{	889	{
890	struct alc5623_priv *alc5623 = snd_soc_component_get_drvdata(component);	890	struct alc5623_priv *alc5623 = snd_soc_component_get_drvdata(component);
891	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	891	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
892		892
893	alc5623_reset(component);	893	alc5623_reset(component);
894		894

sound/soc/codecs/arizona-jack.c+3−5

 	struct arizona *arizona = info->arizona;
 	const char *widget = arizona_extcon_get_micbias(info);
 	struct snd_soc_dapm_context *dapm = arizona->dapm;
-	struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
 	int ret;
-	ret = snd_soc_component_force_enable_pin(component, widget);
+	ret = snd_soc_dapm_force_enable_pin(dapm, widget);
 	if (ret)
 		dev_warn(arizona->dev, "Failed to enable %s: %d\n", widget, ret);
 	snd_soc_dapm_sync(dapm);
 	if (!arizona->pdata.micd_force_micbias) {
-		ret = snd_soc_component_disable_pin(component, widget);
+		ret = snd_soc_dapm_disable_pin(dapm, widget);
 		if (ret)
 			dev_warn(arizona->dev, "Failed to disable %s: %d\n", widget, ret);
 	struct arizona *arizona = info->arizona;
 	const char *widget = arizona_extcon_get_micbias(info);
 	struct snd_soc_dapm_context *dapm = arizona->dapm;
-	struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
 	bool change = false;
 	int ret;
 	if (ret < 0)
 		dev_err(arizona->dev, "Failed to disable micd: %d\n", ret);
-	ret = snd_soc_component_disable_pin(component, widget);
+	ret = snd_soc_dapm_disable_pin(dapm, widget);
 	if (ret)
 		dev_warn(arizona->dev, "Failed to disable %s: %d\n", widget, ret);

sound/soc/codecs/arizona.c+10−12

 int arizona_init_spk(struct snd_soc_component *component)
 {
-	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	struct arizona_priv *priv = snd_soc_component_get_drvdata(component);
 	struct arizona *arizona = priv->arizona;
 	int ret;
 int arizona_init_mono(struct snd_soc_component *component)
 {
-	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	struct arizona_priv *priv = snd_soc_component_get_drvdata(component);
 	struct arizona *arizona = priv->arizona;
 	int i;
 int arizona_init_gpio(struct snd_soc_component *component)
 {
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	struct arizona_priv *priv = snd_soc_component_get_drvdata(component);
 	struct arizona *arizona = priv->arizona;
 	int i;
 	switch (arizona->type) {
 	case WM5110:
 	case WM8280:
-		snd_soc_component_disable_pin(component,
+		snd_soc_dapm_disable_pin(dapm, "DRC2 Signal Activity");
-					      "DRC2 Signal Activity");
 		break;
 	default:
 		break;
 	}
-	snd_soc_component_disable_pin(component, "DRC1 Signal Activity");
+	snd_soc_dapm_disable_pin(dapm, "DRC1 Signal Activity");
 	for (i = 0; i < ARRAY_SIZE(arizona->pdata.gpio_defaults); i++) {
 		switch (arizona->pdata.gpio_defaults[i] & ARIZONA_GPN_FN_MASK) {
 		case ARIZONA_GP_FN_DRC1_SIGNAL_DETECT:
-			snd_soc_component_enable_pin(component,
+			snd_soc_dapm_enable_pin(dapm, "DRC1 Signal Activity");
-						     "DRC1 Signal Activity");
 			break;
 		case ARIZONA_GP_FN_DRC2_SIGNAL_DETECT:
-			snd_soc_component_enable_pin(component,
+			snd_soc_dapm_enable_pin(dapm, "DRC2 Signal Activity");
-						     "DRC2 Signal Activity");
 			break;
 		default:
 			break;
 				  int clk_id, unsigned int freq, int dir)
 {
 	struct snd_soc_component *component = dai->component;
-	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	struct arizona_priv *priv = snd_soc_component_get_drvdata(component);
 	struct arizona_dai_priv *dai_priv = &priv->dai[dai->id - 1];
 	struct snd_soc_dapm_route routes[2];
 int arizona_eq_coeff_put(struct snd_kcontrol *kcontrol,
 			 struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct arizona *arizona = dev_get_drvdata(component->dev->parent);
 	struct soc_bytes *params = (void *)kcontrol->private_value;
 	unsigned int val;
 int arizona_lhpf_coeff_put(struct snd_kcontrol *kcontrol,
 			   struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct arizona *arizona = dev_get_drvdata(component->dev->parent);
 	__be16 *data = (__be16 *)ucontrol->value.bytes.data;
 	s16 val = be16_to_cpu(*data);

sound/soc/codecs/audio-iio-aux.c+1−1

@@ -131,7 +131,7 @@ static_assert(ARRAY_SIZE(routes) >= 2, "2 routes are needed"); · 130 unmodified lines
131	static int audio_iio_aux_add_dapms(struct snd_soc_component *component,	131	static int audio_iio_aux_add_dapms(struct snd_soc_component *component,
132	struct audio_iio_aux_chan *chan)	132	struct audio_iio_aux_chan *chan)
133	{	133	{
134	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	134	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
135	int ret;	135	int ret;
136		136
137	/* Allocated names are not needed afterwards (duplicated in ASoC internals) */	137	/* Allocated names are not needed afterwards (duplicated in ASoC internals) */

sound/soc/codecs/aw87390.c+7−7

@@ -175,7 +175,7 @@ static int aw87390_dev_set_profile_index(struct aw_device *aw_dev, int index) · 174 unmodified lines
175	static int aw87390_profile_info(struct snd_kcontrol *kcontrol,	175	static int aw87390_profile_info(struct snd_kcontrol *kcontrol,
176	struct snd_ctl_elem_info *uinfo)	176	struct snd_ctl_elem_info *uinfo)
177	{	177	{
178	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);	178	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
179	struct aw87390 *aw87390 = snd_soc_component_get_drvdata(codec);	179	struct aw87390 *aw87390 = snd_soc_component_get_drvdata(codec);
180	char *prof_name;	180	char *prof_name;
181	int count, ret;	181	int count, ret;
@@ -210,7 +210,7 @@ static int aw87390_profile_info(struct snd_kcontrol *kcontrol, · 28 unmodified lines
210	static int aw87390_profile_get(struct snd_kcontrol *kcontrol,	210	static int aw87390_profile_get(struct snd_kcontrol *kcontrol,
211	struct snd_ctl_elem_value *ucontrol)	211	struct snd_ctl_elem_value *ucontrol)
212	{	212	{
213	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);	213	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
214	struct aw87390 *aw87390 = snd_soc_component_get_drvdata(codec);	214	struct aw87390 *aw87390 = snd_soc_component_get_drvdata(codec);
215		215
216	ucontrol->value.integer.value[0] = aw87390->aw_pa->prof_index;	216	ucontrol->value.integer.value[0] = aw87390->aw_pa->prof_index;
@@ -221,7 +221,7 @@ static int aw87390_profile_get(struct snd_kcontrol *kcontrol, · 4 unmodified lines
221	static int aw87390_profile_set(struct snd_kcontrol *kcontrol,	221	static int aw87390_profile_set(struct snd_kcontrol *kcontrol,
222	struct snd_ctl_elem_value *ucontrol)	222	struct snd_ctl_elem_value *ucontrol)
223	{	223	{
224	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);	224	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
225	struct aw87390 *aw87390 = snd_soc_component_get_drvdata(codec);	225	struct aw87390 *aw87390 = snd_soc_component_get_drvdata(codec);
226	int ret;	226	int ret;
227		227
@@ -360,7 +360,7 @@ static void aw87390_parse_channel_dt(struct aw87390 *aw87390) · 132 unmodified lines
360	aw_dev->channel = channel_value;	360	aw_dev->channel = channel_value;
361	}	361	}
362		362
363	static int aw87390_init(struct aw87390 *aw87390, struct i2c_client i2c, struct regmap *regmap)	363	static int aw87390_init(struct aw87390 aw87390, struct i2c_client i2c, struct regmap *regmap)
364	{	364	{
365	struct aw_device *aw_dev;	365	struct aw_device *aw_dev;
366	unsigned int chip_id;	366	unsigned int chip_id;
@@ -384,7 +384,7 @@ static int aw87390_init(struct aw87390 *aw87390, struct i2c_client i2c, struct · 17 unmodified lines
384	if (!aw_dev)	384	if (!aw_dev)
385	return -ENOMEM;	385	return -ENOMEM;
386		386
387	(*aw87390)->aw_pa = aw_dev;	387	aw87390->aw_pa = aw_dev;
388	aw_dev->i2c = i2c;	388	aw_dev->i2c = i2c;
389	aw_dev->regmap = regmap;	389	aw_dev->regmap = regmap;
390	aw_dev->dev = &i2c->dev;	390	aw_dev->dev = &i2c->dev;
@@ -398,7 +398,7 @@ static int aw87390_init(struct aw87390 *aw87390, struct i2c_client i2c, struct · 7 unmodified lines
398	aw_dev->prof_index = AW87390_INIT_PROFILE;	398	aw_dev->prof_index = AW87390_INIT_PROFILE;
399	aw_dev->status = AW87390_DEV_PW_OFF;	399	aw_dev->status = AW87390_DEV_PW_OFF;
400		400
401	aw87390_parse_channel_dt(*aw87390);	401	aw87390_parse_channel_dt(aw87390);
402		402
403	return 0;	403	return 0;
404	}	404	}
@@ -426,7 +426,7 @@ static int aw87390_i2c_probe(struct i2c_client *i2c) · 21 unmodified lines
426	"failed to init regmap\n");	426	"failed to init regmap\n");
427		427
428	/* aw pa init */	428	/* aw pa init */
429	ret = aw87390_init(&aw87390, i2c, aw87390->regmap);	429	ret = aw87390_init(aw87390, i2c, aw87390->regmap);
430	if (ret)	430	if (ret)
431	return ret;	431	return ret;
432		432

sound/soc/codecs/aw88081.c+12−12

sound/soc/codecs/aw88166.c+23−136

 	.val_format_endian = REGMAP_ENDIAN_BIG,
 };
-static int aw_dev_dsp_write_16bit(struct aw_device *aw_dev,
-		unsigned short dsp_addr, unsigned int dsp_data)
-{
-	int ret;
-	ret = regmap_write(aw_dev->regmap, AW88166_DSPMADD_REG, dsp_addr);
-	if (ret) {
-		dev_err(aw_dev->dev, "%s write addr error, ret=%d", __func__, ret);
-		return ret;
-	}
-	ret = regmap_write(aw_dev->regmap, AW88166_DSPMDAT_REG, (u16)dsp_data);
-	if (ret) {
-		dev_err(aw_dev->dev, "%s write data error, ret=%d", __func__, ret);
-		return ret;
-	}
-	return 0;
-}
-static int aw_dev_dsp_read_16bit(struct aw_device *aw_dev,
-		unsigned short dsp_addr, unsigned int *dsp_data)
-{
-	unsigned int temp_data;
-	int ret;
-	ret = regmap_write(aw_dev->regmap, AW88166_DSPMADD_REG, dsp_addr);
-	if (ret) {
-		dev_err(aw_dev->dev, "%s write error, ret=%d", __func__, ret);
-		return ret;
-	}
-	ret = regmap_read(aw_dev->regmap, AW88166_DSPMDAT_REG, &temp_data);
-	if (ret) {
-		dev_err(aw_dev->dev, "%s read error, ret=%d", __func__, ret);
-		return ret;
-	}
-	*dsp_data = temp_data;
-	return 0;
-}
-static int aw_dev_dsp_read_32bit(struct aw_device *aw_dev,
-		unsigned short dsp_addr, unsigned int *dsp_data)
-{
-	unsigned int temp_data;
-	int ret;
-	ret = regmap_write(aw_dev->regmap, AW88166_DSPMADD_REG, dsp_addr);
-	if (ret) {
-		dev_err(aw_dev->dev, "%s write error, ret=%d", __func__, ret);
-		return ret;
-	}
-	ret = regmap_read(aw_dev->regmap, AW88166_DSPMDAT_REG, &temp_data);
-	if (ret) {
-		dev_err(aw_dev->dev, "%s read error, ret=%d", __func__, ret);
-		return ret;
-	}
-	*dsp_data = temp_data;
-	ret = regmap_read(aw_dev->regmap, AW88166_DSPMDAT_REG, &temp_data);
-	if (ret) {
-		dev_err(aw_dev->dev, "%s read error, ret=%d", __func__, ret);
-		return ret;
-	}
-	*dsp_data |= (temp_data << 16);
-	return 0;
-}
-static int aw_dev_dsp_read(struct aw_device *aw_dev,
-		unsigned short dsp_addr, unsigned int *dsp_data, unsigned char data_type)
-{
-	u32 reg_value;
-	int ret;
-	mutex_lock(&aw_dev->dsp_lock);
-	switch (data_type) {
-	case AW88166_DSP_16_DATA:
-		ret = aw_dev_dsp_read_16bit(aw_dev, dsp_addr, dsp_data);
-		if (ret)
-			dev_err(aw_dev->dev, "read dsp_addr[0x%x] 16-bit failed", (u32)dsp_addr);
-		break;
-	case AW88166_DSP_32_DATA:
-		ret = aw_dev_dsp_read_32bit(aw_dev, dsp_addr, dsp_data);
-		if (ret)
-			dev_err(aw_dev->dev, "read dsp_addr[0x%x] 32-bit failed", (u32)dsp_addr);
-		break;
-	default:
-		dev_err(aw_dev->dev, "data type[%d] unsupported", data_type);
-		ret = -EINVAL;
-		break;
-	}
-	/* clear dsp chip select state */
-	if (regmap_read(aw_dev->regmap, AW88166_ID_REG, &reg_value))
-		dev_err(aw_dev->dev, "%s fail to clear chip state. ret=%d\n", __func__, ret);
-	mutex_unlock(&aw_dev->dsp_lock);
-	return ret;
-}
 static void aw_dev_pwd(struct aw_device *aw_dev, bool pwd)
 {
 	int ret;
 	u32 tmp_len;
 	int i, ret;
-	mutex_lock(&aw_dev->dsp_lock);
 	ret = regmap_write(aw_dev->regmap, AW88166_DSPMADD_REG, base);
 	if (ret)
-		goto error_operation;
+		return ret;
 	for (i = 0; i < len; i += AW88166_MAX_RAM_WRITE_BYTE_SIZE) {
 		tmp_len = min(len - i, AW88166_MAX_RAM_WRITE_BYTE_SIZE);
 		ret = regmap_raw_write(aw_dev->regmap, AW88166_DSPMDAT_REG,
 					&data[i], tmp_len);
 		if (ret)
-			goto error_operation;
+			return ret;
 	}
-	mutex_unlock(&aw_dev->dsp_lock);
 	return 0;
-error_operation:
-	mutex_unlock(&aw_dev->dsp_lock);
-	return ret;
 }
 static int aw_dev_get_ra(struct aw_cali_desc *cali_desc)
 	int ret;
 	ret = aw_dev_dsp_read(aw_dev, AW88166_DSP_REG_CFG_ADPZ_RA,
-				&dsp_ra, AW88166_DSP_32_DATA);
+				&dsp_ra, AW_DSP_32_DATA);
 	if (ret) {
 		dev_err(aw_dev->dev, "read ra error\n");
 		return ret;
 {
 	unsigned int reg_val;
-	mutex_lock(&aw_dev->dsp_lock);
 	/* read dsp_rom_check_reg */
-	aw_dev_dsp_read_16bit(aw_dev, AW88166_DSP_ROM_CHECK_ADDR, &reg_val);
+	aw_dev_dsp_read(aw_dev, AW88166_DSP_ROM_CHECK_ADDR, &reg_val, AW_DSP_16_DATA);
 	if (reg_val != AW88166_DSP_ROM_CHECK_DATA) {
 		dev_err(aw_dev->dev, "check dsp rom failed, read[0x%x] != check[0x%x]\n",
 						reg_val, AW88166_DSP_ROM_CHECK_DATA);
-		goto error;
+		return -EPERM;
 	}
 	/* check dsp_cfg_base_addr */
-	aw_dev_dsp_write_16bit(aw_dev, AW88166_DSP_CFG_ADDR, AW88166_DSP_ODD_NUM_BIT_TEST);
+	aw_dev_dsp_write(aw_dev, AW88166_DSP_CFG_ADDR,
-	aw_dev_dsp_read_16bit(aw_dev, AW88166_DSP_CFG_ADDR, &reg_val);
+				AW88166_DSP_ODD_NUM_BIT_TEST, AW_DSP_16_DATA);
+	aw_dev_dsp_read(aw_dev, AW88166_DSP_CFG_ADDR, &reg_val, AW_DSP_16_DATA);
 	if (reg_val != AW88166_DSP_ODD_NUM_BIT_TEST) {
 		dev_err(aw_dev->dev, "check dsp cfg failed, read[0x%x] != write[0x%x]\n",
 						reg_val, AW88166_DSP_ODD_NUM_BIT_TEST);
-		goto error;
+		return -EPERM;
 	}
-	mutex_unlock(&aw_dev->dsp_lock);
 	return 0;
-error:
-	mutex_unlock(&aw_dev->dsp_lock);
-	return -EPERM;
 }
 static void aw_dev_select_memclk(struct aw_device *aw_dev, unsigned char flag)
 	if (sync_start == AW88166_SYNC_START)
 		aw88166_start_pa(aw88166);
 	else
-		queue_delayed_work(system_wq,
+		queue_delayed_work(system_dfl_wq,
 			&aw88166->start_work,
 			AW88166_START_WORK_DELAY_MS);
 }
 static int aw88166_get_fade_in_time(struct snd_kcontrol *kcontrol,
 	struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct aw88166 *aw88166 = snd_soc_component_get_drvdata(component);
 	struct aw_device *aw_dev = aw88166->aw_pa;
 static int aw88166_set_fade_in_time(struct snd_kcontrol *kcontrol,
 	struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct aw88166 *aw88166 = snd_soc_component_get_drvdata(component);
 	struct soc_mixer_control *mc =
 		(struct soc_mixer_control *)kcontrol->private_value;
 static int aw88166_get_fade_out_time(struct snd_kcontrol *kcontrol,
 	struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct aw88166 *aw88166 = snd_soc_component_get_drvdata(component);
 	struct aw_device *aw_dev = aw88166->aw_pa;
 static int aw88166_set_fade_out_time(struct snd_kcontrol *kcontrol,
 	struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct aw88166 *aw88166 = snd_soc_component_get_drvdata(component);
 	struct soc_mixer_control *mc =
 		(struct soc_mixer_control *)kcontrol->private_value;
 static int aw88166_profile_info(struct snd_kcontrol *kcontrol,
 			 struct snd_ctl_elem_info *uinfo)
 {
-	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
 	struct aw88166 *aw88166 = snd_soc_component_get_drvdata(codec);
 	char *prof_name;
 	int count, ret;
 static int aw88166_profile_get(struct snd_kcontrol *kcontrol,
 			struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
 	struct aw88166 *aw88166 = snd_soc_component_get_drvdata(codec);
 	ucontrol->value.integer.value[0] = aw88166->aw_pa->prof_index;
 static int aw88166_profile_set(struct snd_kcontrol *kcontrol,
 		struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
 	struct aw88166 *aw88166 = snd_soc_component_get_drvdata(codec);
 	int ret;
 static int aw88166_volume_get(struct snd_kcontrol *kcontrol,
 				struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
 	struct aw88166 *aw88166 = snd_soc_component_get_drvdata(codec);
 	struct aw_volume_desc *vol_desc = &aw88166->aw_pa->volume_desc;
 static int aw88166_volume_set(struct snd_kcontrol *kcontrol,
 				struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
 	struct aw88166 *aw88166 = snd_soc_component_get_drvdata(codec);
 	struct aw_volume_desc *vol_desc = &aw88166->aw_pa->volume_desc;
 	struct soc_mixer_control *mc =
 static int aw88166_get_fade_step(struct snd_kcontrol *kcontrol,
 				struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
 	struct aw88166 *aw88166 = snd_soc_component_get_drvdata(codec);
 	ucontrol->value.integer.value[0] = aw88166->aw_pa->fade_step;
 static int aw88166_set_fade_step(struct snd_kcontrol *kcontrol,
 				struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
 	struct aw88166 *aw88166 = snd_soc_component_get_drvdata(codec);
 	struct soc_mixer_control *mc =
 		(struct soc_mixer_control *)kcontrol->private_value;
 static int aw88166_re_get(struct snd_kcontrol *kcontrol,
 				struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
 	struct aw88166 *aw88166 = snd_soc_component_get_drvdata(codec);
 	struct aw_device *aw_dev = aw88166->aw_pa;
 static int aw88166_re_set(struct snd_kcontrol *kcontrol,
 				struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
 	struct aw88166 *aw88166 = snd_soc_component_get_drvdata(codec);
 	struct soc_mixer_control *mc =
 		(struct soc_mixer_control *)kcontrol->private_value;

sound/soc/codecs/aw88166.h+0−5

 	AW88166_DEV_DSP_BYPASS = 1,
 };
-enum {
-	AW88166_DSP_16_DATA = 0,
-	AW88166_DSP_32_DATA = 1,
-};
 enum {
 	AW88166_SYNC_START = 0,
 	AW88166_ASYNC_START,

sound/soc/codecs/aw88261.c+17−17

@@ -705,7 +705,7 @@ static void aw88261_start(struct aw88261 *aw88261, bool sync_start) · 704 unmodified lines
705	if (sync_start == AW88261_SYNC_START)	705	if (sync_start == AW88261_SYNC_START)
706	aw88261_start_pa(aw88261);	706	aw88261_start_pa(aw88261);
707	else	707	else
708	queue_delayed_work(system_wq,	708	queue_delayed_work(system_dfl_wq,
709	&aw88261->start_work,	709	&aw88261->start_work,
710	AW88261_START_WORK_DELAY_MS);	710	AW88261_START_WORK_DELAY_MS);
711	}	711	}
@@ -734,7 +734,7 @@ static struct snd_soc_dai_driver aw88261_dai[] = { · 22 unmodified lines
734	static int aw88261_get_fade_in_time(struct snd_kcontrol *kcontrol,	734	static int aw88261_get_fade_in_time(struct snd_kcontrol *kcontrol,
735	struct snd_ctl_elem_value *ucontrol)	735	struct snd_ctl_elem_value *ucontrol)
736	{	736	{
737	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	737	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
738	struct aw88261 *aw88261 = snd_soc_component_get_drvdata(component);	738	struct aw88261 *aw88261 = snd_soc_component_get_drvdata(component);
739	struct aw_device *aw_dev = aw88261->aw_pa;	739	struct aw_device *aw_dev = aw88261->aw_pa;
740		740
@@ -746,7 +746,7 @@ static int aw88261_get_fade_in_time(struct snd_kcontrol *kcontrol, · 5 unmodified lines
746	static int aw88261_set_fade_in_time(struct snd_kcontrol *kcontrol,	746	static int aw88261_set_fade_in_time(struct snd_kcontrol *kcontrol,
747	struct snd_ctl_elem_value *ucontrol)	747	struct snd_ctl_elem_value *ucontrol)
748	{	748	{
749	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	749	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
750	struct aw88261 *aw88261 = snd_soc_component_get_drvdata(component);	750	struct aw88261 *aw88261 = snd_soc_component_get_drvdata(component);
751	struct soc_mixer_control *mc =	751	struct soc_mixer_control *mc =
752	(struct soc_mixer_control *)kcontrol->private_value;	752	(struct soc_mixer_control *)kcontrol->private_value;
@@ -769,7 +769,7 @@ static int aw88261_set_fade_in_time(struct snd_kcontrol *kcontrol, · 16 unmodified lines
769	static int aw88261_get_fade_out_time(struct snd_kcontrol *kcontrol,	769	static int aw88261_get_fade_out_time(struct snd_kcontrol *kcontrol,
770	struct snd_ctl_elem_value *ucontrol)	770	struct snd_ctl_elem_value *ucontrol)
771	{	771	{
772	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	772	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
773	struct aw88261 *aw88261 = snd_soc_component_get_drvdata(component);	773	struct aw88261 *aw88261 = snd_soc_component_get_drvdata(component);
774	struct aw_device *aw_dev = aw88261->aw_pa;	774	struct aw_device *aw_dev = aw88261->aw_pa;
775		775
@@ -781,7 +781,7 @@ static int aw88261_get_fade_out_time(struct snd_kcontrol *kcontrol, · 5 unmodified lines
781	static int aw88261_set_fade_out_time(struct snd_kcontrol *kcontrol,	781	static int aw88261_set_fade_out_time(struct snd_kcontrol *kcontrol,
782	struct snd_ctl_elem_value *ucontrol)	782	struct snd_ctl_elem_value *ucontrol)
783	{	783	{
784	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	784	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
785	struct aw88261 *aw88261 = snd_soc_component_get_drvdata(component);	785	struct aw88261 *aw88261 = snd_soc_component_get_drvdata(component);
786	struct soc_mixer_control *mc =	786	struct soc_mixer_control *mc =
787	(struct soc_mixer_control *)kcontrol->private_value;	787	(struct soc_mixer_control *)kcontrol->private_value;
@@ -817,7 +817,7 @@ static int aw88261_dev_set_profile_index(struct aw_device *aw_dev, int index) · 29 unmodified lines
817	static int aw88261_profile_info(struct snd_kcontrol *kcontrol,	817	static int aw88261_profile_info(struct snd_kcontrol *kcontrol,
818	struct snd_ctl_elem_info *uinfo)	818	struct snd_ctl_elem_info *uinfo)
819	{	819	{
820	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);	820	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
821	struct aw88261 *aw88261 = snd_soc_component_get_drvdata(codec);	821	struct aw88261 *aw88261 = snd_soc_component_get_drvdata(codec);
822	char *prof_name;	822	char *prof_name;
823	int count, ret;	823	int count, ret;
@@ -852,7 +852,7 @@ static int aw88261_profile_info(struct snd_kcontrol *kcontrol, · 28 unmodified lines
852	static int aw88261_profile_get(struct snd_kcontrol *kcontrol,	852	static int aw88261_profile_get(struct snd_kcontrol *kcontrol,
853	struct snd_ctl_elem_value *ucontrol)	853	struct snd_ctl_elem_value *ucontrol)
854	{	854	{
855	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);	855	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
856	struct aw88261 *aw88261 = snd_soc_component_get_drvdata(codec);	856	struct aw88261 *aw88261 = snd_soc_component_get_drvdata(codec);
857		857
858	ucontrol->value.integer.value[0] = aw88261->aw_pa->prof_index;	858	ucontrol->value.integer.value[0] = aw88261->aw_pa->prof_index;
@@ -863,7 +863,7 @@ static int aw88261_profile_get(struct snd_kcontrol *kcontrol, · 4 unmodified lines
863	static int aw88261_profile_set(struct snd_kcontrol *kcontrol,	863	static int aw88261_profile_set(struct snd_kcontrol *kcontrol,
864	struct snd_ctl_elem_value *ucontrol)	864	struct snd_ctl_elem_value *ucontrol)
865	{	865	{
866	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);	866	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
867	struct aw88261 *aw88261 = snd_soc_component_get_drvdata(codec);	867	struct aw88261 *aw88261 = snd_soc_component_get_drvdata(codec);
868	int ret;	868	int ret;
869		869
@@ -889,7 +889,7 @@ static int aw88261_profile_set(struct snd_kcontrol *kcontrol, · 19 unmodified lines
889	static int aw88261_volume_get(struct snd_kcontrol *kcontrol,	889	static int aw88261_volume_get(struct snd_kcontrol *kcontrol,
890	struct snd_ctl_elem_value *ucontrol)	890	struct snd_ctl_elem_value *ucontrol)
891	{	891	{
892	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);	892	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
893	struct aw88261 *aw88261 = snd_soc_component_get_drvdata(codec);	893	struct aw88261 *aw88261 = snd_soc_component_get_drvdata(codec);
894	struct aw_volume_desc *vol_desc = &aw88261->aw_pa->volume_desc;	894	struct aw_volume_desc *vol_desc = &aw88261->aw_pa->volume_desc;
895		895
@@ -901,7 +901,7 @@ static int aw88261_volume_get(struct snd_kcontrol *kcontrol, · 5 unmodified lines
901	static int aw88261_volume_set(struct snd_kcontrol *kcontrol,	901	static int aw88261_volume_set(struct snd_kcontrol *kcontrol,
902	struct snd_ctl_elem_value *ucontrol)	902	struct snd_ctl_elem_value *ucontrol)
903	{	903	{
904	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);	904	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
905	struct aw88261 *aw88261 = snd_soc_component_get_drvdata(codec);	905	struct aw88261 *aw88261 = snd_soc_component_get_drvdata(codec);
906	struct aw_volume_desc *vol_desc = &aw88261->aw_pa->volume_desc;	906	struct aw_volume_desc *vol_desc = &aw88261->aw_pa->volume_desc;
907	struct soc_mixer_control *mc =	907	struct soc_mixer_control *mc =
@@ -926,7 +926,7 @@ static int aw88261_volume_set(struct snd_kcontrol *kcontrol, · 18 unmodified lines
926	static int aw88261_get_fade_step(struct snd_kcontrol *kcontrol,	926	static int aw88261_get_fade_step(struct snd_kcontrol *kcontrol,
927	struct snd_ctl_elem_value *ucontrol)	927	struct snd_ctl_elem_value *ucontrol)
928	{	928	{
929	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);	929	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
930	struct aw88261 *aw88261 = snd_soc_component_get_drvdata(codec);	930	struct aw88261 *aw88261 = snd_soc_component_get_drvdata(codec);
931		931
932	ucontrol->value.integer.value[0] = aw88261->aw_pa->fade_step;	932	ucontrol->value.integer.value[0] = aw88261->aw_pa->fade_step;
@@ -937,7 +937,7 @@ static int aw88261_get_fade_step(struct snd_kcontrol *kcontrol, · 4 unmodified lines
937	static int aw88261_set_fade_step(struct snd_kcontrol *kcontrol,	937	static int aw88261_set_fade_step(struct snd_kcontrol *kcontrol,
938	struct snd_ctl_elem_value *ucontrol)	938	struct snd_ctl_elem_value *ucontrol)
939	{	939	{
940	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);	940	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
941	struct aw88261 *aw88261 = snd_soc_component_get_drvdata(codec);	941	struct aw88261 *aw88261 = snd_soc_component_get_drvdata(codec);
942	struct soc_mixer_control *mc =	942	struct soc_mixer_control *mc =
943	(struct soc_mixer_control *)kcontrol->private_value;	943	(struct soc_mixer_control *)kcontrol->private_value;
@@ -1131,7 +1131,7 @@ static int aw88261_request_firmware_file(struct aw88261 *aw88261) · 187 unmodified lines
1131		1131
1132	static int aw88261_codec_probe(struct snd_soc_component *component)	1132	static int aw88261_codec_probe(struct snd_soc_component *component)
1133	{	1133	{
1134	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	1134	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
1135	struct aw88261 *aw88261 = snd_soc_component_get_drvdata(component);	1135	struct aw88261 *aw88261 = snd_soc_component_get_drvdata(component);
1136	int ret;	1136	int ret;
1137		1137
@@ -1184,7 +1184,7 @@ static void aw88261_parse_channel_dt(struct aw88261 *aw88261) · 46 unmodified lines
1184	aw_dev->channel = channel_value;	1184	aw_dev->channel = channel_value;
1185	}	1185	}
1186		1186
1187	static int aw88261_init(struct aw88261 *aw88261, struct i2c_client i2c, struct regmap *regmap)	1187	static int aw88261_init(struct aw88261 aw88261, struct i2c_client i2c, struct regmap *regmap)
1188	{	1188	{
1189	struct aw_device *aw_dev;	1189	struct aw_device *aw_dev;
1190	unsigned int chip_id;	1190	unsigned int chip_id;
@@ -1207,7 +1207,7 @@ static int aw88261_init(struct aw88261 *aw88261, struct i2c_client i2c, struct · 16 unmodified lines
1207	if (!aw_dev)	1207	if (!aw_dev)
1208	return -ENOMEM;	1208	return -ENOMEM;
1209		1209
1210	(*aw88261)->aw_pa = aw_dev;	1210	aw88261->aw_pa = aw_dev;
1211	aw_dev->i2c = i2c;	1211	aw_dev->i2c = i2c;
1212	aw_dev->regmap = regmap;	1212	aw_dev->regmap = regmap;
1213	aw_dev->dev = &i2c->dev;	1213	aw_dev->dev = &i2c->dev;
@@ -1221,7 +1221,7 @@ static int aw88261_init(struct aw88261 *aw88261, struct i2c_client i2c, struct · 7 unmodified lines
1221	aw_dev->fade_step = AW88261_VOLUME_STEP_DB;	1221	aw_dev->fade_step = AW88261_VOLUME_STEP_DB;
1222	aw_dev->volume_desc.ctl_volume = AW88261_VOL_DEFAULT_VALUE;	1222	aw_dev->volume_desc.ctl_volume = AW88261_VOL_DEFAULT_VALUE;
1223	aw_dev->volume_desc.mute_volume = AW88261_MUTE_VOL;	1223	aw_dev->volume_desc.mute_volume = AW88261_MUTE_VOL;
1224	aw88261_parse_channel_dt(*aw88261);	1224	aw88261_parse_channel_dt(aw88261);
1225		1225
1226	return ret;	1226	return ret;
1227	}	1227	}
@@ -1250,7 +1250,7 @@ static int aw88261_i2c_probe(struct i2c_client *i2c) · 22 unmodified lines
1250	}	1250	}
1251		1251
1252	/* aw pa init */	1252	/* aw pa init */
1253	ret = aw88261_init(&aw88261, i2c, aw88261->regmap);	1253	ret = aw88261_init(aw88261, i2c, aw88261->regmap);
1254	if (ret)	1254	if (ret)
1255	return ret;	1255	return ret;
1256		1256

sound/soc/codecs/aw88395/aw88395.c+15−15

sound/soc/codecs/aw88395/aw88395_device.c+20−19

@@ -64,7 +64,7 @@ static int aw_dev_dsp_write_32bit(struct aw_device *aw_dev, · 63 unmodified lines
64	return 0;	64	return 0;
65	}	65	}
66		66
67	static int aw_dev_dsp_write(struct aw_device *aw_dev,	67	int aw_dev_dsp_write(struct aw_device *aw_dev,
68	unsigned short dsp_addr, unsigned int dsp_data, unsigned char data_type)	68	unsigned short dsp_addr, unsigned int dsp_data, unsigned char data_type)
69	{	69	{
70	u32 reg_value;	70	u32 reg_value;
@@ -72,13 +72,13 @@ static int aw_dev_dsp_write(struct aw_device *aw_dev, · 1 unmodified line
72		72
73	mutex_lock(&aw_dev->dsp_lock);	73	mutex_lock(&aw_dev->dsp_lock);
74	switch (data_type) {	74	switch (data_type) {
75	case AW88395_DSP_16_DATA:	75	case AW_DSP_16_DATA:
76	ret = aw_dev_dsp_write_16bit(aw_dev, dsp_addr, dsp_data);	76	ret = aw_dev_dsp_write_16bit(aw_dev, dsp_addr, dsp_data);
77	if (ret)	77	if (ret)
78	dev_err(aw_dev->dev, "write dsp_addr[0x%x] 16-bit dsp_data[0x%x] failed",	78	dev_err(aw_dev->dev, "write dsp_addr[0x%x] 16-bit dsp_data[0x%x] failed",
79	(u32)dsp_addr, dsp_data);	79	(u32)dsp_addr, dsp_data);
80	break;	80	break;
81	case AW88395_DSP_32_DATA:	81	case AW_DSP_32_DATA:
82	ret = aw_dev_dsp_write_32bit(aw_dev, dsp_addr, dsp_data);	82	ret = aw_dev_dsp_write_32bit(aw_dev, dsp_addr, dsp_data);
83	if (ret)	83	if (ret)
84	dev_err(aw_dev->dev, "write dsp_addr[0x%x] 32-bit dsp_data[0x%x] failed",	84	dev_err(aw_dev->dev, "write dsp_addr[0x%x] 32-bit dsp_data[0x%x] failed",
@@ -97,6 +97,7 @@ static int aw_dev_dsp_write(struct aw_device *aw_dev, · 12 unmodified lines
97		97
98	return ret;	98	return ret;
99	}	99	}
		100	EXPORT_SYMBOL_GPL(aw_dev_dsp_write);
100		101
101	static int aw_dev_dsp_read_16bit(struct aw_device *aw_dev,	102	static int aw_dev_dsp_read_16bit(struct aw_device *aw_dev,
102	unsigned short dsp_addr, unsigned int *dsp_data)	103	unsigned short dsp_addr, unsigned int *dsp_data)
@@ -149,7 +150,7 @@ static int aw_dev_dsp_read_32bit(struct aw_device *aw_dev, · 46 unmodified lines
149	return 0;	150	return 0;
150	}	151	}
151		152
152	static int aw_dev_dsp_read(struct aw_device *aw_dev,	153	int aw_dev_dsp_read(struct aw_device *aw_dev,
153	unsigned short dsp_addr, unsigned int *dsp_data, unsigned char data_type)	154	unsigned short dsp_addr, unsigned int *dsp_data, unsigned char data_type)
154	{	155	{
155	u32 reg_value;	156	u32 reg_value;
@@ -157,13 +158,13 @@ static int aw_dev_dsp_read(struct aw_device *aw_dev, · 1 unmodified line
157		158
158	mutex_lock(&aw_dev->dsp_lock);	159	mutex_lock(&aw_dev->dsp_lock);
159	switch (data_type) {	160	switch (data_type) {
160	case AW88395_DSP_16_DATA:	161	case AW_DSP_16_DATA:
161	ret = aw_dev_dsp_read_16bit(aw_dev, dsp_addr, dsp_data);	162	ret = aw_dev_dsp_read_16bit(aw_dev, dsp_addr, dsp_data);
162	if (ret)	163	if (ret)
163	dev_err(aw_dev->dev, "read dsp_addr[0x%x] 16-bit dsp_data[0x%x] failed",	164	dev_err(aw_dev->dev, "read dsp_addr[0x%x] 16-bit dsp_data[0x%x] failed",
164	(u32)dsp_addr, *dsp_data);	165	(u32)dsp_addr, *dsp_data);
165	break;	166	break;
166	case AW88395_DSP_32_DATA:	167	case AW_DSP_32_DATA:
167	ret = aw_dev_dsp_read_32bit(aw_dev, dsp_addr, dsp_data);	168	ret = aw_dev_dsp_read_32bit(aw_dev, dsp_addr, dsp_data);
168	if (ret)	169	if (ret)
169	dev_err(aw_dev->dev, "read dsp_addr[0x%x] 32r-bit dsp_data[0x%x] failed",	170	dev_err(aw_dev->dev, "read dsp_addr[0x%x] 32r-bit dsp_data[0x%x] failed",
@@ -182,7 +183,7 @@ static int aw_dev_dsp_read(struct aw_device *aw_dev, · 12 unmodified lines
182		183
183	return ret;	184	return ret;
184	}	185	}
185		186	EXPORT_SYMBOL_GPL(aw_dev_dsp_read);
186		187
187	static int aw_dev_read_chipid(struct aw_device aw_dev, u16 chip_id)	188	static int aw_dev_read_chipid(struct aw_device aw_dev, u16 chip_id)
188	{	189	{
@@ -231,7 +232,7 @@ static int aw_dev_dsp_fw_check(struct aw_device *aw_dev) · 42 unmodified lines
231	dsp_fw_desc = &set_prof_desc->sec_desc[AW88395_DATA_TYPE_DSP_FW];	232	dsp_fw_desc = &set_prof_desc->sec_desc[AW88395_DATA_TYPE_DSP_FW];
232		233
233	for (i = 0; i < AW88395_FW_CHECK_PART; i++) {	234	for (i = 0; i < AW88395_FW_CHECK_PART; i++) {
234	ret = aw_dev_dsp_read(aw_dev, addr, &dsp_val, AW88395_DSP_16_DATA);	235	ret = aw_dev_dsp_read(aw_dev, addr, &dsp_val, AW_DSP_16_DATA);
235	if (ret) {	236	if (ret) {
236	dev_err(aw_dev->dev, "dsp read failed");	237	dev_err(aw_dev->dev, "dsp read failed");
237	return ret;	238	return ret;
@@ -351,11 +352,11 @@ static int aw_dev_modify_dsp_cfg(struct aw_device *aw_dev, · 113 unmodified lines
351	return -EINVAL;	352	return -EINVAL;
352	}	353	}
353	switch (data_type) {	354	switch (data_type) {
354	case AW88395_DSP_16_DATA:	355	case AW_DSP_16_DATA:
355	data1 = cpu_to_le16((u16)dsp_data);	356	data1 = cpu_to_le16((u16)dsp_data);
356	memcpy(crc_dsp_cfg->data + addr_offset, (u8 *)&data1, 2);	357	memcpy(crc_dsp_cfg->data + addr_offset, (u8 *)&data1, 2);
357	break;	358	break;
358	case AW88395_DSP_32_DATA:	359	case AW_DSP_32_DATA:
359	data2 = cpu_to_le32(dsp_data);	360	data2 = cpu_to_le32(dsp_data);
360	memcpy(crc_dsp_cfg->data + addr_offset, (u8 *)&data2, 4);	361	memcpy(crc_dsp_cfg->data + addr_offset, (u8 *)&data2, 4);
361	break;	362	break;
@@ -377,14 +378,14 @@ static int aw_dev_dsp_set_cali_re(struct aw_device *aw_dev) · 15 unmodified lines
377		378
378	/* set cali re to device */	379	/* set cali re to device */
379	ret = aw_dev_dsp_write(aw_dev,	380	ret = aw_dev_dsp_write(aw_dev,
380	AW88395_DSP_REG_CFG_ADPZ_RE, cali_re, AW88395_DSP_32_DATA);	381	AW88395_DSP_REG_CFG_ADPZ_RE, cali_re, AW_DSP_32_DATA);
381	if (ret) {	382	if (ret) {
382	dev_err(aw_dev->dev, "set cali re error");	383	dev_err(aw_dev->dev, "set cali re error");
383	return ret;	384	return ret;
384	}	385	}
385		386
386	ret = aw_dev_modify_dsp_cfg(aw_dev, AW88395_DSP_REG_CFG_ADPZ_RE,	387	ret = aw_dev_modify_dsp_cfg(aw_dev, AW88395_DSP_REG_CFG_ADPZ_RE,
387	cali_re, AW88395_DSP_32_DATA);	388	cali_re, AW_DSP_32_DATA);
388	if (ret)	389	if (ret)
389	dev_err(aw_dev->dev, "modify dsp cfg failed");	390	dev_err(aw_dev->dev, "modify dsp cfg failed");
390		391
@@ -428,7 +429,7 @@ static int aw_dev_dsp_set_crc32(struct aw_device *aw_dev) · 37 unmodified lines
428	crc_value = crc32c(0xFFFFFFFF, crc_dsp_cfg->data, crc_data_len) ^ 0xFFFFFFFF;	429	crc_value = crc32c(0xFFFFFFFF, crc_dsp_cfg->data, crc_data_len) ^ 0xFFFFFFFF;
429		430
430	return aw_dev_dsp_write(aw_dev, AW88395_DSP_REG_CRC_ADDR, crc_value,	431	return aw_dev_dsp_write(aw_dev, AW88395_DSP_REG_CRC_ADDR, crc_value,
431	AW88395_DSP_32_DATA);	432	AW_DSP_32_DATA);
432	}	433	}
433		434
434	static void aw_dev_dsp_check_crc_enable(struct aw_device *aw_dev, bool flag)	435	static void aw_dev_dsp_check_crc_enable(struct aw_device *aw_dev, bool flag)
@@ -663,7 +664,7 @@ static int aw_dev_set_vcalb(struct aw_device *aw_dev) · 228 unmodified lines
663	int vcalb, vcalk;	664	int vcalb, vcalk;
664	int ret;	665	int ret;
665		666
666	ret = aw_dev_dsp_read(aw_dev, AW88395_DSP_REG_VCALB, &vcalb_adj, AW88395_DSP_16_DATA);	667	ret = aw_dev_dsp_read(aw_dev, AW88395_DSP_REG_VCALB, &vcalb_adj, AW_DSP_16_DATA);
667	if (ret) {	668	if (ret) {
668	dev_err(aw_dev->dev, "read vcalb_adj failed");	669	dev_err(aw_dev->dev, "read vcalb_adj failed");
669	return ret;	670	return ret;
@@ -720,14 +721,14 @@ static int aw_dev_set_vcalb(struct aw_device *aw_dev) · 50 unmodified lines
720	dev_dbg(aw_dev->dev, "vcalb=%d, reg_val=0x%x, vcalb_adj =0x%x",	721	dev_dbg(aw_dev->dev, "vcalb=%d, reg_val=0x%x, vcalb_adj =0x%x",
721	vcalb, reg_val, vcalb_adj);	722	vcalb, reg_val, vcalb_adj);
722		723
723	ret = aw_dev_dsp_write(aw_dev, AW88395_DSP_REG_VCALB, reg_val, AW88395_DSP_16_DATA);	724	ret = aw_dev_dsp_write(aw_dev, AW88395_DSP_REG_VCALB, reg_val, AW_DSP_16_DATA);
724	if (ret) {	725	if (ret) {
725	dev_err(aw_dev->dev, "write vcalb failed");	726	dev_err(aw_dev->dev, "write vcalb failed");
726	return ret;	727	return ret;
727	}	728	}
728		729
729	ret = aw_dev_modify_dsp_cfg(aw_dev, AW88395_DSP_REG_VCALB,	730	ret = aw_dev_modify_dsp_cfg(aw_dev, AW88395_DSP_REG_VCALB,
730	(u32)reg_val, AW88395_DSP_16_DATA);	731	(u32)reg_val, AW_DSP_16_DATA);
731	if (ret)	732	if (ret)
732	dev_err(aw_dev->dev, "modify dsp cfg failed");	733	dev_err(aw_dev->dev, "modify dsp cfg failed");
733		734
@@ -741,7 +742,7 @@ static int aw_dev_get_cali_f0_delay(struct aw_device *aw_dev) · 7 unmodified lines
741	int ret;	742	int ret;
742		743
743	ret = aw_dev_dsp_read(aw_dev,	744	ret = aw_dev_dsp_read(aw_dev,
744	AW88395_DSP_CALI_F0_DELAY, &cali_delay, AW88395_DSP_16_DATA);	745	AW88395_DSP_CALI_F0_DELAY, &cali_delay, AW_DSP_16_DATA);
745	if (ret)	746	if (ret)
746	dev_err(aw_dev->dev, "read cali delay failed, ret=%d", ret);	747	dev_err(aw_dev->dev, "read cali delay failed, ret=%d", ret);
747	else	748	else
@@ -991,7 +992,7 @@ static int aw_dev_get_dsp_status(struct aw_device *aw_dev) · 243 unmodified lines
991		992
992	static int aw_dev_get_vmax(struct aw_device aw_dev, unsigned int vmax)	993	static int aw_dev_get_vmax(struct aw_device aw_dev, unsigned int vmax)
993	{	994	{
994	return aw_dev_dsp_read(aw_dev, AW88395_DSP_REG_VMAX, vmax, AW88395_DSP_16_DATA);	995	return aw_dev_dsp_read(aw_dev, AW88395_DSP_REG_VMAX, vmax, AW_DSP_16_DATA);
995	}	996	}
996		997
997	static int aw_dev_update_reg_container(struct aw_device *aw_dev,	998	static int aw_dev_update_reg_container(struct aw_device *aw_dev,
@@ -1089,7 +1090,7 @@ static int aw_dev_get_ra(struct aw_cali_desc *cali_desc) · 91 unmodified lines
1089	int ret;	1090	int ret;
1090		1091
1091	ret = aw_dev_dsp_read(aw_dev, AW88395_DSP_REG_CFG_ADPZ_RA,	1092	ret = aw_dev_dsp_read(aw_dev, AW88395_DSP_REG_CFG_ADPZ_RA,
1092	&dsp_ra, AW88395_DSP_32_DATA);	1093	&dsp_ra, AW_DSP_32_DATA);
1093	if (ret) {	1094	if (ret) {
1094	dev_err(aw_dev->dev, "read ra error");	1095	dev_err(aw_dev->dev, "read ra error");
1095	return ret;	1096	return ret;

sound/soc/codecs/aw88395/aw88395_device.h+6−2

 };
 enum {
-	AW88395_DSP_16_DATA = 0,
+	AW_DSP_16_DATA = 0,
-	AW88395_DSP_32_DATA = 1,
+	AW_DSP_32_DATA = 1,
 };
 enum {
 int aw88395_dev_load_acf_check(struct aw_device *aw_dev, struct aw_container *aw_cfg);
 int aw88395_dev_cfg_load(struct aw_device *aw_dev, struct aw_container *aw_cfg);
 void aw88395_dev_mute(struct aw_device *aw_dev, bool is_mute);
+int aw_dev_dsp_write(struct aw_device *aw_dev,
+		unsigned short dsp_addr, unsigned int dsp_data, unsigned char data_type);
+int aw_dev_dsp_read(struct aw_device *aw_dev,
+		unsigned short dsp_addr, unsigned int *dsp_data, unsigned char data_type);
 #endif

sound/soc/codecs/aw88399.c+38−215

 	.val_format_endian = REGMAP_ENDIAN_BIG,
 };
-static int aw_dev_dsp_write_16bit(struct aw_device *aw_dev,
-		unsigned short dsp_addr, unsigned int dsp_data)
-{
-	int ret;
-	ret = regmap_write(aw_dev->regmap, AW88399_DSPMADD_REG, dsp_addr);
-	if (ret) {
-		dev_err(aw_dev->dev, "%s write addr error, ret=%d", __func__, ret);
-		return ret;
-	}
-	ret = regmap_write(aw_dev->regmap, AW88399_DSPMDAT_REG, (u16)dsp_data);
-	if (ret) {
-		dev_err(aw_dev->dev, "%s write data error, ret=%d", __func__, ret);
-		return ret;
-	}
-	return 0;
-}
-static int aw_dev_dsp_write_32bit(struct aw_device *aw_dev,
-		unsigned short dsp_addr, unsigned int dsp_data)
-{
-	unsigned int temp_data;
-	int ret;
-	ret = regmap_write(aw_dev->regmap, AW88399_DSPMADD_REG, dsp_addr);
-	if (ret) {
-		dev_err(aw_dev->dev, "%s write addr error, ret=%d", __func__, ret);
-		return ret;
-	}
-	temp_data = dsp_data & AW88395_DSP_16_DATA_MASK;
-	ret = regmap_write(aw_dev->regmap, AW88399_DSPMDAT_REG, temp_data);
-	if (ret) {
-		dev_err(aw_dev->dev, "%s write datal error, ret=%d", __func__, ret);
-		return ret;
-	}
-	temp_data = dsp_data >> 16;
-	ret = regmap_write(aw_dev->regmap, AW88399_DSPMDAT_REG, temp_data);
-	if (ret)
-		dev_err(aw_dev->dev, "%s write datah error, ret=%d", __func__, ret);
-	return ret;
-}
-static int aw_dev_dsp_write(struct aw_device *aw_dev,
-		unsigned short dsp_addr, unsigned int dsp_data, unsigned char data_type)
-{
-	unsigned int reg_value;
-	int ret;
-	mutex_lock(&aw_dev->dsp_lock);
-	switch (data_type) {
-	case AW88395_DSP_16_DATA:
-		ret = aw_dev_dsp_write_16bit(aw_dev, dsp_addr, dsp_data);
-		if (ret)
-			dev_err(aw_dev->dev, "write dsp_addr[0x%x] 16-bit dsp_data[0x%x] failed",
-					dsp_addr, dsp_data);
-		break;
-	case AW88395_DSP_32_DATA:
-		ret = aw_dev_dsp_write_32bit(aw_dev, dsp_addr, dsp_data);
-		if (ret)
-			dev_err(aw_dev->dev, "write dsp_addr[0x%x] 32-bit dsp_data[0x%x] failed",
-					dsp_addr, dsp_data);
-		break;
-	default:
-		dev_err(aw_dev->dev, "data type[%d] unsupported", data_type);
-		ret = -EINVAL;
-		break;
-	}
-	/* clear dsp chip select state */
-	if (regmap_read(aw_dev->regmap, 0x00, &reg_value))
-		dev_err(aw_dev->dev, "%s fail to clear chip state. Err=%d\n", __func__, ret);
-	mutex_unlock(&aw_dev->dsp_lock);
-	return ret;
-}
-static int aw_dev_dsp_read_16bit(struct aw_device *aw_dev,
-		unsigned short dsp_addr, unsigned int *dsp_data)
-{
-	unsigned int temp_data;
-	int ret;
-	ret = regmap_write(aw_dev->regmap, AW88399_DSPMADD_REG, dsp_addr);
-	if (ret) {
-		dev_err(aw_dev->dev, "%s write error, ret=%d", __func__, ret);
-		return ret;
-	}
-	ret = regmap_read(aw_dev->regmap, AW88399_DSPMDAT_REG, &temp_data);
-	if (ret) {
-		dev_err(aw_dev->dev, "%s read error, ret=%d", __func__, ret);
-		return ret;
-	}
-	*dsp_data = temp_data;
-	return 0;
-}
-static int aw_dev_dsp_read_32bit(struct aw_device *aw_dev,
-		unsigned short dsp_addr, unsigned int *dsp_data)
-{
-	unsigned int temp_data;
-	int ret;
-	ret = regmap_write(aw_dev->regmap, AW88399_DSPMADD_REG, dsp_addr);
-	if (ret) {
-		dev_err(aw_dev->dev, "%s write error, ret=%d", __func__, ret);
-		return ret;
-	}
-	ret = regmap_read(aw_dev->regmap, AW88399_DSPMDAT_REG, &temp_data);
-	if (ret) {
-		dev_err(aw_dev->dev, "%s read error, ret=%d", __func__, ret);
-		return ret;
-	}
-	*dsp_data = temp_data;
-	ret = regmap_read(aw_dev->regmap, AW88399_DSPMDAT_REG, &temp_data);
-	if (ret) {
-		dev_err(aw_dev->dev, "%s read error, ret=%d", __func__, ret);
-		return ret;
-	}
-	*dsp_data |= (temp_data << 16);
-	return 0;
-}
-static int aw_dev_dsp_read(struct aw_device *aw_dev,
-		unsigned short dsp_addr, unsigned int *dsp_data, unsigned char data_type)
-{
-	u32 reg_value;
-	int ret;
-	mutex_lock(&aw_dev->dsp_lock);
-	switch (data_type) {
-	case AW88399_DSP_16_DATA:
-		ret = aw_dev_dsp_read_16bit(aw_dev, dsp_addr, dsp_data);
-		if (ret)
-			dev_err(aw_dev->dev, "read dsp_addr[0x%x] 16-bit dsp_data[0x%x] failed",
-					(u32)dsp_addr, *dsp_data);
-		break;
-	case AW88399_DSP_32_DATA:
-		ret = aw_dev_dsp_read_32bit(aw_dev, dsp_addr, dsp_data);
-		if (ret)
-			dev_err(aw_dev->dev, "read dsp_addr[0x%x] 32r-bit dsp_data[0x%x] failed",
-					(u32)dsp_addr, *dsp_data);
-		break;
-	default:
-		dev_err(aw_dev->dev, "data type[%d] unsupported", data_type);
-		ret = -EINVAL;
-		break;
-	}
-	/* clear dsp chip select state */
-	if (regmap_read(aw_dev->regmap, AW88399_ID_REG, &reg_value))
-		dev_err(aw_dev->dev, "%s fail to clear chip state. ret=%d\n", __func__, ret);
-	mutex_unlock(&aw_dev->dsp_lock);
-	return ret;
-}
 static void aw_dev_pwd(struct aw_device *aw_dev, bool pwd)
 {
 	int ret;
 	u32 tmp_len;
 	int i, ret;
-	mutex_lock(&aw_dev->dsp_lock);
 	ret = regmap_write(aw_dev->regmap, AW88399_DSPMADD_REG, base);
 	if (ret)
-		goto error_operation;
+		return ret;
 	for (i = 0; i < len; i += AW88399_MAX_RAM_WRITE_BYTE_SIZE) {
 		tmp_len = min(len - i, AW88399_MAX_RAM_WRITE_BYTE_SIZE);
 		ret = regmap_raw_write(aw_dev->regmap, AW88399_DSPMDAT_REG,
 					&data[i], tmp_len);
 		if (ret)
-			goto error_operation;
+			return ret;
 	}
-	mutex_unlock(&aw_dev->dsp_lock);
 	return 0;
-error_operation:
-	mutex_unlock(&aw_dev->dsp_lock);
-	return ret;
 }
 static int aw_dev_get_ra(struct aw_cali_desc *cali_desc)
 	int ret;
 	ret = aw_dev_dsp_read(aw_dev, AW88399_DSP_REG_CFG_ADPZ_RA,
-				&dsp_ra, AW88399_DSP_32_DATA);
+				&dsp_ra, AW_DSP_32_DATA);
 	if (ret) {
 		dev_err(aw_dev->dev, "read ra error");
 		return ret;
 {
 	unsigned int reg_val;
-	mutex_lock(&aw_dev->dsp_lock);
 	/* read dsp_rom_check_reg */
-	aw_dev_dsp_read_16bit(aw_dev, AW88399_DSP_ROM_CHECK_ADDR, &reg_val);
+	aw_dev_dsp_read(aw_dev, AW88399_DSP_ROM_CHECK_ADDR, &reg_val, AW_DSP_16_DATA);
 	if (reg_val != AW88399_DSP_ROM_CHECK_DATA) {
 		dev_err(aw_dev->dev, "check dsp rom failed, read[0x%x] != check[0x%x]",
 						reg_val, AW88399_DSP_ROM_CHECK_DATA);
-		goto error;
+		return -EPERM;
 	}
 	/* check dsp_cfg_base_addr */
-	aw_dev_dsp_write_16bit(aw_dev, AW88399_DSP_CFG_ADDR, AW88399_DSP_ODD_NUM_BIT_TEST);
+	aw_dev_dsp_write(aw_dev, AW88399_DSP_CFG_ADDR,
-	aw_dev_dsp_read_16bit(aw_dev, AW88399_DSP_CFG_ADDR, &reg_val);
+				AW88399_DSP_ODD_NUM_BIT_TEST, AW_DSP_16_DATA);
+	aw_dev_dsp_read(aw_dev, AW88399_DSP_CFG_ADDR, &reg_val, AW_DSP_16_DATA);
 	if (reg_val != AW88399_DSP_ODD_NUM_BIT_TEST) {
 		dev_err(aw_dev->dev, "check dsp cfg failed, read[0x%x] != write[0x%x]",
 						reg_val, AW88399_DSP_ODD_NUM_BIT_TEST);
-		goto error;
+		return -EPERM;
 	}
-	mutex_unlock(&aw_dev->dsp_lock);
 	return 0;
-error:
-	mutex_unlock(&aw_dev->dsp_lock);
-	return -EPERM;
 }
 static void aw_dev_select_memclk(struct aw_device *aw_dev, unsigned char flag)
 	if (sync_start == AW88399_SYNC_START)
 		aw88399_start_pa(aw88399);
 	else
-		queue_delayed_work(system_wq,
+		queue_delayed_work(system_dfl_wq,
 			&aw88399->start_work,
 			AW88399_START_WORK_DELAY_MS);
 }
 	int ret;
 	ret = aw_dev_dsp_read(aw_dev, AW88399_DSP_REG_CFG_MBMEC_ACTAMPTH,
-					&cali_cfg->data[0], AW88399_DSP_32_DATA);
+					&cali_cfg->data[0], AW_DSP_32_DATA);
 	if (ret)
 		return ret;
 	ret = aw_dev_dsp_read(aw_dev, AW88399_DSP_REG_CFG_MBMEC_NOISEAMPTH,
-					&cali_cfg->data[1], AW88399_DSP_32_DATA);
+					&cali_cfg->data[1], AW_DSP_32_DATA);
 	if (ret)
 		return ret;
 	ret = aw_dev_dsp_read(aw_dev, AW88399_DSP_REG_CFG_ADPZ_USTEPN,
-					&cali_cfg->data[2], AW88399_DSP_16_DATA);
+					&cali_cfg->data[2], AW_DSP_16_DATA);
 	if (ret)
 		return ret;
 	ret = aw_dev_dsp_read(aw_dev, AW88399_DSP_REG_CFG_RE_ALPHA,
-					&cali_cfg->data[3], AW88399_DSP_16_DATA);
+					&cali_cfg->data[3], AW_DSP_16_DATA);
 	return ret;
 }
 	int ret;
 	ret = aw_dev_dsp_write(aw_dev, AW88399_DSP_REG_CFG_MBMEC_ACTAMPTH,
-					cali_cfg.data[0], AW88399_DSP_32_DATA);
+					cali_cfg.data[0], AW_DSP_32_DATA);
 	if (ret)
 		return ret;
 	ret = aw_dev_dsp_write(aw_dev, AW88399_DSP_REG_CFG_MBMEC_NOISEAMPTH,
-					cali_cfg.data[1], AW88399_DSP_32_DATA);
+					cali_cfg.data[1], AW_DSP_32_DATA);
 	if (ret)
 		return ret;
 	ret = aw_dev_dsp_write(aw_dev, AW88399_DSP_REG_CFG_ADPZ_USTEPN,
-					cali_cfg.data[2], AW88399_DSP_16_DATA);
+					cali_cfg.data[2], AW_DSP_16_DATA);
 	if (ret)
 		return ret;
 	ret = aw_dev_dsp_write(aw_dev, AW88399_DSP_REG_CFG_RE_ALPHA,
-					cali_cfg.data[3], AW88399_DSP_16_DATA);
+					cali_cfg.data[3], AW_DSP_16_DATA);
 	return ret;
 }
 		regmap_update_bits(aw_dev->regmap, AW88399_DBGCTRL_REG,
 				~AW883XX_DSP_NG_EN_MASK, AW883XX_DSP_NG_EN_DISABLE_VALUE);
 		aw_dev_dsp_write(aw_dev, AW88399_DSP_LOW_POWER_SWITCH_CFG_ADDR,
-				AW88399_DSP_LOW_POWER_SWITCH_DISABLE, AW88399_DSP_16_DATA);
+				AW88399_DSP_LOW_POWER_SWITCH_DISABLE, AW_DSP_16_DATA);
 		ret = aw_cali_svc_get_cali_cfg(aw_dev);
 		if (ret) {
 	regmap_read(aw_dev->regmap, AW88399_DBGCTRL_REG, &reg_val);
 	backup_desc->dsp_ng_cfg = reg_val & (~AW883XX_DSP_NG_EN_MASK);
-	aw_dev_dsp_read(aw_dev, AW88399_DSP_LOW_POWER_SWITCH_CFG_ADDR,
+	aw_dev_dsp_read(aw_dev, AW88399_DSP_LOW_POWER_SWITCH_CFG_ADDR, &dsp_val, AW_DSP_16_DATA);
-			&dsp_val, AW88399_DSP_16_DATA);
 	backup_desc->dsp_lp_cfg = dsp_val;
 }
 			~AW883XX_DSP_NG_EN_MASK, backup_desc->dsp_ng_cfg);
 	aw_dev_dsp_write(aw_dev, AW88399_DSP_LOW_POWER_SWITCH_CFG_ADDR,
-			backup_desc->dsp_lp_cfg, AW88399_DSP_16_DATA);
+			backup_desc->dsp_lp_cfg, AW_DSP_16_DATA);
 }
 static int aw_cali_svc_cali_re_mode_enable(struct aw_device *aw_dev, bool is_enable)
 	uint32_t dsp_re, show_re;
 	int ret;
-	ret = aw_dev_dsp_read(aw_dev, AW88399_DSP_REG_CALRE, &dsp_re, AW88399_DSP_16_DATA);
+	ret = aw_dev_dsp_read(aw_dev, AW88399_DSP_REG_CALRE, &dsp_re, AW_DSP_16_DATA);
 	if (ret)
 		return ret;
 static int aw88399_get_fade_in_time(struct snd_kcontrol *kcontrol,
 	struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct aw88399 *aw88399 = snd_soc_component_get_drvdata(component);
 	struct aw_device *aw_dev = aw88399->aw_pa;
 static int aw88399_set_fade_in_time(struct snd_kcontrol *kcontrol,
 	struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct aw88399 *aw88399 = snd_soc_component_get_drvdata(component);
 	struct soc_mixer_control *mc =
 		(struct soc_mixer_control *)kcontrol->private_value;
 static int aw88399_get_fade_out_time(struct snd_kcontrol *kcontrol,
 	struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct aw88399 *aw88399 = snd_soc_component_get_drvdata(component);
 	struct aw_device *aw_dev = aw88399->aw_pa;
 static int aw88399_set_fade_out_time(struct snd_kcontrol *kcontrol,
 	struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct aw88399 *aw88399 = snd_soc_component_get_drvdata(component);
 	struct soc_mixer_control *mc =
 		(struct soc_mixer_control *)kcontrol->private_value;
 static int aw88399_profile_info(struct snd_kcontrol *kcontrol,
 			 struct snd_ctl_elem_info *uinfo)
 {
-	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
 	struct aw88399 *aw88399 = snd_soc_component_get_drvdata(codec);
 	char *prof_name;
 	int count, ret;
 static int aw88399_profile_get(struct snd_kcontrol *kcontrol,
 			struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
 	struct aw88399 *aw88399 = snd_soc_component_get_drvdata(codec);
 	ucontrol->value.integer.value[0] = aw88399->aw_pa->prof_index;
 static int aw88399_profile_set(struct snd_kcontrol *kcontrol,
 		struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
 	struct aw88399 *aw88399 = snd_soc_component_get_drvdata(codec);
 	int ret;
 static int aw88399_volume_get(struct snd_kcontrol *kcontrol,
 				struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
 	struct aw88399 *aw88399 = snd_soc_component_get_drvdata(codec);
 	struct aw_volume_desc *vol_desc = &aw88399->aw_pa->volume_desc;
 static int aw88399_volume_set(struct snd_kcontrol *kcontrol,
 				struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
 	struct aw88399 *aw88399 = snd_soc_component_get_drvdata(codec);
 	struct aw_volume_desc *vol_desc = &aw88399->aw_pa->volume_desc;
 	struct soc_mixer_control *mc =
 static int aw88399_get_fade_step(struct snd_kcontrol *kcontrol,
 				struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
 	struct aw88399 *aw88399 = snd_soc_component_get_drvdata(codec);
 	ucontrol->value.integer.value[0] = aw88399->aw_pa->fade_step;
 static int aw88399_set_fade_step(struct snd_kcontrol *kcontrol,
 				struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
 	struct aw88399 *aw88399 = snd_soc_component_get_drvdata(codec);
 	struct soc_mixer_control *mc =
 		(struct soc_mixer_control *)kcontrol->private_value;
 static int aw88399_re_get(struct snd_kcontrol *kcontrol,
 				struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
 	struct aw88399 *aw88399 = snd_soc_component_get_drvdata(codec);
 	struct aw_device *aw_dev = aw88399->aw_pa;
 static int aw88399_re_set(struct snd_kcontrol *kcontrol,
 				struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
 	struct aw88399 *aw88399 = snd_soc_component_get_drvdata(codec);
 	struct soc_mixer_control *mc =
 		(struct soc_mixer_control *)kcontrol->private_value;
 static int aw88399_calib_switch_get(struct snd_kcontrol *kcontrol,
 				struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
 	struct aw88399 *aw88399 = snd_soc_component_get_drvdata(codec);
 	struct aw_device *aw_dev = aw88399->aw_pa;
 static int aw88399_calib_switch_set(struct snd_kcontrol *kcontrol,
 				struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
 	struct aw88399 *aw88399 = snd_soc_component_get_drvdata(codec);
 	struct aw_device *aw_dev = aw88399->aw_pa;
 static int aw88399_calib_set(struct snd_kcontrol *kcontrol,
 				struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
 	struct aw88399 *aw88399 = snd_soc_component_get_drvdata(codec);
 	struct aw_device *aw_dev = aw88399->aw_pa;

sound/soc/codecs/aw88399.h+0−5

 	AW88399_DEV_DSP_BYPASS = 1,
 };
-enum {
-	AW88399_DSP_16_DATA = 0,
-	AW88399_DSP_32_DATA = 1,
-};
 enum {
 	AW88399_NOT_RCV_MODE = 0,
 	AW88399_RCV_MODE = 1,

sound/soc/codecs/bd28623.c+2−4

 static int bd28623_get_switch_spk(struct snd_kcontrol *kcontrol,
 				  struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-		snd_soc_kcontrol_component(kcontrol);
 	struct bd28623_priv *bd = snd_soc_component_get_drvdata(component);
 	ucontrol->value.integer.value[0] = bd->switch_spk;
 static int bd28623_set_switch_spk(struct snd_kcontrol *kcontrol,
 				  struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-		snd_soc_kcontrol_component(kcontrol);
 	struct bd28623_priv *bd = snd_soc_component_get_drvdata(component);
 	if (bd->switch_spk == ucontrol->value.integer.value[0])

sound/soc/codecs/cpcap.c+9−12

 static int cpcap_output_mux_get_enum(struct snd_kcontrol *kcontrol,
 				     struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_dapm_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol);
 	struct cpcap_audio *cpcap = snd_soc_component_get_drvdata(component);
 	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
 	unsigned int shift = e->shift_l;
 static int cpcap_output_mux_put_enum(struct snd_kcontrol *kcontrol,
 				     struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_dapm_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol);
 	struct cpcap_audio *cpcap = snd_soc_component_get_drvdata(component);
-	struct snd_soc_dapm_context *dapm =
+	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol);
-		snd_soc_dapm_kcontrol_dapm(kcontrol);
 	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
 	unsigned int muxval = ucontrol->value.enumerated.item[0];
 	unsigned int mask = BIT(e->shift_l);
 static int cpcap_input_right_mux_get_enum(struct snd_kcontrol *kcontrol,
 					  struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_dapm_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol);
 	struct cpcap_audio *cpcap = snd_soc_component_get_drvdata(component);
 	int regval, mask;
 	int err;
 static int cpcap_input_right_mux_put_enum(struct snd_kcontrol *kcontrol,
 					  struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_dapm_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol);
 	struct cpcap_audio *cpcap = snd_soc_component_get_drvdata(component);
-	struct snd_soc_dapm_context *dapm =
+	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol);
-		snd_soc_dapm_kcontrol_dapm(kcontrol);
 	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
 	unsigned int muxval = ucontrol->value.enumerated.item[0];
 	int regval = 0, mask;
 static int cpcap_input_left_mux_get_enum(struct snd_kcontrol *kcontrol,
 					 struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_dapm_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol);
 	struct cpcap_audio *cpcap = snd_soc_component_get_drvdata(component);
 	int regval, mask;
 	int err;
 static int cpcap_input_left_mux_put_enum(struct snd_kcontrol *kcontrol,
 					 struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_dapm_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol);
 	struct cpcap_audio *cpcap = snd_soc_component_get_drvdata(component);
-	struct snd_soc_dapm_context *dapm =
+	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol);
-		snd_soc_dapm_kcontrol_dapm(kcontrol);
 	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
 	unsigned int muxval = ucontrol->value.enumerated.item[0];
 	int regval = 0, mask;

sound/soc/codecs/cros_ec_codec.c+4−6

 static int dmic_get_gain(struct snd_kcontrol *kcontrol,
 			 struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-		snd_soc_kcontrol_component(kcontrol);
 	struct cros_ec_codec_priv *priv =
 		snd_soc_component_get_drvdata(component);
 	struct ec_param_ec_codec_dmic p;
 static int dmic_put_gain(struct snd_kcontrol *kcontrol,
 			 struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-		snd_soc_kcontrol_component(kcontrol);
 	struct cros_ec_codec_priv *priv =
 		snd_soc_component_get_drvdata(component);
 	struct soc_mixer_control *control =
 static int wov_enable_get(struct snd_kcontrol *kcontrol,
 			  struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *c = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *c = snd_kcontrol_chip(kcontrol);
 	struct cros_ec_codec_priv *priv = snd_soc_component_get_drvdata(c);
 	ucontrol->value.integer.value[0] = priv->wov_enabled;
 static int wov_enable_put(struct snd_kcontrol *kcontrol,
 			  struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *c = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *c = snd_kcontrol_chip(kcontrol);
 	struct cros_ec_codec_priv *priv = snd_soc_component_get_drvdata(c);
 	int enabled = ucontrol->value.integer.value[0];
 	struct ec_param_ec_codec_wov p;

sound/soc/codecs/cs-amp-lib-test.c+1485−37

@@ -20,6 +20,10 @@ · 19 unmodified lines
20	#include <linux/random.h>	20	#include <linux/random.h>
21	#include <sound/cs-amp-lib.h>	21	#include <sound/cs-amp-lib.h>
22		22
		23	#define CIRRUS_LOGIC_CALIBRATION_EFI_NAME L"CirrusSmartAmpCalibrationData"
		24	#define CIRRUS_LOGIC_CALIBRATION_EFI_GUID \
		25	EFI_GUID(0x02f9af02, 0x7734, 0x4233, 0xb4, 0x3d, 0x93, 0xfe, 0x5a, 0xa3, 0x5d, 0xb3)
		26
23	#define LENOVO_SPEAKER_ID_EFI_NAME L"SdwSpeaker"	27	#define LENOVO_SPEAKER_ID_EFI_NAME L"SdwSpeaker"
24	#define LENOVO_SPEAKER_ID_EFI_GUID \	28	#define LENOVO_SPEAKER_ID_EFI_GUID \
25	EFI_GUID(0x48df970e, 0xe27f, 0x460a, 0xb5, 0x86, 0x77, 0x19, 0x80, 0x1d, 0x92, 0x82)	29	EFI_GUID(0x48df970e, 0xe27f, 0x460a, 0xb5, 0x86, 0x77, 0x19, 0x80, 0x1d, 0x92, 0x82)
@@ -28,6 +32,10 @@ · 2 unmodified lines
28	#define HP_SPEAKER_ID_EFI_GUID \	32	#define HP_SPEAKER_ID_EFI_GUID \
29	EFI_GUID(0xc49593a4, 0xd099, 0x419b, 0xa2, 0xc3, 0x67, 0xe9, 0x80, 0xe6, 0x1d, 0x1e)	33	EFI_GUID(0xc49593a4, 0xd099, 0x419b, 0xa2, 0xc3, 0x67, 0xe9, 0x80, 0xe6, 0x1d, 0x1e)
30		34
		35	#define HP_CALIBRATION_EFI_NAME L"SmartAmpCalibrationData"
		36	#define HP_CALIBRATION_EFI_GUID \
		37	EFI_GUID(0x53559579, 0x8753, 0x4f5c, 0x91, 0x30, 0xe8, 0x2a, 0xcf, 0xb8, 0xd8, 0x93)
		38
31	KUNIT_DEFINE_ACTION_WRAPPER(faux_device_destroy_wrapper, faux_device_destroy,	39	KUNIT_DEFINE_ACTION_WRAPPER(faux_device_destroy_wrapper, faux_device_destroy,
32	struct faux_device *)	40	struct faux_device *)
33		41
@@ -36,6 +44,7 @@ struct cs_amp_lib_test_priv { · 2 unmodified lines
36		44
37	struct cirrus_amp_efi_data *cal_blob;	45	struct cirrus_amp_efi_data *cal_blob;
38	struct list_head ctl_write_list;	46	struct list_head ctl_write_list;
		47	u32 efi_attr;
39	};	48	};
40		49
41	struct cs_amp_lib_test_ctl_write_entry {	50	struct cs_amp_lib_test_ctl_write_entry {
@@ -49,6 +58,20 @@ struct cs_amp_lib_test_param { · 7 unmodified lines
49	int amp_index;	58	int amp_index;
50	};	59	};
51		60
		61	static struct cirrus_amp_efi_data cs_amp_lib_test_cal_blob_dup(struct kunit test)
		62	{
		63	struct cs_amp_lib_test_priv *priv = test->priv;
		64	struct cirrus_amp_efi_data *temp;
		65
		66	KUNIT_ASSERT_EQ(test, struct_size(priv->cal_blob, data, priv->cal_blob->count),
		67	priv->cal_blob->size);
		68	temp = kunit_kmalloc(test, priv->cal_blob->size, GFP_KERNEL);
		69	KUNIT_ASSERT_NOT_NULL(test, temp);
		70	memcpy(temp, priv->cal_blob, priv->cal_blob->size);
		71
		72	return temp;
		73	}
		74
52	static void cs_amp_lib_test_init_dummy_cal_blob(struct kunit *test, int num_amps)	75	static void cs_amp_lib_test_init_dummy_cal_blob(struct kunit *test, int num_amps)
53	{	76	{
54	struct cs_amp_lib_test_priv *priv = test->priv;	77	struct cs_amp_lib_test_priv *priv = test->priv;
@@ -69,9 +92,15 @@ static void cs_amp_lib_test_init_dummy_cal_blob(struct kunit *test, int num_amps · 14 unmodified lines
69	for (i = 0; i < num_amps; i++)	92	for (i = 0; i < num_amps; i++)
70	priv->cal_blob->data[i].calTime[0] \|= 1;	93	priv->cal_blob->data[i].calTime[0] \|= 1;
71		94
72	/* Ensure that all UIDs are non-zero and unique. */	95	/*
73	for (i = 0; i < num_amps; i++)	96	* Ensure that all UIDs are non-zero and unique.
		97	* Make both words non-zero and not equal values, so that
		98	* tests can verify that both words were checked or changed.
		99	*/
		100	for (i = 0; i < num_amps; i++) {
74	(u8 )&priv->cal_blob->data[i].calTarget[0] = i + 1;	101	(u8 )&priv->cal_blob->data[i].calTarget[0] = i + 1;
		102	(u8 )&priv->cal_blob->data[i].calTarget[1] = i;
		103	}
75	}	104	}
76		105
77	static u64 cs_amp_lib_test_get_target_uid(struct kunit *test)	106	static u64 cs_amp_lib_test_get_target_uid(struct kunit *test)
@@ -90,6 +119,7 @@ static u64 cs_amp_lib_test_get_target_uid(struct kunit *test) · 12 unmodified lines
90	/* Redirected get_efi_variable to simulate that the file is too short */	119	/* Redirected get_efi_variable to simulate that the file is too short */
91	static efi_status_t cs_amp_lib_test_get_efi_variable_nohead(efi_char16_t *name,	120	static efi_status_t cs_amp_lib_test_get_efi_variable_nohead(efi_char16_t *name,
92	efi_guid_t *guid,	121	efi_guid_t *guid,
		122	u32 *returned_attr,
93	unsigned long *size,	123	unsigned long *size,
94	void *buf)	124	void *buf)
95	{	125	{
@@ -115,13 +145,12 @@ static void cs_amp_lib_test_cal_data_too_short_test(struct kunit *test) · 19 unmodified lines
115		145
116	ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, 0, 0, &result_data);	146	ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, 0, 0, &result_data);
117	KUNIT_EXPECT_EQ(test, ret, -EOVERFLOW);	147	KUNIT_EXPECT_EQ(test, ret, -EOVERFLOW);
118
119	kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable);
120	}	148	}
121		149
122	/* Redirected get_efi_variable to simulate that the count is larger than the file */	150	/* Redirected get_efi_variable to simulate that the count is larger than the file */
123	static efi_status_t cs_amp_lib_test_get_efi_variable_bad_count(efi_char16_t *name,	151	static efi_status_t cs_amp_lib_test_get_efi_variable_bad_count(efi_char16_t *name,
124	efi_guid_t *guid,	152	efi_guid_t *guid,
		153	u32 *returned_attr,
125	unsigned long *size,	154	unsigned long *size,
126	void *buf)	155	void *buf)
127	{	156	{
@@ -158,13 +187,12 @@ static void cs_amp_lib_test_cal_count_too_big_test(struct kunit *test) · 30 unmodified lines
158		187
159	ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, 0, 0, &result_data);	188	ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, 0, 0, &result_data);
160	KUNIT_EXPECT_EQ(test, ret, -EOVERFLOW);	189	KUNIT_EXPECT_EQ(test, ret, -EOVERFLOW);
161
162	kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable);
163	}	190	}
164		191
165	/* Redirected get_efi_variable to simulate that the variable not found */	192	/* Redirected get_efi_variable to simulate that the variable not found */
166	static efi_status_t cs_amp_lib_test_get_efi_variable_none(efi_char16_t *name,	193	static efi_status_t cs_amp_lib_test_get_efi_variable_none(efi_char16_t *name,
167	efi_guid_t *guid,	194	efi_guid_t *guid,
		195	u32 *returned_attr,
168	unsigned long *size,	196	unsigned long *size,
169	void *buf)	197	void *buf)
170	{	198	{
@@ -185,19 +213,17 @@ static void cs_amp_lib_test_no_cal_data_test(struct kunit *test) · 14 unmodified lines
185		213
186	ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, 0, 0, &result_data);	214	ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, 0, 0, &result_data);
187	KUNIT_EXPECT_EQ(test, ret, -ENOENT);	215	KUNIT_EXPECT_EQ(test, ret, -ENOENT);
188
189	kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable);
190	}	216	}
191		217
192	/* Redirected get_efi_variable to simulate reading a cal data blob */	218	/* Redirected get_efi_variable to simulate reading a cal data blob */
193	static efi_status_t cs_amp_lib_test_get_efi_variable(efi_char16_t *name,	219	static efi_status_t cs_amp_lib_test_get_efi_variable(efi_char16_t *name,
194	efi_guid_t *guid,	220	efi_guid_t *guid,
		221	u32 *returned_attr,
195	unsigned long *size,	222	unsigned long *size,
196	void *buf)	223	void *buf)
197	{	224	{
198	static const efi_char16_t expected_name[] = L"CirrusSmartAmpCalibrationData";	225	static const efi_char16_t expected_name[] = CIRRUS_LOGIC_CALIBRATION_EFI_NAME;
199	static const efi_guid_t expected_guid =	226	static const efi_guid_t expected_guid = CIRRUS_LOGIC_CALIBRATION_EFI_GUID;
200	EFI_GUID(0x02f9af02, 0x7734, 0x4233, 0xb4, 0x3d, 0x93, 0xfe, 0x5a, 0xa3, 0x5d, 0xb3);
201	struct kunit *test = kunit_get_current_test();	227	struct kunit *test = kunit_get_current_test();
202	struct cs_amp_lib_test_priv *priv = test->priv;	228	struct cs_amp_lib_test_priv *priv = test->priv;
203		229
@@ -218,11 +244,65 @@ static efi_status_t cs_amp_lib_test_get_efi_variable(efi_char16_t *name, · 14 unmodified lines
218		244
219	memcpy(buf, priv->cal_blob, priv->cal_blob->size);	245	memcpy(buf, priv->cal_blob, priv->cal_blob->size);
220		246
		247	if (returned_attr) {
		248	if (priv->efi_attr)
		249	*returned_attr = priv->efi_attr;
		250	else
		251	*returned_attr = EFI_VARIABLE_NON_VOLATILE \|
		252	EFI_VARIABLE_BOOTSERVICE_ACCESS \|
		253	EFI_VARIABLE_RUNTIME_ACCESS;
		254	}
		255
		256	return EFI_SUCCESS;
		257	}
		258
		259	#define CS_AMP_LIB_ZERO_FILLED_BLOB_SIZE \
		260	struct_size_t(struct cirrus_amp_efi_data, data, 8)
		261
		262	/* Redirected get_efi_variable to simulate reading a prealloced zero-filled blob */
		263	static efi_status_t cs_amp_lib_test_get_efi_variable_all_zeros(efi_char16_t *name,
		264	efi_guid_t *guid,
		265	u32 *returned_attr,
		266	unsigned long *size,
		267	void *buf)
		268	{
		269	static const efi_char16_t expected_name[] = CIRRUS_LOGIC_CALIBRATION_EFI_NAME;
		270	static const efi_guid_t expected_guid = CIRRUS_LOGIC_CALIBRATION_EFI_GUID;
		271	struct kunit *test = kunit_get_current_test();
		272	struct cs_amp_lib_test_priv *priv = test->priv;
		273
		274	KUNIT_EXPECT_NOT_ERR_OR_NULL(test, name);
		275	KUNIT_EXPECT_NOT_ERR_OR_NULL(test, guid);
		276
		277	if (memcmp(name, expected_name, sizeof(expected_name)) \|\|
		278	efi_guidcmp(*guid, expected_guid))
		279	return -EFI_NOT_FOUND;
		280
		281	if (!buf) {
		282	*size = CS_AMP_LIB_ZERO_FILLED_BLOB_SIZE;
		283	return EFI_BUFFER_TOO_SMALL;
		284	}
		285
		286	KUNIT_ASSERT_EQ(test, *size, struct_size(priv->cal_blob, data, 8));
		287	priv->cal_blob = kunit_kzalloc(test, CS_AMP_LIB_ZERO_FILLED_BLOB_SIZE, GFP_KERNEL);
		288	KUNIT_ASSERT_NOT_NULL(test, priv->cal_blob);
		289	memset(buf, 0, CS_AMP_LIB_ZERO_FILLED_BLOB_SIZE);
		290
		291	if (returned_attr) {
		292	if (priv->efi_attr)
		293	*returned_attr = priv->efi_attr;
		294	else
		295	*returned_attr = EFI_VARIABLE_NON_VOLATILE \|
		296	EFI_VARIABLE_BOOTSERVICE_ACCESS \|
		297	EFI_VARIABLE_RUNTIME_ACCESS;
		298	}
		299
221	return EFI_SUCCESS;	300	return EFI_SUCCESS;
222	}	301	}
223		302
224	static efi_status_t cs_amp_lib_test_get_hp_cal_efi_variable(efi_char16_t *name,	303	static efi_status_t cs_amp_lib_test_get_hp_cal_efi_variable(efi_char16_t *name,
225	efi_guid_t *guid,	304	efi_guid_t *guid,
		305	u32 *returned_attr,
226	unsigned long *size,	306	unsigned long *size,
227	void *buf)	307	void *buf)
228	{	308	{
@@ -249,6 +329,12 @@ static efi_status_t cs_amp_lib_test_get_hp_cal_efi_variable(efi_char16_t *name, · 20 unmodified lines
249		329
250	memcpy(buf, priv->cal_blob, priv->cal_blob->size);	330	memcpy(buf, priv->cal_blob, priv->cal_blob->size);
251		331
		332	if (returned_attr) {
		333	*returned_attr = EFI_VARIABLE_NON_VOLATILE \|
		334	EFI_VARIABLE_BOOTSERVICE_ACCESS \|
		335	EFI_VARIABLE_RUNTIME_ACCESS;
		336	}
		337
252	return EFI_SUCCESS;	338	return EFI_SUCCESS;
253	}	339	}
254		340
@@ -291,8 +377,6 @@ static void cs_amp_lib_test_get_efi_cal_by_uid_test(struct kunit *test) · 36 unmodified lines
291	ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, target_uid, -1, &result_data);	377	ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, target_uid, -1, &result_data);
292	KUNIT_EXPECT_EQ(test, ret, 0);	378	KUNIT_EXPECT_EQ(test, ret, 0);
293		379
294	kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable);
295
296	KUNIT_EXPECT_EQ(test, result_data.calTarget[0], target_uid & 0xFFFFFFFFULL);	380	KUNIT_EXPECT_EQ(test, result_data.calTarget[0], target_uid & 0xFFFFFFFFULL);
297	KUNIT_EXPECT_EQ(test, result_data.calTarget[1], target_uid >> 32);	381	KUNIT_EXPECT_EQ(test, result_data.calTarget[1], target_uid >> 32);
298	KUNIT_EXPECT_EQ(test, result_data.calTime[0],	382	KUNIT_EXPECT_EQ(test, result_data.calTime[0],
@@ -326,8 +410,6 @@ static void cs_amp_lib_test_get_efi_cal_by_index_unchecked_test(struct kunit *te · 27 unmodified lines
326	param->amp_index, &result_data);	410	param->amp_index, &result_data);
327	KUNIT_EXPECT_EQ(test, ret, 0);	411	KUNIT_EXPECT_EQ(test, ret, 0);
328		412
329	kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable);
330
331	KUNIT_EXPECT_EQ(test, result_data.calTime[0],	413	KUNIT_EXPECT_EQ(test, result_data.calTime[0],
332	priv->cal_blob->data[param->amp_index].calTime[0]);	414	priv->cal_blob->data[param->amp_index].calTime[0]);
333	KUNIT_EXPECT_EQ(test, result_data.calTime[1],	415	KUNIT_EXPECT_EQ(test, result_data.calTime[1],
@@ -361,8 +443,6 @@ static void cs_amp_lib_test_get_efi_cal_by_index_checked_test(struct kunit *test · 27 unmodified lines
361	param->amp_index, &result_data);	443	param->amp_index, &result_data);
362	KUNIT_EXPECT_EQ(test, ret, 0);	444	KUNIT_EXPECT_EQ(test, ret, 0);
363		445
364	kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable);
365
366	KUNIT_EXPECT_EQ(test, result_data.calTime[0],	446	KUNIT_EXPECT_EQ(test, result_data.calTime[0],
367	priv->cal_blob->data[param->amp_index].calTime[0]);	447	priv->cal_blob->data[param->amp_index].calTime[0]);
368	KUNIT_EXPECT_EQ(test, result_data.calTime[1],	448	KUNIT_EXPECT_EQ(test, result_data.calTime[1],
@@ -399,8 +479,6 @@ static void cs_amp_lib_test_get_efi_cal_by_index_uid_mismatch_test(struct kunit · 30 unmodified lines
399	ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, target_uid,	479	ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, target_uid,
400	param->amp_index, &result_data);	480	param->amp_index, &result_data);
401	KUNIT_EXPECT_EQ(test, ret, -ENOENT);	481	KUNIT_EXPECT_EQ(test, ret, -ENOENT);
402
403	kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable);
404	}	482	}
405		483
406	/*	484	/*
@@ -432,8 +510,6 @@ static void cs_amp_lib_test_get_efi_cal_by_index_fallback_test(struct kunit *tes · 25 unmodified lines
432	param->amp_index, &result_data);	510	param->amp_index, &result_data);
433	KUNIT_EXPECT_EQ(test, ret, 0);	511	KUNIT_EXPECT_EQ(test, ret, 0);
434		512
435	kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable);
436
437	KUNIT_EXPECT_EQ(test, result_data.calTime[0],	513	KUNIT_EXPECT_EQ(test, result_data.calTime[0],
438	priv->cal_blob->data[param->amp_index].calTime[0]);	514	priv->cal_blob->data[param->amp_index].calTime[0]);
439	KUNIT_EXPECT_EQ(test, result_data.calTime[1],	515	KUNIT_EXPECT_EQ(test, result_data.calTime[1],
@@ -473,8 +549,6 @@ static void cs_amp_lib_test_get_efi_cal_uid_not_found_noindex_test(struct kunit · 33 unmodified lines
473	ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, bad_target_uid, -1,	549	ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, bad_target_uid, -1,
474	&result_data);	550	&result_data);
475	KUNIT_EXPECT_EQ(test, ret, -ENOENT);	551	KUNIT_EXPECT_EQ(test, ret, -ENOENT);
476
477	kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable);
478	}	552	}
479		553
480	/*	554	/*
@@ -504,8 +578,6 @@ static void cs_amp_lib_test_get_efi_cal_uid_not_found_index_not_found_test(struc · 23 unmodified lines
504	ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, bad_target_uid, 99,	578	ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, bad_target_uid, 99,
505	&result_data);	579	&result_data);
506	KUNIT_EXPECT_EQ(test, ret, -ENOENT);	580	KUNIT_EXPECT_EQ(test, ret, -ENOENT);
507
508	kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable);
509	}	581	}
510		582
511	/*	583	/*
@@ -527,8 +599,6 @@ static void cs_amp_lib_test_get_efi_cal_no_uid_index_not_found_test(struct kunit · 15 unmodified lines
527		599
528	ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, 0, 99, &result_data);	600	ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, 0, 99, &result_data);
529	KUNIT_EXPECT_EQ(test, ret, -ENOENT);	601	KUNIT_EXPECT_EQ(test, ret, -ENOENT);
530
531	kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable);
532	}	602	}
533		603
534	/* If neither the target UID or the index is given the result should be -ENOENT. */	604	/* If neither the target UID or the index is given the result should be -ENOENT. */
@@ -547,8 +617,6 @@ static void cs_amp_lib_test_get_efi_cal_no_uid_no_index_test(struct kunit *test) · 12 unmodified lines
547		617
548	ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, 0, -1, &result_data);	618	ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, 0, -1, &result_data);
549	KUNIT_EXPECT_EQ(test, ret, -ENOENT);	619	KUNIT_EXPECT_EQ(test, ret, -ENOENT);
550
551	kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable);
552	}	620	}
553		621
554	/*	622	/*
@@ -576,8 +644,6 @@ static void cs_amp_lib_test_get_efi_cal_zero_not_matched_test(struct kunit *test · 21 unmodified lines
576		644
577	ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, 0, -1, &result_data);	645	ret = cs_amp_get_efi_calibration_data(&priv->amp_dev->dev, 0, -1, &result_data);
578	KUNIT_EXPECT_EQ(test, ret, -ENOENT);	646	KUNIT_EXPECT_EQ(test, ret, -ENOENT);
579
580	kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable);
581	}	647	}
582		648
583	/*	649	/*
@@ -619,8 +685,6 @@ static void cs_amp_lib_test_get_efi_cal_empty_entry_test(struct kunit *test) · 35 unmodified lines
619	0, 2,	685	0, 2,
620	&result_data),	686	&result_data),
621	-ENOENT);	687	-ENOENT);
622
623	kunit_deactivate_static_stub(test, cs_amp_test_hooks->get_efi_variable);
624	}	688	}
625		689
626	static const struct cirrus_amp_cal_controls cs_amp_lib_test_calibration_controls = {	690	static const struct cirrus_amp_cal_controls cs_amp_lib_test_calibration_controls = {
@@ -676,9 +740,6 @@ static void cs_amp_lib_test_write_cal_data_test(struct kunit *test) · 49 unmodified lines
676		740
677	ret = cs_amp_write_cal_coeffs(dsp, &cs_amp_lib_test_calibration_controls, &data);	741	ret = cs_amp_write_cal_coeffs(dsp, &cs_amp_lib_test_calibration_controls, &data);
678	KUNIT_EXPECT_EQ(test, ret, 0);	742	KUNIT_EXPECT_EQ(test, ret, 0);
679
680	kunit_deactivate_static_stub(test, cs_amp_test_hooks->write_cal_coeff);
681
682	KUNIT_EXPECT_EQ(test, list_count_nodes(&priv->ctl_write_list), 4);	743	KUNIT_EXPECT_EQ(test, list_count_nodes(&priv->ctl_write_list), 4);
683		744
684	/* Checksum control must be written last */	745	/* Checksum control must be written last */
@@ -702,6 +763,1363 @@ static void cs_amp_lib_test_write_cal_data_test(struct kunit *test) · 17 unmodified lines
702	KUNIT_EXPECT_EQ(test, entry->value, data.calStatus);	763	KUNIT_EXPECT_EQ(test, entry->value, data.calStatus);
703	}	764	}
704		765
		766	static int cs_amp_lib_test_read_cal_coeff(struct cs_dsp *dsp,
		767	const struct cirrus_amp_cal_controls *controls,
		768	const char ctl_name, u32 val)
		769	{
		770	struct kunit *test = kunit_get_current_test();
		771
		772	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctl_name);
		773	KUNIT_EXPECT_PTR_EQ(test, controls, &cs_amp_lib_test_calibration_controls);
		774
		775	if (strcmp(ctl_name, controls->ambient) == 0)
		776	*val = 19;
		777	else if (strcmp(ctl_name, controls->calr) == 0)
		778	*val = 1077;
		779	else if (strcmp(ctl_name, controls->status) == 0)
		780	*val = 2;
		781	else
		782	kunit_fail_current_test("Bad control '%s'\n", ctl_name);
		783
		784	return 0;
		785	}
		786
		787	static void cs_amp_lib_test_read_cal_data_test(struct kunit *test)
		788	{
		789	struct cs_amp_lib_test_priv *priv = test->priv;
		790	struct cirrus_amp_cal_data data = { 0 };
		791	struct cs_dsp *dsp;
		792	int ret;
		793
		794	dsp = kunit_kzalloc(test, sizeof(*dsp), GFP_KERNEL);
		795	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dsp);
		796	dsp->dev = &priv->amp_dev->dev;
		797
		798	kunit_activate_static_stub(test,
		799	cs_amp_test_hooks->read_cal_coeff,
		800	cs_amp_lib_test_read_cal_coeff);
		801
		802	ret = cs_amp_read_cal_coeffs(dsp, &cs_amp_lib_test_calibration_controls, &data);
		803	KUNIT_EXPECT_EQ(test, ret, 0);
		804
		805	KUNIT_EXPECT_EQ(test, 19, data.calAmbient);
		806	KUNIT_EXPECT_EQ(test, 1077, data.calR);
		807	KUNIT_EXPECT_EQ(test, 2, data.calStatus);
		808	KUNIT_EXPECT_NE(test, 0, data.calTime[0] \| data.calTime[1]);
		809	}
		810
		811	static void cs_amp_lib_test_write_ambient_test(struct kunit *test)
		812	{
		813	struct cs_amp_lib_test_priv *priv = test->priv;
		814	struct cs_amp_lib_test_ctl_write_entry *entry;
		815	struct cs_dsp *dsp;
		816	int ret;
		817
		818	dsp = kunit_kzalloc(test, sizeof(*dsp), GFP_KERNEL);
		819	KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dsp);
		820	dsp->dev = &priv->amp_dev->dev;
		821
		822	/* Redirect calls to write firmware controls */
		823	kunit_activate_static_stub(test,
		824	cs_amp_test_hooks->write_cal_coeff,
		825	cs_amp_lib_test_write_cal_coeff);
		826
		827	ret = cs_amp_write_ambient_temp(dsp, &cs_amp_lib_test_calibration_controls, 18);
		828	KUNIT_EXPECT_EQ(test, ret, 0);
		829
		830	KUNIT_EXPECT_EQ(test, list_count_nodes(&priv->ctl_write_list), 1);
		831
		832	entry = list_first_entry(&priv->ctl_write_list, typeof(*entry), list);
		833	KUNIT_EXPECT_STREQ(test, entry->name, cs_amp_lib_test_calibration_controls.ambient);
		834	KUNIT_EXPECT_EQ(test, entry->value, 18);
		835	}
		836
		837	static efi_status_t cs_amp_lib_test_set_efi_variable(efi_char16_t *name,
		838	efi_guid_t *guid,
		839	u32 attr,
		840	unsigned long size,
		841	void *buf)
		842	{
		843	static const efi_char16_t expected_name[] = CIRRUS_LOGIC_CALIBRATION_EFI_NAME;
		844	static const efi_guid_t expected_guid = CIRRUS_LOGIC_CALIBRATION_EFI_GUID;
		845	struct kunit *test = kunit_get_current_test();
		846	struct cs_amp_lib_test_priv *priv = test->priv;
		847
		848	KUNIT_ASSERT_NOT_NULL(test, name);
		849	KUNIT_ASSERT_NOT_NULL(test, guid);
		850
		851	if (memcmp(name, expected_name, sizeof(expected_name)) \|\|
		852	efi_guidcmp(*guid, expected_guid))
		853	return -EFI_NOT_FOUND;
		854
		855	KUNIT_ASSERT_NOT_NULL(test, buf);
		856	KUNIT_ASSERT_NE(test, 0, size);
		857
		858	kunit_kfree(test, priv->cal_blob);
		859	priv->cal_blob = kunit_kmalloc(test, size, GFP_KERNEL);
		860	KUNIT_ASSERT_NOT_NULL(test, priv->cal_blob);
		861	memcpy(priv->cal_blob, buf, size);
		862	priv->efi_attr = attr;
		863
		864	return EFI_SUCCESS;
		865	}
		866
		867	static efi_status_t cs_amp_lib_test_set_efi_variable_denied(efi_char16_t *name,
		868	efi_guid_t *guid,
		869	u32 attr,
		870	unsigned long size,
		871	void *buf)
		872	{
		873	return EFI_WRITE_PROTECTED;
		874	}
		875
		876	#define CS_AMP_CAL_DEFAULT_EFI_ATTR \
		877	(EFI_VARIABLE_NON_VOLATILE \| \
		878	EFI_VARIABLE_BOOTSERVICE_ACCESS \| \
		879	EFI_VARIABLE_RUNTIME_ACCESS)
		880
		881	static void cs_amp_lib_test_create_new_cal_efi(struct kunit *test)
		882	{
		883	struct cs_amp_lib_test_priv *priv = test->priv;
		884	struct device *dev = &priv->amp_dev->dev;
		885	struct cirrus_amp_cal_data data;
		886	int i;
		887
		888	kunit_activate_static_stub(test,
		889	cs_amp_test_hooks->get_efi_variable,
		890	cs_amp_lib_test_get_efi_variable_none);
		891	kunit_activate_static_stub(test,
		892	cs_amp_test_hooks->set_efi_variable,
		893	cs_amp_lib_test_set_efi_variable);
		894
		895	/* For unspecified number of amps */
		896	get_random_bytes(&data, sizeof(data));
		897	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, -1, -1, &data));
		898	KUNIT_EXPECT_EQ(test, CS_AMP_CAL_DEFAULT_EFI_ATTR, priv->efi_attr);
		899	KUNIT_EXPECT_GE(test, priv->cal_blob->count, 1);
		900	KUNIT_EXPECT_LE(test, priv->cal_blob->count, 8);
		901	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, priv->cal_blob->count),
		902	priv->cal_blob->size);
		903	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[0], sizeof(data));
		904	for (i = 1; i < priv->cal_blob->count; i++)
		905	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[i], sizeof(data)));
		906
		907	/* For 2 amps */
		908	priv->cal_blob = NULL;
		909	get_random_bytes(&data, sizeof(data));
		910	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, -1, 2, &data));
		911	KUNIT_EXPECT_EQ(test, CS_AMP_CAL_DEFAULT_EFI_ATTR, priv->efi_attr);
		912	KUNIT_EXPECT_EQ(test, 2, priv->cal_blob->count);
		913	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 2), priv->cal_blob->size);
		914	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[0], sizeof(data));
		915	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[1], sizeof(data)));
		916
		917	/* For 4 amps */
		918	priv->cal_blob = NULL;
		919	get_random_bytes(&data, sizeof(data));
		920	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, -1, 4, &data));
		921	KUNIT_EXPECT_EQ(test, 4, priv->cal_blob->count);
		922	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 4), priv->cal_blob->size);
		923	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[0], sizeof(data));
		924	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[1], sizeof(data)));
		925	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[2], sizeof(data)));
		926	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[3], sizeof(data)));
		927
		928	/* For 6 amps */
		929	priv->cal_blob = NULL;
		930	get_random_bytes(&data, sizeof(data));
		931	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, -1, 6, &data));
		932	KUNIT_EXPECT_EQ(test, 6, priv->cal_blob->count);
		933	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 6), priv->cal_blob->size);
		934	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[0], sizeof(data));
		935	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[1], sizeof(data)));
		936	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[2], sizeof(data)));
		937	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[3], sizeof(data)));
		938	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[4], sizeof(data)));
		939	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[5], sizeof(data)));
		940	}
		941
		942	static void cs_amp_lib_test_create_new_cal_efi_indexed(struct kunit *test)
		943	{
		944	struct cs_amp_lib_test_priv *priv = test->priv;
		945	struct device *dev = &priv->amp_dev->dev;
		946	struct cirrus_amp_cal_data data;
		947
		948	kunit_activate_static_stub(test,
		949	cs_amp_test_hooks->get_efi_variable,
		950	cs_amp_lib_test_get_efi_variable_none);
		951	kunit_activate_static_stub(test,
		952	cs_amp_test_hooks->set_efi_variable,
		953	cs_amp_lib_test_set_efi_variable);
		954
		955	/* In slot 0 */
		956	priv->cal_blob = NULL;
		957	get_random_bytes(&data, sizeof(data));
		958	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, 0, 6, &data));
		959	KUNIT_EXPECT_EQ(test, 6, priv->cal_blob->count);
		960	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 6), priv->cal_blob->size);
		961	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[0], sizeof(data));
		962	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[1], sizeof(data)));
		963	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[2], sizeof(data)));
		964	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[3], sizeof(data)));
		965	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[4], sizeof(data)));
		966	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[5], sizeof(data)));
		967
		968	/* In slot 1 */
		969	priv->cal_blob = NULL;
		970	get_random_bytes(&data, sizeof(data));
		971	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, 1, 6, &data));
		972	KUNIT_EXPECT_EQ(test, 6, priv->cal_blob->count);
		973	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 6), priv->cal_blob->size);
		974	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[1], sizeof(data));
		975	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[0], sizeof(data)));
		976	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[2], sizeof(data)));
		977	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[3], sizeof(data)));
		978	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[4], sizeof(data)));
		979	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[5], sizeof(data)));
		980
		981	/* In slot 5 */
		982	priv->cal_blob = NULL;
		983	get_random_bytes(&data, sizeof(data));
		984	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, 5, 6, &data));
		985	KUNIT_EXPECT_EQ(test, 6, priv->cal_blob->count);
		986	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 6), priv->cal_blob->size);
		987	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[5], sizeof(data));
		988	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[0], sizeof(data)));
		989	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[1], sizeof(data)));
		990	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[2], sizeof(data)));
		991	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[3], sizeof(data)));
		992	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[4], sizeof(data)));
		993	}
		994
		995	static void cs_amp_lib_test_create_new_cal_efi_indexed_no_max(struct kunit *test)
		996	{
		997	struct cs_amp_lib_test_priv *priv = test->priv;
		998	struct device *dev = &priv->amp_dev->dev;
		999	struct cirrus_amp_cal_data data;
		1000	int i;
		1001
		1002	kunit_activate_static_stub(test,
		1003	cs_amp_test_hooks->get_efi_variable,
		1004	cs_amp_lib_test_get_efi_variable_none);
		1005	kunit_activate_static_stub(test,
		1006	cs_amp_test_hooks->set_efi_variable,
		1007	cs_amp_lib_test_set_efi_variable);
		1008
		1009	/* In slot 0 with unspecified number of amps */
		1010	priv->cal_blob = NULL;
		1011	get_random_bytes(&data, sizeof(data));
		1012	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, 0, -1, &data));
		1013	KUNIT_EXPECT_GE(test, priv->cal_blob->count, 1);
		1014	KUNIT_EXPECT_LE(test, priv->cal_blob->count, 8);
		1015	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, priv->cal_blob->count),
		1016	priv->cal_blob->size);
		1017	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[0], sizeof(data));
		1018	for (i = 1; i < priv->cal_blob->count; i++)
		1019	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[i], sizeof(data)));
		1020
		1021	/* In slot 1 with unspecified number of amps */
		1022	priv->cal_blob = NULL;
		1023	get_random_bytes(&data, sizeof(data));
		1024	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, 1, -1, &data));
		1025	KUNIT_EXPECT_GE(test, priv->cal_blob->count, 2);
		1026	KUNIT_EXPECT_LE(test, priv->cal_blob->count, 8);
		1027	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, priv->cal_blob->count),
		1028	priv->cal_blob->size);
		1029	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[1], sizeof(data));
		1030	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[0], sizeof(data)));
		1031	for (i = 2; i < priv->cal_blob->count; i++)
		1032	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[i], sizeof(data)));
		1033
		1034	/* In slot 5 with unspecified number of amps */
		1035	priv->cal_blob = NULL;
		1036	get_random_bytes(&data, sizeof(data));
		1037	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, 5, -1, &data));
		1038	KUNIT_EXPECT_GE(test, priv->cal_blob->count, 6);
		1039	KUNIT_EXPECT_LE(test, priv->cal_blob->count, 8);
		1040	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, priv->cal_blob->count),
		1041	priv->cal_blob->size);
		1042	for (i = 0; (i < 5) && (i < priv->cal_blob->count); i++)
		1043	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[i], sizeof(data)));
		1044
		1045	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[5], sizeof(data));
		1046	for (i = 6; i < priv->cal_blob->count; i++)
		1047	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[i], sizeof(data)));
		1048	}
		1049
		1050	static void cs_amp_lib_test_grow_append_cal_efi(struct kunit *test)
		1051	{
		1052	struct cs_amp_lib_test_priv *priv = test->priv;
		1053	struct device *dev = &priv->amp_dev->dev;
		1054	const struct cirrus_amp_efi_data *original_blob;
		1055	struct cirrus_amp_cal_data data;
		1056
		1057	kunit_activate_static_stub(test,
		1058	cs_amp_test_hooks->get_efi_variable,
		1059	cs_amp_lib_test_get_efi_variable);
		1060	kunit_activate_static_stub(test,
		1061	cs_amp_test_hooks->set_efi_variable,
		1062	cs_amp_lib_test_set_efi_variable);
		1063
		1064	/* Initially 1 used entry grown to 2 entries */
		1065	cs_amp_lib_test_init_dummy_cal_blob(test, 1);
		1066	KUNIT_ASSERT_EQ(test, 1, priv->cal_blob->count);
		1067	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1068	get_random_bytes(&data, sizeof(data));
		1069	data.calTarget[0] = 0xaaaaaaaa; /* won't match */
		1070	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, -1, 2, &data));
		1071	KUNIT_EXPECT_EQ(test, CS_AMP_CAL_DEFAULT_EFI_ATTR, priv->efi_attr);
		1072	KUNIT_EXPECT_EQ(test, 2, priv->cal_blob->count);
		1073	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 2), priv->cal_blob->size);
		1074	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[0], &priv->cal_blob->data[0], sizeof(data));
		1075	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[1], sizeof(data));
		1076
		1077	/* Initially 1 entry grown to 4 entries */
		1078	priv->cal_blob = NULL;
		1079	cs_amp_lib_test_init_dummy_cal_blob(test, 1);
		1080	KUNIT_ASSERT_EQ(test, 1, priv->cal_blob->count);
		1081	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1082	get_random_bytes(&data, sizeof(data));
		1083	data.calTarget[0] = 0xaaaaaaaa; /* won't match */
		1084	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, -1, 4, &data));
		1085	KUNIT_EXPECT_EQ(test, 4, priv->cal_blob->count);
		1086	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 4), priv->cal_blob->size);
		1087	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[0], &priv->cal_blob->data[0], sizeof(data));
		1088	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[1], sizeof(data));
		1089	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[2], sizeof(data)));
		1090	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[3], sizeof(data)));
		1091
		1092	/* Initially 2 entries grown to 4 entries */
		1093	priv->cal_blob = NULL;
		1094	cs_amp_lib_test_init_dummy_cal_blob(test, 2);
		1095	KUNIT_ASSERT_EQ(test, 2, priv->cal_blob->count);
		1096	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1097	get_random_bytes(&data, sizeof(data));
		1098	data.calTarget[0] = 0xaaaaaaaa; /* won't match */
		1099	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, -1, 4, &data));
		1100	KUNIT_EXPECT_EQ(test, 4, priv->cal_blob->count);
		1101	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 4), priv->cal_blob->size);
		1102	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[0], &priv->cal_blob->data[0], sizeof(data));
		1103	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[1], &priv->cal_blob->data[1], sizeof(data));
		1104	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[2], sizeof(data));
		1105	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[3], sizeof(data)));
		1106
		1107	/* Initially 1 entry grown to 6 entries */
		1108	priv->cal_blob = NULL;
		1109	cs_amp_lib_test_init_dummy_cal_blob(test, 1);
		1110	KUNIT_ASSERT_EQ(test, 1, priv->cal_blob->count);
		1111	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1112	get_random_bytes(&data, sizeof(data));
		1113	data.calTarget[0] = 0xaaaaaaaa; /* won't match */
		1114	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, -1, 6, &data));
		1115	KUNIT_EXPECT_EQ(test, 6, priv->cal_blob->count);
		1116	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 6), priv->cal_blob->size);
		1117	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[0], &priv->cal_blob->data[0], sizeof(data));
		1118	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[1], sizeof(data));
		1119	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[2], sizeof(data)));
		1120	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[3], sizeof(data)));
		1121	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[4], sizeof(data)));
		1122	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[5], sizeof(data)));
		1123
		1124	/* Initially 4 entries grown to 6 entries */
		1125	priv->cal_blob = NULL;
		1126	cs_amp_lib_test_init_dummy_cal_blob(test, 4);
		1127	KUNIT_ASSERT_EQ(test, 4, priv->cal_blob->count);
		1128	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1129	get_random_bytes(&data, sizeof(data));
		1130	data.calTarget[0] = 0xaaaaaaaa; /* won't match */
		1131	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, -1, 6, &data));
		1132	KUNIT_EXPECT_EQ(test, 6, priv->cal_blob->count);
		1133	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 6), priv->cal_blob->size);
		1134	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[0], &priv->cal_blob->data[0], sizeof(data));
		1135	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[1], &priv->cal_blob->data[1], sizeof(data));
		1136	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[2], &priv->cal_blob->data[2], sizeof(data));
		1137	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[3], &priv->cal_blob->data[3], sizeof(data));
		1138	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[4], sizeof(data));
		1139	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[5], sizeof(data)));
		1140	}
		1141
		1142	static void cs_amp_lib_test_grow_append_cal_efi_indexed(struct kunit *test)
		1143	{
		1144	struct cs_amp_lib_test_priv *priv = test->priv;
		1145	struct device *dev = &priv->amp_dev->dev;
		1146	const struct cirrus_amp_efi_data *original_blob;
		1147	struct cirrus_amp_cal_data data;
		1148
		1149	kunit_activate_static_stub(test,
		1150	cs_amp_test_hooks->get_efi_variable,
		1151	cs_amp_lib_test_get_efi_variable);
		1152	kunit_activate_static_stub(test,
		1153	cs_amp_test_hooks->set_efi_variable,
		1154	cs_amp_lib_test_set_efi_variable);
		1155
		1156	/* Initially 1 entry grown to 2 entries using slot 1 */
		1157	priv->cal_blob = NULL;
		1158	cs_amp_lib_test_init_dummy_cal_blob(test, 1);
		1159	KUNIT_ASSERT_EQ(test, 1, priv->cal_blob->count);
		1160	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1161	get_random_bytes(&data, sizeof(data));
		1162	data.calTarget[0] = 0xaaaaaaaa; /* won't match */
		1163	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, 1, 2, &data));
		1164	KUNIT_EXPECT_EQ(test, 2, priv->cal_blob->count);
		1165	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 2), priv->cal_blob->size);
		1166	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[0], &priv->cal_blob->data[0], sizeof(data));
		1167	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[1], sizeof(data));
		1168
		1169	/* Initially 1 entry grown to 6 entries using slot 1 */
		1170	priv->cal_blob = NULL;
		1171	cs_amp_lib_test_init_dummy_cal_blob(test, 1);
		1172	KUNIT_ASSERT_EQ(test, 1, priv->cal_blob->count);
		1173	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1174	get_random_bytes(&data, sizeof(data));
		1175	data.calTarget[0] = 0xaaaaaaaa; /* won't match */
		1176	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, 1, 6, &data));
		1177	KUNIT_EXPECT_EQ(test, 6, priv->cal_blob->count);
		1178	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 6), priv->cal_blob->size);
		1179	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[0], &priv->cal_blob->data[0], sizeof(data));
		1180	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[1], sizeof(data));
		1181	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[2], sizeof(data)));
		1182	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[3], sizeof(data)));
		1183	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[4], sizeof(data)));
		1184	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[5], sizeof(data)));
		1185
		1186	/* Initially 2 entries grown to 6 entries using slot 2 */
		1187	priv->cal_blob = NULL;
		1188	cs_amp_lib_test_init_dummy_cal_blob(test, 2);
		1189	KUNIT_ASSERT_EQ(test, 2, priv->cal_blob->count);
		1190	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1191	get_random_bytes(&data, sizeof(data));
		1192	data.calTarget[0] = 0xaaaaaaaa; /* won't match */
		1193	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, 2, 6, &data));
		1194	KUNIT_EXPECT_EQ(test, 6, priv->cal_blob->count);
		1195	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 6), priv->cal_blob->size);
		1196	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[0], &priv->cal_blob->data[0], sizeof(data));
		1197	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[1], &priv->cal_blob->data[1], sizeof(data));
		1198	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[2], sizeof(data));
		1199	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[3], sizeof(data)));
		1200	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[4], sizeof(data)));
		1201	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[5], sizeof(data)));
		1202
		1203	/* Initially 2 entries grown to 6 entries using slot 4 */
		1204	kunit_kfree(test, original_blob);
		1205	kunit_kfree(test, priv->cal_blob);
		1206	priv->cal_blob = NULL;
		1207	cs_amp_lib_test_init_dummy_cal_blob(test, 2);
		1208	KUNIT_ASSERT_EQ(test, 2, priv->cal_blob->count);
		1209	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1210	get_random_bytes(&data, sizeof(data));
		1211	data.calTarget[0] = 0xaaaaaaaa; /* won't match */
		1212	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, 4, 6, &data));
		1213	KUNIT_EXPECT_EQ(test, 6, priv->cal_blob->count);
		1214	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 6), priv->cal_blob->size);
		1215	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[0], &priv->cal_blob->data[0], sizeof(data));
		1216	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[1], &priv->cal_blob->data[1], sizeof(data));
		1217	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[2], sizeof(data)));
		1218	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[3], sizeof(data)));
		1219	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[4], sizeof(data));
		1220	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[5], sizeof(data)));
		1221	}
		1222
		1223	static void cs_amp_lib_test_cal_efi_all_zeros_add_first(struct kunit *test)
		1224	{
		1225	struct cs_amp_lib_test_priv *priv = test->priv;
		1226	struct device *dev = &priv->amp_dev->dev;
		1227	struct cirrus_amp_cal_data data;
		1228	int i;
		1229
		1230	/* Simulate a BIOS reserving EFI space that is entirely zero-filled. */
		1231	kunit_activate_static_stub(test,
		1232	cs_amp_test_hooks->get_efi_variable,
		1233	cs_amp_lib_test_get_efi_variable_all_zeros);
		1234	kunit_activate_static_stub(test,
		1235	cs_amp_test_hooks->set_efi_variable,
		1236	cs_amp_lib_test_set_efi_variable);
		1237
		1238	/*
		1239	* Add an entry. The header should be filled in to match the
		1240	* original EFI variable size.
		1241	*/
		1242	get_random_bytes(&data, sizeof(data));
		1243	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, -1, -1, &data));
		1244	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 8), priv->cal_blob->size);
		1245	KUNIT_EXPECT_EQ(test, 8, priv->cal_blob->count);
		1246	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[0], sizeof(data));
		1247	for (i = 1; i < priv->cal_blob->count; i++) {
		1248	KUNIT_EXPECT_EQ(test, 0, priv->cal_blob->data[i].calTime[0]);
		1249	KUNIT_EXPECT_EQ(test, 0, priv->cal_blob->data[i].calTime[1]);
		1250	}
		1251	}
		1252
		1253	static void cs_amp_lib_test_cal_efi_all_zeros_add_first_no_shrink(struct kunit *test)
		1254	{
		1255	struct cs_amp_lib_test_priv *priv = test->priv;
		1256	struct device *dev = &priv->amp_dev->dev;
		1257	struct cirrus_amp_cal_data data;
		1258	int i;
		1259
		1260	/* Simulate a BIOS reserving EFI space that is entirely zero-filled. */
		1261	kunit_activate_static_stub(test,
		1262	cs_amp_test_hooks->get_efi_variable,
		1263	cs_amp_lib_test_get_efi_variable_all_zeros);
		1264	kunit_activate_static_stub(test,
		1265	cs_amp_test_hooks->set_efi_variable,
		1266	cs_amp_lib_test_set_efi_variable);
		1267
		1268	/*
		1269	* Add an entry. The header should be filled in to match the
		1270	* original EFI variable size. A number of amps less than the
		1271	* available preallocated space does not shrink the EFI variable.
		1272	*/
		1273	get_random_bytes(&data, sizeof(data));
		1274	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, -1, 4, &data));
		1275	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 8), priv->cal_blob->size);
		1276	KUNIT_EXPECT_EQ(test, 8, priv->cal_blob->count);
		1277	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[0], sizeof(data));
		1278	for (i = 1; i < priv->cal_blob->count; i++) {
		1279	KUNIT_EXPECT_EQ(test, 0, priv->cal_blob->data[i].calTime[0]);
		1280	KUNIT_EXPECT_EQ(test, 0, priv->cal_blob->data[i].calTime[1]);
		1281	}
		1282	}
		1283
		1284	static void cs_amp_lib_test_cal_efi_all_zeros_add_first_indexed(struct kunit *test)
		1285	{
		1286	struct cs_amp_lib_test_priv *priv = test->priv;
		1287	struct device *dev = &priv->amp_dev->dev;
		1288	struct cirrus_amp_cal_data data;
		1289	int i;
		1290
		1291	/* Simulate a BIOS reserving EFI space that is entirely zero-filled. */
		1292	kunit_activate_static_stub(test,
		1293	cs_amp_test_hooks->get_efi_variable,
		1294	cs_amp_lib_test_get_efi_variable_all_zeros);
		1295	kunit_activate_static_stub(test,
		1296	cs_amp_test_hooks->set_efi_variable,
		1297	cs_amp_lib_test_set_efi_variable);
		1298
		1299	/*
		1300	* Write entry to slot 2. The header should be filled in to match
		1301	* the original EFI variable size.
		1302	*/
		1303	get_random_bytes(&data, sizeof(data));
		1304	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, 2, -1, &data));
		1305	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 8), priv->cal_blob->size);
		1306	KUNIT_EXPECT_EQ(test, 8, priv->cal_blob->count);
		1307	KUNIT_EXPECT_EQ(test, 0, priv->cal_blob->data[0].calTime[0]);
		1308	KUNIT_EXPECT_EQ(test, 0, priv->cal_blob->data[0].calTime[1]);
		1309	KUNIT_EXPECT_EQ(test, 0, priv->cal_blob->data[1].calTime[0]);
		1310	KUNIT_EXPECT_EQ(test, 0, priv->cal_blob->data[1].calTime[1]);
		1311	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[2], sizeof(data));
		1312	for (i = 3; i < priv->cal_blob->count; i++) {
		1313	KUNIT_EXPECT_EQ(test, 0, priv->cal_blob->data[i].calTime[0]);
		1314	KUNIT_EXPECT_EQ(test, 0, priv->cal_blob->data[i].calTime[1]);
		1315	}
		1316	}
		1317
		1318	static void cs_amp_lib_test_cal_efi_all_zeros_add_first_indexed_no_shrink(struct kunit *test)
		1319	{
		1320	struct cs_amp_lib_test_priv *priv = test->priv;
		1321	struct device *dev = &priv->amp_dev->dev;
		1322	struct cirrus_amp_cal_data data;
		1323	int i;
		1324
		1325	/* Simulate a BIOS reserving EFI space that is entirely zero-filled. */
		1326	kunit_activate_static_stub(test,
		1327	cs_amp_test_hooks->get_efi_variable,
		1328	cs_amp_lib_test_get_efi_variable_all_zeros);
		1329	kunit_activate_static_stub(test,
		1330	cs_amp_test_hooks->set_efi_variable,
		1331	cs_amp_lib_test_set_efi_variable);
		1332
		1333	/*
		1334	* Write entry to slot 2. The header should be filled in to match
		1335	* the original EFI variable size. A number of amps less than the
		1336	* available preallocated space does not shrink the EFI variable.
		1337	*/
		1338	get_random_bytes(&data, sizeof(data));
		1339	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, 2, 4, &data));
		1340	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 8), priv->cal_blob->size);
		1341	KUNIT_EXPECT_EQ(test, 8, priv->cal_blob->count);
		1342	KUNIT_EXPECT_EQ(test, 0, priv->cal_blob->data[0].calTime[0]);
		1343	KUNIT_EXPECT_EQ(test, 0, priv->cal_blob->data[0].calTime[1]);
		1344	KUNIT_EXPECT_EQ(test, 0, priv->cal_blob->data[1].calTime[0]);
		1345	KUNIT_EXPECT_EQ(test, 0, priv->cal_blob->data[1].calTime[1]);
		1346	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[2], sizeof(data));
		1347	for (i = 3; i < priv->cal_blob->count; i++) {
		1348	KUNIT_EXPECT_EQ(test, 0, priv->cal_blob->data[i].calTime[0]);
		1349	KUNIT_EXPECT_EQ(test, 0, priv->cal_blob->data[i].calTime[1]);
		1350	}
		1351	}
		1352
		1353	static void cs_amp_lib_test_grow_append_cal_efi_indexed_no_max(struct kunit *test)
		1354	{
		1355	struct cs_amp_lib_test_priv *priv = test->priv;
		1356	struct device *dev = &priv->amp_dev->dev;
		1357	const struct cirrus_amp_efi_data *original_blob;
		1358	struct cirrus_amp_cal_data data;
		1359	int i;
		1360
		1361	kunit_activate_static_stub(test,
		1362	cs_amp_test_hooks->get_efi_variable,
		1363	cs_amp_lib_test_get_efi_variable);
		1364	kunit_activate_static_stub(test,
		1365	cs_amp_test_hooks->set_efi_variable,
		1366	cs_amp_lib_test_set_efi_variable);
		1367
		1368	/* Initially 1 entry adding slot 1 */
		1369	cs_amp_lib_test_init_dummy_cal_blob(test, 1);
		1370	KUNIT_ASSERT_EQ(test, 1, priv->cal_blob->count);
		1371	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1372	get_random_bytes(&data, sizeof(data));
		1373	data.calTarget[0] = 0xaaaaaaaa; /* won't match */
		1374	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, 1, -1, &data));
		1375	KUNIT_EXPECT_GE(test, priv->cal_blob->count, 2);
		1376	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, priv->cal_blob->count),
		1377	priv->cal_blob->size);
		1378	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[0], &priv->cal_blob->data[0], sizeof(data));
		1379	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[1], sizeof(data));
		1380	for (i = 2; i < priv->cal_blob->count; i++)
		1381	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[i], sizeof(data)));
		1382
		1383	/* Initially 1 entry adding slot 3 */
		1384	cs_amp_lib_test_init_dummy_cal_blob(test, 1);
		1385	KUNIT_ASSERT_EQ(test, 1, priv->cal_blob->count);
		1386	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1387	get_random_bytes(&data, sizeof(data));
		1388	data.calTarget[0] = 0xaaaaaaaa; /* won't match */
		1389	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, 3, -1, &data));
		1390	KUNIT_EXPECT_GE(test, priv->cal_blob->count, 4);
		1391	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, priv->cal_blob->count),
		1392	priv->cal_blob->size);
		1393	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[0], &priv->cal_blob->data[0], sizeof(data));
		1394	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[1], sizeof(data)));
		1395	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[2], sizeof(data)));
		1396	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[3], sizeof(data));
		1397	for (i = 4; i < priv->cal_blob->count; i++)
		1398	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[i], sizeof(data)));
		1399
		1400	/* Initially 2 entries adding slot 3 */
		1401	priv->cal_blob = NULL;
		1402	cs_amp_lib_test_init_dummy_cal_blob(test, 2);
		1403	KUNIT_ASSERT_EQ(test, 2, priv->cal_blob->count);
		1404	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1405	get_random_bytes(&data, sizeof(data));
		1406	data.calTarget[0] = 0xaaaaaaaa; /* won't match */
		1407	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, 3, -1, &data));
		1408	KUNIT_EXPECT_GE(test, priv->cal_blob->count, 1);
		1409	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, priv->cal_blob->count),
		1410	priv->cal_blob->size);
		1411	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[0], &priv->cal_blob->data[0], sizeof(data));
		1412	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[1], &priv->cal_blob->data[1], sizeof(data));
		1413	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[2], sizeof(data)));
		1414	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[3], sizeof(data));
		1415	for (i = 4; i < priv->cal_blob->count; i++)
		1416	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[i], sizeof(data)));
		1417
		1418	/* Initially 4 entries adding slot 4 */
		1419	priv->cal_blob = NULL;
		1420	cs_amp_lib_test_init_dummy_cal_blob(test, 4);
		1421	KUNIT_ASSERT_EQ(test, 4, priv->cal_blob->count);
		1422	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1423	get_random_bytes(&data, sizeof(data));
		1424	data.calTarget[0] = 0xaaaaaaaa; /* won't match */
		1425	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, 4, -1, &data));
		1426	KUNIT_EXPECT_GE(test, priv->cal_blob->count, 1);
		1427	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, priv->cal_blob->count),
		1428	priv->cal_blob->size);
		1429	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[0], &priv->cal_blob->data[0], sizeof(data));
		1430	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[1], &priv->cal_blob->data[1], sizeof(data));
		1431	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[2], &priv->cal_blob->data[2], sizeof(data));
		1432	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[3], &priv->cal_blob->data[3], sizeof(data));
		1433	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[4], sizeof(data));
		1434	for (i = 5; i < priv->cal_blob->count; i++)
		1435	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[i], sizeof(data)));
		1436
		1437	/* Initially 4 entries adding slot 6 */
		1438	priv->cal_blob = NULL;
		1439	cs_amp_lib_test_init_dummy_cal_blob(test, 4);
		1440	KUNIT_ASSERT_EQ(test, 4, priv->cal_blob->count);
		1441	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1442	get_random_bytes(&data, sizeof(data));
		1443	data.calTarget[0] = 0xaaaaaaaa; /* won't match */
		1444	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, 6, -1, &data));
		1445	KUNIT_EXPECT_GE(test, priv->cal_blob->count, 1);
		1446	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, priv->cal_blob->count),
		1447	priv->cal_blob->size);
		1448	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[0], &priv->cal_blob->data[0], sizeof(data));
		1449	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[1], &priv->cal_blob->data[1], sizeof(data));
		1450	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[2], &priv->cal_blob->data[2], sizeof(data));
		1451	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[3], &priv->cal_blob->data[3], sizeof(data));
		1452	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[4], sizeof(data)));
		1453	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[5], sizeof(data)));
		1454	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[6], sizeof(data));
		1455	for (i = 7; i < priv->cal_blob->count; i++)
		1456	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[i], sizeof(data)));
		1457	}
		1458
		1459	static void cs_amp_lib_test_grow_cal_efi_replace_indexed(struct kunit *test)
		1460	{
		1461	struct cs_amp_lib_test_priv *priv = test->priv;
		1462	struct device *dev = &priv->amp_dev->dev;
		1463	const struct cirrus_amp_efi_data *original_blob;
		1464	struct cirrus_amp_cal_data data;
		1465
		1466	kunit_activate_static_stub(test,
		1467	cs_amp_test_hooks->get_efi_variable,
		1468	cs_amp_lib_test_get_efi_variable);
		1469	kunit_activate_static_stub(test,
		1470	cs_amp_test_hooks->set_efi_variable,
		1471	cs_amp_lib_test_set_efi_variable);
		1472
		1473	/* Initially 1 entry grown to 2 entries overwriting slot 0 */
		1474	cs_amp_lib_test_init_dummy_cal_blob(test, 1);
		1475	KUNIT_ASSERT_EQ(test, 1, priv->cal_blob->count);
		1476	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1477	get_random_bytes(&data, sizeof(data));
		1478	data.calTarget[0] = 0xaaaaaaaa; /* won't match */
		1479	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, 0, 2, &data));
		1480	KUNIT_EXPECT_EQ(test, 2, priv->cal_blob->count);
		1481	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 2), priv->cal_blob->size);
		1482	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[0], sizeof(data));
		1483	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[1], sizeof(data)));
		1484
		1485	/* Initially 2 entries grown to 4 entries overwriting slot 1 */
		1486	priv->cal_blob = NULL;
		1487	cs_amp_lib_test_init_dummy_cal_blob(test, 2);
		1488	KUNIT_ASSERT_EQ(test, 2, priv->cal_blob->count);
		1489	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1490	get_random_bytes(&data, sizeof(data));
		1491	data.calTarget[0] = 0xaaaaaaaa; /* won't match */
		1492	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, 1, 4, &data));
		1493	KUNIT_EXPECT_EQ(test, 4, priv->cal_blob->count);
		1494	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 4), priv->cal_blob->size);
		1495	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[0], &priv->cal_blob->data[0], sizeof(data));
		1496	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[1], sizeof(data));
		1497	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[2], sizeof(data)));
		1498	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[3], sizeof(data)));
		1499
		1500	/* Initially 4 entries grown to 6 entries overwriting slot 1 */
		1501	priv->cal_blob = NULL;
		1502	cs_amp_lib_test_init_dummy_cal_blob(test, 4);
		1503	KUNIT_ASSERT_EQ(test, 4, priv->cal_blob->count);
		1504	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1505	get_random_bytes(&data, sizeof(data));
		1506	data.calTarget[0] = 0xaaaaaaaa; /* won't match */
		1507	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, 1, 6, &data));
		1508	KUNIT_EXPECT_EQ(test, 6, priv->cal_blob->count);
		1509	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 6), priv->cal_blob->size);
		1510	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[0], &priv->cal_blob->data[0], sizeof(data));
		1511	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[1], sizeof(data));
		1512	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[2], &priv->cal_blob->data[2], sizeof(data));
		1513	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[3], &priv->cal_blob->data[3], sizeof(data));
		1514	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[4], sizeof(data)));
		1515	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[5], sizeof(data)));
		1516
		1517	/* Initially 4 entries grown to 6 entries overwriting slot 3 */
		1518	priv->cal_blob = NULL;
		1519	cs_amp_lib_test_init_dummy_cal_blob(test, 4);
		1520	KUNIT_ASSERT_EQ(test, 4, priv->cal_blob->count);
		1521	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1522	get_random_bytes(&data, sizeof(data));
		1523	data.calTarget[0] = 0xaaaaaaaa; /* won't match */
		1524	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, 3, 6, &data));
		1525	KUNIT_EXPECT_EQ(test, 6, priv->cal_blob->count);
		1526	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 6), priv->cal_blob->size);
		1527	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[0], &priv->cal_blob->data[0], sizeof(data));
		1528	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[1], &priv->cal_blob->data[1], sizeof(data));
		1529	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[2], &priv->cal_blob->data[2], sizeof(data));
		1530	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[3], sizeof(data));
		1531	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[4], sizeof(data)));
		1532	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[5], sizeof(data)));
		1533
		1534	/* Initially 6 entries grown to 8 entries overwriting slot 4 */
		1535	priv->cal_blob = NULL;
		1536	cs_amp_lib_test_init_dummy_cal_blob(test, 6);
		1537	KUNIT_ASSERT_EQ(test, 6, priv->cal_blob->count);
		1538	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1539	get_random_bytes(&data, sizeof(data));
		1540	data.calTarget[0] = 0xaaaaaaaa; /* won't match */
		1541	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, 4, 8, &data));
		1542	KUNIT_EXPECT_EQ(test, 8, priv->cal_blob->count);
		1543	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 8), priv->cal_blob->size);
		1544	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[0], &priv->cal_blob->data[0], sizeof(data));
		1545	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[1], &priv->cal_blob->data[1], sizeof(data));
		1546	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[2], &priv->cal_blob->data[2], sizeof(data));
		1547	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[3], &priv->cal_blob->data[3], sizeof(data));
		1548	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[4], sizeof(data));
		1549	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[5], &priv->cal_blob->data[5], sizeof(data));
		1550	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[6], sizeof(data)));
		1551	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[7], sizeof(data)));
		1552	}
		1553
		1554	static void cs_amp_lib_test_grow_cal_efi_replace_by_uid(struct kunit *test)
		1555	{
		1556	struct cs_amp_lib_test_priv *priv = test->priv;
		1557	struct device *dev = &priv->amp_dev->dev;
		1558	const struct cirrus_amp_efi_data *original_blob;
		1559	struct cirrus_amp_cal_data data;
		1560
		1561	kunit_activate_static_stub(test,
		1562	cs_amp_test_hooks->get_efi_variable,
		1563	cs_amp_lib_test_get_efi_variable);
		1564	kunit_activate_static_stub(test,
		1565	cs_amp_test_hooks->set_efi_variable,
		1566	cs_amp_lib_test_set_efi_variable);
		1567
		1568	/* Initially 1 entry grown to 2 entries overwriting slot 0 */
		1569	cs_amp_lib_test_init_dummy_cal_blob(test, 1);
		1570	KUNIT_ASSERT_EQ(test, 1, priv->cal_blob->count);
		1571	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1572	get_random_bytes(&data, sizeof(data));
		1573	memcpy(data.calTarget, priv->cal_blob->data[0].calTarget, sizeof(data.calTarget));
		1574	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, -1, 2, &data));
		1575	KUNIT_EXPECT_EQ(test, 2, priv->cal_blob->count);
		1576	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 2), priv->cal_blob->size);
		1577	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[0], sizeof(data));
		1578	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[1], sizeof(data)));
		1579
		1580	/* Initially 2 entries grown to 4 entries overwriting slot 1 */
		1581	priv->cal_blob = NULL;
		1582	cs_amp_lib_test_init_dummy_cal_blob(test, 2);
		1583	KUNIT_ASSERT_EQ(test, 2, priv->cal_blob->count);
		1584	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1585	get_random_bytes(&data, sizeof(data));
		1586	memcpy(data.calTarget, priv->cal_blob->data[1].calTarget, sizeof(data.calTarget));
		1587	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, -1, 4, &data));
		1588	KUNIT_EXPECT_EQ(test, 4, priv->cal_blob->count);
		1589	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 4), priv->cal_blob->size);
		1590	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[0], &priv->cal_blob->data[0], sizeof(data));
		1591	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[1], sizeof(data));
		1592	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[2], sizeof(data)));
		1593	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[3], sizeof(data)));
		1594
		1595	/* Initially 4 entries grown to 6 entries overwriting slot 1 */
		1596	priv->cal_blob = NULL;
		1597	cs_amp_lib_test_init_dummy_cal_blob(test, 4);
		1598	KUNIT_ASSERT_EQ(test, 4, priv->cal_blob->count);
		1599	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1600	get_random_bytes(&data, sizeof(data));
		1601	memcpy(data.calTarget, priv->cal_blob->data[1].calTarget, sizeof(data.calTarget));
		1602	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, -1, 6, &data));
		1603	KUNIT_EXPECT_EQ(test, 6, priv->cal_blob->count);
		1604	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 6), priv->cal_blob->size);
		1605	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[0], &priv->cal_blob->data[0], sizeof(data));
		1606	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[1], sizeof(data));
		1607	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[2], &priv->cal_blob->data[2], sizeof(data));
		1608	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[3], &priv->cal_blob->data[3], sizeof(data));
		1609	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[4], sizeof(data)));
		1610	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[5], sizeof(data)));
		1611
		1612	/* Initially 4 entries grown to 6 entries overwriting slot 3 */
		1613	priv->cal_blob = NULL;
		1614	cs_amp_lib_test_init_dummy_cal_blob(test, 4);
		1615	KUNIT_ASSERT_EQ(test, 4, priv->cal_blob->count);
		1616	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1617	get_random_bytes(&data, sizeof(data));
		1618	memcpy(data.calTarget, priv->cal_blob->data[3].calTarget, sizeof(data.calTarget));
		1619	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, -1, 6, &data));
		1620	KUNIT_EXPECT_EQ(test, 6, priv->cal_blob->count);
		1621	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 6), priv->cal_blob->size);
		1622	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[0], &priv->cal_blob->data[0], sizeof(data));
		1623	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[1], &priv->cal_blob->data[1], sizeof(data));
		1624	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[2], &priv->cal_blob->data[2], sizeof(data));
		1625	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[3], sizeof(data));
		1626	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[4], sizeof(data)));
		1627	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[5], sizeof(data)));
		1628
		1629	/* Initially 6 entries grown to 8 entries overwriting slot 4 */
		1630	priv->cal_blob = NULL;
		1631	cs_amp_lib_test_init_dummy_cal_blob(test, 6);
		1632	KUNIT_ASSERT_EQ(test, 6, priv->cal_blob->count);
		1633	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1634	get_random_bytes(&data, sizeof(data));
		1635	memcpy(data.calTarget, priv->cal_blob->data[4].calTarget, sizeof(data.calTarget));
		1636	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, -1, 8, &data));
		1637	KUNIT_EXPECT_EQ(test, 8, priv->cal_blob->count);
		1638	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 8), priv->cal_blob->size);
		1639	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[0], &priv->cal_blob->data[0], sizeof(data));
		1640	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[1], &priv->cal_blob->data[1], sizeof(data));
		1641	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[2], &priv->cal_blob->data[2], sizeof(data));
		1642	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[3], &priv->cal_blob->data[3], sizeof(data));
		1643	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[4], sizeof(data));
		1644	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[5], &priv->cal_blob->data[5], sizeof(data));
		1645	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[6], sizeof(data)));
		1646	KUNIT_EXPECT_TRUE(test, mem_is_zero(&priv->cal_blob->data[7], sizeof(data)));
		1647	}
		1648
		1649	static void cs_amp_lib_test_cal_efi_replace_by_uid(struct kunit *test)
		1650	{
		1651	struct cs_amp_lib_test_priv *priv = test->priv;
		1652	struct device *dev = &priv->amp_dev->dev;
		1653	const struct cirrus_amp_efi_data *original_blob;
		1654	struct cirrus_amp_cal_data data;
		1655
		1656	kunit_activate_static_stub(test,
		1657	cs_amp_test_hooks->get_efi_variable,
		1658	cs_amp_lib_test_get_efi_variable);
		1659	kunit_activate_static_stub(test,
		1660	cs_amp_test_hooks->set_efi_variable,
		1661	cs_amp_lib_test_set_efi_variable);
		1662
		1663	cs_amp_lib_test_init_dummy_cal_blob(test, 6);
		1664	KUNIT_ASSERT_EQ(test, 6, priv->cal_blob->count);
		1665
		1666	/* Replace entry matching slot 0 */
		1667	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1668	get_random_bytes(&data, sizeof(data));
		1669	memcpy(data.calTarget, priv->cal_blob->data[0].calTarget, sizeof(data.calTarget));
		1670	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, -1, -1, &data));
		1671	KUNIT_EXPECT_EQ(test, 6, priv->cal_blob->count);
		1672	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 6), priv->cal_blob->size);
		1673	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[0], sizeof(data));
		1674	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[1], &priv->cal_blob->data[1], sizeof(data));
		1675	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[2], &priv->cal_blob->data[2], sizeof(data));
		1676	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[3], &priv->cal_blob->data[3], sizeof(data));
		1677	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[4], &priv->cal_blob->data[4], sizeof(data));
		1678	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[5], &priv->cal_blob->data[5], sizeof(data));
		1679
		1680	/* Replace entry matching slot 4 */
		1681	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1682	get_random_bytes(&data, sizeof(data));
		1683	memcpy(data.calTarget, priv->cal_blob->data[4].calTarget, sizeof(data.calTarget));
		1684	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, -1, -1, &data));
		1685	KUNIT_EXPECT_EQ(test, 6, priv->cal_blob->count);
		1686	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 6), priv->cal_blob->size);
		1687	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[0], &priv->cal_blob->data[0], sizeof(data));
		1688	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[1], &priv->cal_blob->data[1], sizeof(data));
		1689	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[2], &priv->cal_blob->data[2], sizeof(data));
		1690	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[3], &priv->cal_blob->data[3], sizeof(data));
		1691	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[4], sizeof(data));
		1692	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[5], &priv->cal_blob->data[5], sizeof(data));
		1693
		1694	/* Replace entry matching slot 3 */
		1695	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1696	get_random_bytes(&data, sizeof(data));
		1697	memcpy(data.calTarget, priv->cal_blob->data[3].calTarget, sizeof(data.calTarget));
		1698	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, -1, -1, &data));
		1699	KUNIT_EXPECT_EQ(test, 6, priv->cal_blob->count);
		1700	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 6), priv->cal_blob->size);
		1701	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[0], &priv->cal_blob->data[0], sizeof(data));
		1702	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[1], &priv->cal_blob->data[1], sizeof(data));
		1703	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[2], &priv->cal_blob->data[2], sizeof(data));
		1704	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[3], sizeof(data));
		1705	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[4], &priv->cal_blob->data[4], sizeof(data));
		1706	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[5], &priv->cal_blob->data[5], sizeof(data));
		1707
		1708	/* Replace entry matching slot 5 */
		1709	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1710	get_random_bytes(&data, sizeof(data));
		1711	memcpy(data.calTarget, priv->cal_blob->data[5].calTarget, sizeof(data.calTarget));
		1712	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, -1, -1, &data));
		1713	KUNIT_EXPECT_EQ(test, 6, priv->cal_blob->count);
		1714	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 6), priv->cal_blob->size);
		1715	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[0], &priv->cal_blob->data[0], sizeof(data));
		1716	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[1], &priv->cal_blob->data[1], sizeof(data));
		1717	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[2], &priv->cal_blob->data[2], sizeof(data));
		1718	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[3], &priv->cal_blob->data[3], sizeof(data));
		1719	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[4], &priv->cal_blob->data[4], sizeof(data));
		1720	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[5], sizeof(data));
		1721	}
		1722
		1723	static void cs_amp_lib_test_cal_efi_replace_by_index(struct kunit *test)
		1724	{
		1725	struct cs_amp_lib_test_priv *priv = test->priv;
		1726	struct device *dev = &priv->amp_dev->dev;
		1727	const struct cirrus_amp_efi_data *original_blob;
		1728	struct cirrus_amp_cal_data data;
		1729
		1730	kunit_activate_static_stub(test,
		1731	cs_amp_test_hooks->get_efi_variable,
		1732	cs_amp_lib_test_get_efi_variable);
		1733	kunit_activate_static_stub(test,
		1734	cs_amp_test_hooks->set_efi_variable,
		1735	cs_amp_lib_test_set_efi_variable);
		1736
		1737	cs_amp_lib_test_init_dummy_cal_blob(test, 6);
		1738	KUNIT_ASSERT_EQ(test, 6, priv->cal_blob->count);
		1739
		1740	/*
		1741	* Replace entry matching slot 0.
		1742	* data.calTarget is deliberately set different to current calTarget
		1743	* of the slot to check that the index forces that slot to be used.
		1744	*/
		1745	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1746	get_random_bytes(&data, sizeof(data));
		1747	data.calTarget[0] = ~priv->cal_blob->data[0].calTarget[0];
		1748	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, 0, -1, &data));
		1749	KUNIT_EXPECT_EQ(test, 6, priv->cal_blob->count);
		1750	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 6), priv->cal_blob->size);
		1751	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[0], sizeof(data));
		1752	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[1], &priv->cal_blob->data[1], sizeof(data));
		1753	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[2], &priv->cal_blob->data[2], sizeof(data));
		1754	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[3], &priv->cal_blob->data[3], sizeof(data));
		1755	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[4], &priv->cal_blob->data[4], sizeof(data));
		1756	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[5], &priv->cal_blob->data[5], sizeof(data));
		1757
		1758	/* Replace entry matching slot 4 */
		1759	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1760	get_random_bytes(&data, sizeof(data));
		1761	data.calTarget[0] = ~priv->cal_blob->data[4].calTarget[0];
		1762	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, 4, -1, &data));
		1763	KUNIT_EXPECT_EQ(test, 6, priv->cal_blob->count);
		1764	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 6), priv->cal_blob->size);
		1765	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[0], &priv->cal_blob->data[0], sizeof(data));
		1766	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[1], &priv->cal_blob->data[1], sizeof(data));
		1767	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[2], &priv->cal_blob->data[2], sizeof(data));
		1768	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[3], &priv->cal_blob->data[3], sizeof(data));
		1769	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[4], sizeof(data));
		1770	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[5], &priv->cal_blob->data[5], sizeof(data));
		1771
		1772	/* Replace entry matching slot 3 */
		1773	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1774	get_random_bytes(&data, sizeof(data));
		1775	data.calTarget[0] = ~priv->cal_blob->data[3].calTarget[0];
		1776	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, 3, -1, &data));
		1777	KUNIT_EXPECT_EQ(test, 6, priv->cal_blob->count);
		1778	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 6), priv->cal_blob->size);
		1779	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[0], &priv->cal_blob->data[0], sizeof(data));
		1780	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[1], &priv->cal_blob->data[1], sizeof(data));
		1781	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[2], &priv->cal_blob->data[2], sizeof(data));
		1782	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[3], sizeof(data));
		1783	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[4], &priv->cal_blob->data[4], sizeof(data));
		1784	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[5], &priv->cal_blob->data[5], sizeof(data));
		1785
		1786	/* Replace entry matching slot 5 */
		1787	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1788	get_random_bytes(&data, sizeof(data));
		1789	data.calTarget[0] = ~priv->cal_blob->data[5].calTarget[0];
		1790	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, 5, -1, &data));
		1791	KUNIT_EXPECT_EQ(test, 6, priv->cal_blob->count);
		1792	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 6), priv->cal_blob->size);
		1793	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[0], &priv->cal_blob->data[0], sizeof(data));
		1794	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[1], &priv->cal_blob->data[1], sizeof(data));
		1795	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[2], &priv->cal_blob->data[2], sizeof(data));
		1796	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[3], &priv->cal_blob->data[3], sizeof(data));
		1797	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[4], &priv->cal_blob->data[4], sizeof(data));
		1798	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[5], sizeof(data));
		1799	}
		1800
		1801	static void cs_amp_lib_test_cal_efi_deduplicate(struct kunit *test)
		1802	{
		1803	struct cs_amp_lib_test_priv *priv = test->priv;
		1804	struct device *dev = &priv->amp_dev->dev;
		1805	const struct cirrus_amp_efi_data *original_blob;
		1806	struct cirrus_amp_cal_data data;
		1807	int i;
		1808
		1809	kunit_activate_static_stub(test,
		1810	cs_amp_test_hooks->get_efi_variable,
		1811	cs_amp_lib_test_get_efi_variable);
		1812	kunit_activate_static_stub(test,
		1813	cs_amp_test_hooks->set_efi_variable,
		1814	cs_amp_lib_test_set_efi_variable);
		1815
		1816	/*
		1817	* Replace entry matching slot 0.
		1818	* An active entry in slot 1 for the same UID should be marked empty.
		1819	* Other entries are unaltered.
		1820	*/
		1821	cs_amp_lib_test_init_dummy_cal_blob(test, 4);
		1822	KUNIT_ASSERT_EQ(test, 4, priv->cal_blob->count);
		1823	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1824	get_random_bytes(&data, sizeof(data));
		1825	memcpy(data.calTarget, priv->cal_blob->data[1].calTarget, sizeof(data.calTarget));
		1826	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, 0, -1, &data));
		1827	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[0], sizeof(data));
		1828	KUNIT_EXPECT_EQ(test, 0, priv->cal_blob->data[1].calTime[0]);
		1829	KUNIT_EXPECT_EQ(test, 0, priv->cal_blob->data[1].calTime[1]);
		1830	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[2], &priv->cal_blob->data[2], sizeof(data));
		1831	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[3], &priv->cal_blob->data[3], sizeof(data));
		1832
		1833	/*
		1834	* Replace entry matching slot 1.
		1835	* An active entry in slot 0 for the same UID should be marked empty.
		1836	* Other entries are unaltered.
		1837	*/
		1838	priv->cal_blob = NULL;
		1839	cs_amp_lib_test_init_dummy_cal_blob(test, 4);
		1840	KUNIT_ASSERT_EQ(test, 4, priv->cal_blob->count);
		1841	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1842	get_random_bytes(&data, sizeof(data));
		1843	memcpy(data.calTarget, priv->cal_blob->data[0].calTarget, sizeof(data.calTarget));
		1844	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, 1, -1, &data));
		1845	KUNIT_EXPECT_EQ(test, 0, priv->cal_blob->data[0].calTime[0]);
		1846	KUNIT_EXPECT_EQ(test, 0, priv->cal_blob->data[0].calTime[1]);
		1847	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[1], sizeof(data));
		1848	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[2], &priv->cal_blob->data[2], sizeof(data));
		1849	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[3], &priv->cal_blob->data[3], sizeof(data));
		1850
		1851	/*
		1852	* Replace entry matching slot 1.
		1853	* An active entry in slot 3 for the same UID should be marked empty.
		1854	* Other entries are unaltered.
		1855	*/
		1856	priv->cal_blob = NULL;
		1857	cs_amp_lib_test_init_dummy_cal_blob(test, 4);
		1858	KUNIT_ASSERT_EQ(test, 4, priv->cal_blob->count);
		1859	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1860	get_random_bytes(&data, sizeof(data));
		1861	memcpy(data.calTarget, priv->cal_blob->data[3].calTarget, sizeof(data.calTarget));
		1862	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, 1, -1, &data));
		1863	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[0], &priv->cal_blob->data[0], sizeof(data));
		1864	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[1], sizeof(data));
		1865	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[2], &priv->cal_blob->data[2], sizeof(data));
		1866	KUNIT_EXPECT_EQ(test, 0, priv->cal_blob->data[3].calTime[0]);
		1867	KUNIT_EXPECT_EQ(test, 0, priv->cal_blob->data[3].calTime[1]);
		1868
		1869	/*
		1870	* Worst case, all entries have the same UID
		1871	*/
		1872	priv->cal_blob = NULL;
		1873	cs_amp_lib_test_init_dummy_cal_blob(test, 4);
		1874	KUNIT_ASSERT_EQ(test, 4, priv->cal_blob->count);
		1875	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1876	get_random_bytes(&data, sizeof(data));
		1877	for (i = 0; i < priv->cal_blob->count; i++) {
		1878	priv->cal_blob->data[i].calTarget[0] = 0xe5e5e5e5;
		1879	priv->cal_blob->data[i].calTarget[1] = 0xa7a7a7a7;
		1880	}
		1881	memcpy(data.calTarget, priv->cal_blob->data[2].calTarget, sizeof(data.calTarget));
		1882	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, 2, -1, &data));
		1883	KUNIT_EXPECT_EQ(test, 0, priv->cal_blob->data[0].calTime[0]);
		1884	KUNIT_EXPECT_EQ(test, 0, priv->cal_blob->data[0].calTime[1]);
		1885	KUNIT_EXPECT_EQ(test, 0, priv->cal_blob->data[1].calTime[0]);
		1886	KUNIT_EXPECT_EQ(test, 0, priv->cal_blob->data[1].calTime[1]);
		1887	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[2], sizeof(data));
		1888	KUNIT_EXPECT_EQ(test, 0, priv->cal_blob->data[3].calTime[0]);
		1889	KUNIT_EXPECT_EQ(test, 0, priv->cal_blob->data[3].calTime[1]);
		1890	}
		1891
		1892	static void cs_amp_lib_test_cal_efi_find_free(struct kunit *test)
		1893	{
		1894	struct cs_amp_lib_test_priv *priv = test->priv;
		1895	struct device *dev = &priv->amp_dev->dev;
		1896	const struct cirrus_amp_efi_data *original_blob;
		1897	struct cirrus_amp_cal_data data;
		1898
		1899	kunit_activate_static_stub(test,
		1900	cs_amp_test_hooks->get_efi_variable,
		1901	cs_amp_lib_test_get_efi_variable);
		1902	kunit_activate_static_stub(test,
		1903	cs_amp_test_hooks->set_efi_variable,
		1904	cs_amp_lib_test_set_efi_variable);
		1905
		1906	cs_amp_lib_test_init_dummy_cal_blob(test, 6);
		1907	KUNIT_ASSERT_EQ(test, 6, priv->cal_blob->count);
		1908
		1909	/*
		1910	* Slot 0 is empty.
		1911	* data.calTarget is set to a value that won't match any existing entry.
		1912	*/
		1913	memset(&priv->cal_blob->data[0].calTime, 0, sizeof(priv->cal_blob->data[0].calTime));
		1914	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1915	get_random_bytes(&data, sizeof(data));
		1916	data.calTarget[0] = 0xaaaaaaaa;
		1917	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, -1, -1, &data));
		1918	KUNIT_EXPECT_EQ(test, 6, priv->cal_blob->count);
		1919	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 6), priv->cal_blob->size);
		1920	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[0], sizeof(data));
		1921	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[1], &priv->cal_blob->data[1], sizeof(data));
		1922	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[2], &priv->cal_blob->data[2], sizeof(data));
		1923	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[3], &priv->cal_blob->data[3], sizeof(data));
		1924	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[4], &priv->cal_blob->data[4], sizeof(data));
		1925	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[5], &priv->cal_blob->data[5], sizeof(data));
		1926
		1927	/* Slot 4 is empty */
		1928	memset(&priv->cal_blob->data[4].calTime, 0, sizeof(priv->cal_blob->data[4].calTime));
		1929	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1930	get_random_bytes(&data, sizeof(data));
		1931	data.calTarget[0] = 0xaaaaaaaa;
		1932	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, -1, -1, &data));
		1933	KUNIT_EXPECT_EQ(test, 6, priv->cal_blob->count);
		1934	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 6), priv->cal_blob->size);
		1935	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[0], &priv->cal_blob->data[0], sizeof(data));
		1936	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[1], &priv->cal_blob->data[1], sizeof(data));
		1937	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[2], &priv->cal_blob->data[2], sizeof(data));
		1938	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[3], &priv->cal_blob->data[3], sizeof(data));
		1939	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[4], sizeof(data));
		1940	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[5], &priv->cal_blob->data[5], sizeof(data));
		1941
		1942	/* Slot 3 is empty */
		1943	memset(&priv->cal_blob->data[3].calTime, 0, sizeof(priv->cal_blob->data[3].calTime));
		1944	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1945	get_random_bytes(&data, sizeof(data));
		1946	data.calTarget[0] = 0xaaaaaaaa;
		1947	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, -1, -1, &data));
		1948	KUNIT_EXPECT_EQ(test, 6, priv->cal_blob->count);
		1949	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 6), priv->cal_blob->size);
		1950	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[0], &priv->cal_blob->data[0], sizeof(data));
		1951	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[1], &priv->cal_blob->data[1], sizeof(data));
		1952	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[2], &priv->cal_blob->data[2], sizeof(data));
		1953	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[3], sizeof(data));
		1954	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[4], &priv->cal_blob->data[4], sizeof(data));
		1955	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[5], &priv->cal_blob->data[5], sizeof(data));
		1956
		1957	/* Replace entry matching slot 5 */
		1958	memset(&priv->cal_blob->data[5].calTime, 0, sizeof(priv->cal_blob->data[5].calTime));
		1959	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		1960	get_random_bytes(&data, sizeof(data));
		1961	data.calTarget[0] = 0xaaaaaaaa;
		1962	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, -1, -1, &data));
		1963	KUNIT_EXPECT_EQ(test, 6, priv->cal_blob->count);
		1964	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 6), priv->cal_blob->size);
		1965	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[0], &priv->cal_blob->data[0], sizeof(data));
		1966	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[1], &priv->cal_blob->data[1], sizeof(data));
		1967	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[2], &priv->cal_blob->data[2], sizeof(data));
		1968	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[3], &priv->cal_blob->data[3], sizeof(data));
		1969	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[4], &priv->cal_blob->data[4], sizeof(data));
		1970	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[5], sizeof(data));
		1971	}
		1972
		1973	static void cs_amp_lib_test_cal_efi_bad_cal_target(struct kunit *test)
		1974	{
		1975	struct cs_amp_lib_test_priv *priv = test->priv;
		1976	struct device *dev = &priv->amp_dev->dev;
		1977	struct cirrus_amp_cal_data data;
		1978
		1979	kunit_activate_static_stub(test,
		1980	cs_amp_test_hooks->get_efi_variable,
		1981	cs_amp_lib_test_get_efi_variable);
		1982	kunit_activate_static_stub(test,
		1983	cs_amp_test_hooks->set_efi_variable,
		1984	cs_amp_lib_test_set_efi_variable);
		1985
		1986	cs_amp_lib_test_init_dummy_cal_blob(test, 4);
		1987
		1988	/* Zero calTarget is illegal */
		1989	get_random_bytes(&data, sizeof(data));
		1990	memset(data.calTarget, 0, sizeof(data.calTarget));
		1991	KUNIT_EXPECT_LT(test, cs_amp_set_efi_calibration_data(dev, -1, -1, &data), 0);
		1992	KUNIT_EXPECT_LT(test, cs_amp_set_efi_calibration_data(dev, 0, -1, &data), 0);
		1993	KUNIT_EXPECT_LT(test, cs_amp_set_efi_calibration_data(dev, 0, 2, &data), 0);
		1994	}
		1995
		1996	static void cs_amp_lib_test_cal_efi_write_denied(struct kunit *test)
		1997	{
		1998	struct cs_amp_lib_test_priv *priv = test->priv;
		1999	struct device *dev = &priv->amp_dev->dev;
		2000	const struct cirrus_amp_efi_data *original_blob;
		2001	struct cirrus_amp_cal_data data;
		2002
		2003	kunit_activate_static_stub(test,
		2004	cs_amp_test_hooks->get_efi_variable,
		2005	cs_amp_lib_test_get_efi_variable);
		2006	kunit_activate_static_stub(test,
		2007	cs_amp_test_hooks->set_efi_variable,
		2008	cs_amp_lib_test_set_efi_variable_denied);
		2009
		2010	cs_amp_lib_test_init_dummy_cal_blob(test, 4);
		2011	KUNIT_ASSERT_EQ(test, 4, priv->cal_blob->count);
		2012	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		2013	get_random_bytes(&data, sizeof(data));
		2014
		2015	/* Unspecified slot */
		2016	KUNIT_EXPECT_LT(test, cs_amp_set_efi_calibration_data(dev, -1, -1, &data), 0);
		2017	KUNIT_EXPECT_MEMEQ(test, original_blob, priv->cal_blob, original_blob->size);
		2018
		2019	/* Unspecified slot with size */
		2020	KUNIT_EXPECT_LT(test, cs_amp_set_efi_calibration_data(dev, -1, 6, &data), 0);
		2021	KUNIT_EXPECT_MEMEQ(test, original_blob, priv->cal_blob, original_blob->size);
		2022
		2023	/* Specified slot */
		2024	KUNIT_EXPECT_LT(test, cs_amp_set_efi_calibration_data(dev, 1, -1, &data), 0);
		2025	KUNIT_EXPECT_MEMEQ(test, original_blob, priv->cal_blob, original_blob->size);
		2026
		2027	/* Specified slot with size */
		2028	KUNIT_EXPECT_LT(test, cs_amp_set_efi_calibration_data(dev, 1, 6, &data), 0);
		2029	KUNIT_EXPECT_MEMEQ(test, original_blob, priv->cal_blob, original_blob->size);
		2030	}
		2031
		2032	static void cs_amp_lib_test_cal_efi_attr_preserved(struct kunit *test)
		2033	{
		2034	struct cs_amp_lib_test_priv *priv = test->priv;
		2035	struct device *dev = &priv->amp_dev->dev;
		2036	struct cirrus_amp_cal_data data;
		2037
		2038	kunit_activate_static_stub(test,
		2039	cs_amp_test_hooks->get_efi_variable,
		2040	cs_amp_lib_test_get_efi_variable);
		2041	kunit_activate_static_stub(test,
		2042	cs_amp_test_hooks->set_efi_variable,
		2043	cs_amp_lib_test_set_efi_variable);
		2044
		2045	cs_amp_lib_test_init_dummy_cal_blob(test, 6);
		2046	KUNIT_ASSERT_EQ(test, 6, priv->cal_blob->count);
		2047	memset(&priv->cal_blob->data[0], 0, sizeof(priv->cal_blob->data[0]));
		2048	get_random_bytes(&data, sizeof(data));
		2049
		2050	/* Set a non-standard attr to return from get_efi_variable() */
		2051	priv->efi_attr = EFI_VARIABLE_HARDWARE_ERROR_RECORD;
		2052
		2053	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, -1, -1, &data));
		2054	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[0], sizeof(data));
		2055	KUNIT_EXPECT_EQ(test, priv->efi_attr, EFI_VARIABLE_HARDWARE_ERROR_RECORD);
		2056	}
		2057
		2058	static efi_status_t cs_amp_lib_test_set_hp_efi_cal_variable(efi_char16_t *name,
		2059	efi_guid_t *guid,
		2060	u32 attr,
		2061	unsigned long size,
		2062	void *buf)
		2063	{
		2064	static const efi_char16_t expected_name[] = HP_CALIBRATION_EFI_NAME;
		2065	static const efi_guid_t expected_guid = HP_CALIBRATION_EFI_GUID;
		2066	struct kunit *test = kunit_get_current_test();
		2067	struct cs_amp_lib_test_priv *priv = test->priv;
		2068
		2069	KUNIT_ASSERT_NOT_NULL(test, name);
		2070	KUNIT_ASSERT_NOT_NULL(test, guid);
		2071
		2072	if (memcmp(name, expected_name, sizeof(expected_name)) \|\|
		2073	efi_guidcmp(*guid, expected_guid))
		2074	return -EFI_ACCESS_DENIED;
		2075
		2076	KUNIT_ASSERT_NOT_NULL(test, buf);
		2077	KUNIT_ASSERT_NE(test, 0, size);
		2078
		2079	kunit_kfree(test, priv->cal_blob);
		2080	priv->cal_blob = kunit_kmalloc(test, size, GFP_KERNEL);
		2081	KUNIT_ASSERT_NOT_NULL(test, priv->cal_blob);
		2082	memcpy(priv->cal_blob, buf, size);
		2083	priv->efi_attr = attr;
		2084
		2085	return EFI_SUCCESS;
		2086	}
		2087
		2088	/*
		2089	* If the HP EFI exists it should be the one that is updated.
		2090	*/
		2091	static void cs_amp_lib_test_cal_efi_update_hp(struct kunit *test)
		2092	{
		2093	struct cs_amp_lib_test_priv *priv = test->priv;
		2094	struct device *dev = &priv->amp_dev->dev;
		2095	const struct cirrus_amp_efi_data *original_blob;
		2096	struct cirrus_amp_cal_data data;
		2097
		2098	kunit_activate_static_stub(test,
		2099	cs_amp_test_hooks->get_efi_variable,
		2100	cs_amp_lib_test_get_hp_cal_efi_variable);
		2101	kunit_activate_static_stub(test,
		2102	cs_amp_test_hooks->set_efi_variable,
		2103	cs_amp_lib_test_set_hp_efi_cal_variable);
		2104
		2105	cs_amp_lib_test_init_dummy_cal_blob(test, 6);
		2106	KUNIT_ASSERT_EQ(test, 6, priv->cal_blob->count);
		2107
		2108	/* Replace entry matching slot 4 */
		2109	original_blob = cs_amp_lib_test_cal_blob_dup(test);
		2110	get_random_bytes(&data, sizeof(data));
		2111	data.calTarget[0] = ~priv->cal_blob->data[4].calTarget[0];
		2112	KUNIT_EXPECT_EQ(test, 0, cs_amp_set_efi_calibration_data(dev, 4, -1, &data));
		2113	KUNIT_EXPECT_EQ(test, 6, priv->cal_blob->count);
		2114	KUNIT_EXPECT_EQ(test, struct_size(priv->cal_blob, data, 6), priv->cal_blob->size);
		2115	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[0], &priv->cal_blob->data[0], sizeof(data));
		2116	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[1], &priv->cal_blob->data[1], sizeof(data));
		2117	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[2], &priv->cal_blob->data[2], sizeof(data));
		2118	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[3], &priv->cal_blob->data[3], sizeof(data));
		2119	KUNIT_EXPECT_MEMEQ(test, &data, &priv->cal_blob->data[4], sizeof(data));
		2120	KUNIT_EXPECT_MEMEQ(test, &original_blob->data[5], &priv->cal_blob->data[5], sizeof(data));
		2121	}
		2122
705	static void cs_amp_lib_test_spkid_lenovo_not_present(struct kunit *test)	2123	static void cs_amp_lib_test_spkid_lenovo_not_present(struct kunit *test)
706	{	2124	{
707	struct cs_amp_lib_test_priv *priv = test->priv;	2125	struct cs_amp_lib_test_priv *priv = test->priv;
@@ -716,6 +2134,7 @@ static void cs_amp_lib_test_spkid_lenovo_not_present(struct kunit *test) · 8 unmodified lines
716		2134
717	static efi_status_t cs_amp_lib_test_get_efi_variable_lenovo_d0(efi_char16_t *name,	2135	static efi_status_t cs_amp_lib_test_get_efi_variable_lenovo_d0(efi_char16_t *name,
718	efi_guid_t *guid,	2136	efi_guid_t *guid,
		2137	u32 *returned_attr,
719	unsigned long *size,	2138	unsigned long *size,
720	void *buf)	2139	void *buf)
721	{	2140	{
@@ -734,6 +2153,7 @@ static efi_status_t cs_amp_lib_test_get_efi_variable_lenovo_d0(efi_char16_t *nam · 12 unmodified lines
734		2153
735	static efi_status_t cs_amp_lib_test_get_efi_variable_lenovo_d1(efi_char16_t *name,	2154	static efi_status_t cs_amp_lib_test_get_efi_variable_lenovo_d1(efi_char16_t *name,
736	efi_guid_t *guid,	2155	efi_guid_t *guid,
		2156	u32 *returned_attr,
737	unsigned long *size,	2157	unsigned long *size,
738	void *buf)	2158	void *buf)
739	{	2159	{
@@ -752,6 +2172,7 @@ static efi_status_t cs_amp_lib_test_get_efi_variable_lenovo_d1(efi_char16_t *nam · 12 unmodified lines
752		2172
753	static efi_status_t cs_amp_lib_test_get_efi_variable_lenovo_00(efi_char16_t *name,	2173	static efi_status_t cs_amp_lib_test_get_efi_variable_lenovo_00(efi_char16_t *name,
754	efi_guid_t *guid,	2174	efi_guid_t *guid,
		2175	u32 *returned_attr,
755	unsigned long *size,	2176	unsigned long *size,
756	void *buf)	2177	void *buf)
757	{	2178	{
@@ -803,6 +2224,7 @@ static void cs_amp_lib_test_spkid_lenovo_illegal(struct kunit *test) · 45 unmodified lines
803		2224
804	static efi_status_t cs_amp_lib_test_get_efi_variable_buf_too_small(efi_char16_t *name,	2225	static efi_status_t cs_amp_lib_test_get_efi_variable_buf_too_small(efi_char16_t *name,
805	efi_guid_t *guid,	2226	efi_guid_t *guid,
		2227	u32 *returned_attr,
806	unsigned long *size,	2228	unsigned long *size,
807	void *buf)	2229	void *buf)
808	{	2230	{
@@ -823,6 +2245,7 @@ static void cs_amp_lib_test_spkid_lenovo_oversize(struct kunit *test) · 14 unmodified lines
823		2245
824	static efi_status_t cs_amp_lib_test_get_efi_variable_hp_30(efi_char16_t *name,	2246	static efi_status_t cs_amp_lib_test_get_efi_variable_hp_30(efi_char16_t *name,
825	efi_guid_t *guid,	2247	efi_guid_t *guid,
		2248	u32 *returned_attr,
826	unsigned long *size,	2249	unsigned long *size,
827	void *buf)	2250	void *buf)
828	{	2251	{
@@ -841,6 +2264,7 @@ static efi_status_t cs_amp_lib_test_get_efi_variable_hp_30(efi_char16_t *name, · 12 unmodified lines
841		2264
842	static efi_status_t cs_amp_lib_test_get_efi_variable_hp_31(efi_char16_t *name,	2265	static efi_status_t cs_amp_lib_test_get_efi_variable_hp_31(efi_char16_t *name,
843	efi_guid_t *guid,	2266	efi_guid_t *guid,
		2267	u32 *returned_attr,
844	unsigned long *size,	2268	unsigned long *size,
845	void *buf)	2269	void *buf)
846	{	2270	{
@@ -974,8 +2398,32 @@ static struct kunit_case cs_amp_lib_test_cases[] = { · 127 unmodified lines
974	cs_amp_lib_test_get_cal_gen_params),	2398	cs_amp_lib_test_get_cal_gen_params),
975	KUNIT_CASE(cs_amp_lib_test_get_efi_cal_empty_entry_test),	2399	KUNIT_CASE(cs_amp_lib_test_get_efi_cal_empty_entry_test),
976		2400
977	/* Tests for writing calibration data */	2401	/* Tests for writing and reading calibration data */
978	KUNIT_CASE(cs_amp_lib_test_write_cal_data_test),	2402	KUNIT_CASE(cs_amp_lib_test_write_cal_data_test),
		2403	KUNIT_CASE(cs_amp_lib_test_read_cal_data_test),
		2404	KUNIT_CASE(cs_amp_lib_test_write_ambient_test),
		2405
		2406	/* Test cases for writing cal data to UEFI */
		2407	KUNIT_CASE(cs_amp_lib_test_create_new_cal_efi),
		2408	KUNIT_CASE(cs_amp_lib_test_create_new_cal_efi_indexed),
		2409	KUNIT_CASE(cs_amp_lib_test_create_new_cal_efi_indexed_no_max),
		2410	KUNIT_CASE(cs_amp_lib_test_cal_efi_all_zeros_add_first),
		2411	KUNIT_CASE(cs_amp_lib_test_cal_efi_all_zeros_add_first_no_shrink),
		2412	KUNIT_CASE(cs_amp_lib_test_cal_efi_all_zeros_add_first_indexed),
		2413	KUNIT_CASE(cs_amp_lib_test_cal_efi_all_zeros_add_first_indexed_no_shrink),
		2414	KUNIT_CASE(cs_amp_lib_test_grow_append_cal_efi),
		2415	KUNIT_CASE(cs_amp_lib_test_grow_append_cal_efi_indexed),
		2416	KUNIT_CASE(cs_amp_lib_test_grow_append_cal_efi_indexed_no_max),
		2417	KUNIT_CASE(cs_amp_lib_test_grow_cal_efi_replace_indexed),
		2418	KUNIT_CASE(cs_amp_lib_test_grow_cal_efi_replace_by_uid),
		2419	KUNIT_CASE(cs_amp_lib_test_cal_efi_replace_by_uid),
		2420	KUNIT_CASE(cs_amp_lib_test_cal_efi_replace_by_index),
		2421	KUNIT_CASE(cs_amp_lib_test_cal_efi_deduplicate),
		2422	KUNIT_CASE(cs_amp_lib_test_cal_efi_find_free),
		2423	KUNIT_CASE(cs_amp_lib_test_cal_efi_bad_cal_target),
		2424	KUNIT_CASE(cs_amp_lib_test_cal_efi_write_denied),
		2425	KUNIT_CASE(cs_amp_lib_test_cal_efi_attr_preserved),
		2426	KUNIT_CASE(cs_amp_lib_test_cal_efi_update_hp),
979		2427
980	/* Test cases for speaker ID */	2428	/* Test cases for speaker ID */
981	KUNIT_CASE(cs_amp_lib_test_spkid_lenovo_not_present),	2429	KUNIT_CASE(cs_amp_lib_test_spkid_lenovo_not_present),

sound/soc/codecs/cs-amp-lib.c+347−25

@@ -7,12 +7,17 @@ · 6 unmodified lines
7		7
8	#include <asm/byteorder.h>	8	#include <asm/byteorder.h>
9	#include <kunit/static_stub.h>	9	#include <kunit/static_stub.h>
		10	#include <linux/cleanup.h>
		11	#include <linux/debugfs.h>
10	#include <linux/dev_printk.h>	12	#include <linux/dev_printk.h>
11	#include <linux/efi.h>	13	#include <linux/efi.h>
12	#include <linux/firmware/cirrus/cs_dsp.h>	14	#include <linux/firmware/cirrus/cs_dsp.h>
		15	#include <linux/math64.h>
13	#include <linux/module.h>	16	#include <linux/module.h>
		17	#include <linux/mutex.h>
14	#include <linux/overflow.h>	18	#include <linux/overflow.h>
15	#include <linux/slab.h>	19	#include <linux/slab.h>
		20	#include <linux/timekeeping.h>
16	#include <linux/types.h>	21	#include <linux/types.h>
17	#include <sound/cs-amp-lib.h>	22	#include <sound/cs-amp-lib.h>
18		23
@@ -46,6 +51,23 @@ static const struct cs_amp_lib_cal_efivar { · 27 unmodified lines
46	},	51	},
47	};	52	};
48		53
		54	#define CS_AMP_CAL_DEFAULT_EFI_ATTR \
		55	(EFI_VARIABLE_NON_VOLATILE \| \
		56	EFI_VARIABLE_BOOTSERVICE_ACCESS \| \
		57	EFI_VARIABLE_RUNTIME_ACCESS)
		58
		59	/* Offset from Unix time to Windows time (100ns since 1 Jan 1601) */
		60	#define UNIX_TIME_TO_WINDOWS_TIME_OFFSET 116444736000000000ULL
		61
		62	static DEFINE_MUTEX(cs_amp_efi_cal_write_lock);
		63
		64	static u64 cs_amp_time_now_in_windows_time(void)
		65	{
		66	u64 time_in_100ns = div_u64(ktime_get_real_ns(), 100);
		67
		68	return time_in_100ns + UNIX_TIME_TO_WINDOWS_TIME_OFFSET;
		69	}
		70
49	static int cs_amp_write_cal_coeff(struct cs_dsp *dsp,	71	static int cs_amp_write_cal_coeff(struct cs_dsp *dsp,
50	const struct cirrus_amp_cal_controls *controls,	72	const struct cirrus_amp_cal_controls *controls,
51	const char *ctl_name, u32 val)	73	const char *ctl_name, u32 val)
@@ -73,6 +95,34 @@ static int cs_amp_write_cal_coeff(struct cs_dsp *dsp, · 21 unmodified lines
73	return -ENODEV;	95	return -ENODEV;
74	}	96	}
75		97
		98	static int cs_amp_read_cal_coeff(struct cs_dsp *dsp,
		99	const struct cirrus_amp_cal_controls *controls,
		100	const char ctl_name, u32 val)
		101	{
		102	struct cs_dsp_coeff_ctl *cs_ctl;
		103	__be32 beval;
		104	int ret;
		105
		106	KUNIT_STATIC_STUB_REDIRECT(cs_amp_read_cal_coeff, dsp, controls, ctl_name, val);
		107
		108	if (!IS_REACHABLE(CONFIG_FW_CS_DSP))
		109	return -ENODEV;
		110
		111	scoped_guard(mutex, &dsp->pwr_lock) {
		112	cs_ctl = cs_dsp_get_ctl(dsp, ctl_name, controls->mem_region, controls->alg_id);
		113	ret = cs_dsp_coeff_read_ctrl(cs_ctl, 0, &beval, sizeof(beval));
		114	}
		115
		116	if (ret < 0) {
		117	dev_err(dsp->dev, "Failed to write to '%s': %d\n", ctl_name, ret);
		118	return ret;
		119	}
		120
		121	*val = be32_to_cpu(beval);
		122
		123	return 0;
		124	}
		125
76	static int _cs_amp_write_cal_coeffs(struct cs_dsp *dsp,	126	static int _cs_amp_write_cal_coeffs(struct cs_dsp *dsp,
77	const struct cirrus_amp_cal_controls *controls,	127	const struct cirrus_amp_cal_controls *controls,
78	const struct cirrus_amp_cal_data *data)	128	const struct cirrus_amp_cal_data *data)
@@ -106,6 +156,45 @@ static int _cs_amp_write_cal_coeffs(struct cs_dsp *dsp, · 27 unmodified lines
106	return 0;	156	return 0;
107	}	157	}
108		158
		159	static int _cs_amp_read_cal_coeffs(struct cs_dsp *dsp,
		160	const struct cirrus_amp_cal_controls *controls,
		161	struct cirrus_amp_cal_data *data)
		162	{
		163	u64 time;
		164	u32 val;
		165	int ret;
		166
		167	if (list_empty(&dsp->ctl_list)) {
		168	dev_info(dsp->dev, "Calibration disabled due to missing firmware controls\n");
		169	return -ENOENT;
		170	}
		171
		172	ret = cs_amp_read_cal_coeff(dsp, controls, controls->ambient, &val);
		173	if (ret)
		174	return ret;
		175
		176	data->calAmbient = (s8)val;
		177
		178	ret = cs_amp_read_cal_coeff(dsp, controls, controls->calr, &val);
		179	if (ret)
		180	return ret;
		181
		182	data->calR = (u16)val;
		183
		184	ret = cs_amp_read_cal_coeff(dsp, controls, controls->status, &val);
		185	if (ret)
		186	return ret;
		187
		188	data->calStatus = (u8)val;
		189
		190	/* Fill in timestamp */
		191	time = cs_amp_time_now_in_windows_time();
		192	data->calTime[0] = (u32)time;
		193	data->calTime[1] = (u32)(time >> 32);
		194
		195	return 0;
		196	}
		197
109	/**	198	/**
110	* cs_amp_write_cal_coeffs - Write calibration data to firmware controls.	199	* cs_amp_write_cal_coeffs - Write calibration data to firmware controls.
111	* @dsp: Pointer to struct cs_dsp.	200	* @dsp: Pointer to struct cs_dsp.
@@ -125,21 +214,78 @@ int cs_amp_write_cal_coeffs(struct cs_dsp *dsp, · 13 unmodified lines
125	}	214	}
126	EXPORT_SYMBOL_NS_GPL(cs_amp_write_cal_coeffs, "SND_SOC_CS_AMP_LIB");	215	EXPORT_SYMBOL_NS_GPL(cs_amp_write_cal_coeffs, "SND_SOC_CS_AMP_LIB");
127		216
		217	/**
		218	* cs_amp_read_cal_coeffs - Read calibration data from firmware controls.
		219	* @dsp: Pointer to struct cs_dsp.
		220	* @controls: Pointer to definition of firmware controls to be read.
		221	* @data: Pointer to calibration data where results will be written.
		222	*
		223	* Returns: 0 on success, else negative error value.
		224	*/
		225	int cs_amp_read_cal_coeffs(struct cs_dsp *dsp,
		226	const struct cirrus_amp_cal_controls *controls,
		227	struct cirrus_amp_cal_data *data)
		228	{
		229	if (IS_REACHABLE(CONFIG_FW_CS_DSP) \|\| IS_ENABLED(CONFIG_SND_SOC_CS_AMP_LIB_TEST))
		230	return _cs_amp_read_cal_coeffs(dsp, controls, data);
		231	else
		232	return -ENODEV;
		233	}
		234	EXPORT_SYMBOL_NS_GPL(cs_amp_read_cal_coeffs, "SND_SOC_CS_AMP_LIB");
		235
		236	/**
		237	* cs_amp_write_ambient_temp - write value to calibration ambient temperature
		238	* @dsp: Pointer to struct cs_dsp.
		239	* @controls: Pointer to definition of firmware controls to be read.
		240	* @temp: Temperature in degrees celcius.
		241	*
		242	* Returns: 0 on success, else negative error value.
		243	*/
		244	int cs_amp_write_ambient_temp(struct cs_dsp *dsp,
		245	const struct cirrus_amp_cal_controls *controls,
		246	u32 temp)
		247	{
		248	if (IS_REACHABLE(CONFIG_FW_CS_DSP) \|\| IS_ENABLED(CONFIG_SND_SOC_CS_AMP_LIB_TEST))
		249	return cs_amp_write_cal_coeff(dsp, controls, controls->ambient, temp);
		250	else
		251	return -ENODEV;
		252	}
		253	EXPORT_SYMBOL_NS_GPL(cs_amp_write_ambient_temp, "SND_SOC_CS_AMP_LIB");
		254
128	static efi_status_t cs_amp_get_efi_variable(efi_char16_t *name,	255	static efi_status_t cs_amp_get_efi_variable(efi_char16_t *name,
129	efi_guid_t *guid,	256	efi_guid_t *guid,
		257	u32 *returned_attr,
130	unsigned long *size,	258	unsigned long *size,
131	void *buf)	259	void *buf)
132	{	260	{
133	u32 attr;	261	u32 attr;
134		262
135	KUNIT_STATIC_STUB_REDIRECT(cs_amp_get_efi_variable, name, guid, size, buf);	263	if (!returned_attr)
		264	returned_attr = &attr;
		265
		266	KUNIT_STATIC_STUB_REDIRECT(cs_amp_get_efi_variable, name, guid,
		267	returned_attr, size, buf);
136		268
137	if (efi_rt_services_supported(EFI_RT_SUPPORTED_GET_VARIABLE))	269	if (efi_rt_services_supported(EFI_RT_SUPPORTED_GET_VARIABLE))
138	return efi.get_variable(name, guid, &attr, size, buf);	270	return efi.get_variable(name, guid, returned_attr, size, buf);
139		271
140	return EFI_NOT_FOUND;	272	return EFI_NOT_FOUND;
141	}	273	}
142		274
		275	static efi_status_t cs_amp_set_efi_variable(efi_char16_t *name,
		276	efi_guid_t *guid,
		277	u32 attr,
		278	unsigned long size,
		279	void *buf)
		280	{
		281	KUNIT_STATIC_STUB_REDIRECT(cs_amp_set_efi_variable, name, guid, attr, size, buf);
		282
		283	if (!efi_rt_services_supported(EFI_RT_SUPPORTED_SET_VARIABLE))
		284	return EFI_NOT_FOUND;
		285
		286	return efi.set_variable(name, guid, attr, size, buf);
		287	}
		288
143	static int cs_amp_convert_efi_status(efi_status_t status)	289	static int cs_amp_convert_efi_status(efi_status_t status)
144	{	290	{
145	switch (status) {	291	switch (status) {
@@ -149,6 +295,7 @@ static int cs_amp_convert_efi_status(efi_status_t status) · 3 unmodified lines
149	return -ENOENT;	295	return -ENOENT;
150	case EFI_BUFFER_TOO_SMALL:	296	case EFI_BUFFER_TOO_SMALL:
151	return -EFBIG;	297	return -EFBIG;
		298	case EFI_WRITE_PROTECTED:
152	case EFI_UNSUPPORTED:	299	case EFI_UNSUPPORTED:
153	case EFI_ACCESS_DENIED:	300	case EFI_ACCESS_DENIED:
154	case EFI_SECURITY_VIOLATION:	301	case EFI_SECURITY_VIOLATION:
@@ -158,11 +305,13 @@ static int cs_amp_convert_efi_status(efi_status_t status) · 3 unmodified lines
158	}	305	}
159	}	306	}
160		307
161	static struct cirrus_amp_efi_data cs_amp_get_cal_efi_buffer(struct device dev)	308	static struct cirrus_amp_efi_data cs_amp_get_cal_efi_buffer(struct device dev,
		309	efi_char16_t **name,
		310	efi_guid_t **guid,
		311	u32 *attr)
162	{	312	{
163	struct cirrus_amp_efi_data *efi_data;	313	struct cirrus_amp_efi_data *efi_data __free(kfree) = NULL;
164	unsigned long data_size = 0;	314	unsigned long data_size = 0;
165	u8 *data;
166	efi_status_t status;	315	efi_status_t status;
167	int i, ret;	316	int i, ret;
168		317
@@ -170,7 +319,7 @@ static struct cirrus_amp_efi_data cs_amp_get_cal_efi_buffer(struct device dev) · 1 unmodified line
170	for (i = 0; i < ARRAY_SIZE(cs_amp_lib_cal_efivars); i++) {	319	for (i = 0; i < ARRAY_SIZE(cs_amp_lib_cal_efivars); i++) {
171	status = cs_amp_get_efi_variable(cs_amp_lib_cal_efivars[i].name,	320	status = cs_amp_get_efi_variable(cs_amp_lib_cal_efivars[i].name,
172	cs_amp_lib_cal_efivars[i].guid,	321	cs_amp_lib_cal_efivars[i].guid,
173	&data_size, NULL);	322	attr, &data_size, NULL);
174	if (status == EFI_BUFFER_TOO_SMALL)	323	if (status == EFI_BUFFER_TOO_SMALL)
175	break;	324	break;
176	}	325	}
@@ -178,25 +327,30 @@ static struct cirrus_amp_efi_data cs_amp_get_cal_efi_buffer(struct device dev) · 1 unmodified line
178	if (status != EFI_BUFFER_TOO_SMALL)	327	if (status != EFI_BUFFER_TOO_SMALL)
179	return ERR_PTR(-ENOENT);	328	return ERR_PTR(-ENOENT);
180		329
		330	if (name)
		331	*name = cs_amp_lib_cal_efivars[i].name;
		332
		333	if (guid)
		334	*guid = cs_amp_lib_cal_efivars[i].guid;
		335
181	if (data_size < sizeof(*efi_data)) {	336	if (data_size < sizeof(*efi_data)) {
182	dev_err(dev, "EFI cal variable truncated\n");	337	dev_err(dev, "EFI cal variable truncated\n");
183	return ERR_PTR(-EOVERFLOW);	338	return ERR_PTR(-EOVERFLOW);
184	}	339	}
185		340
186	/* Get variable contents into buffer */	341	/* Get variable contents into buffer */
187	data = kmalloc(data_size, GFP_KERNEL);	342	efi_data = kmalloc(data_size, GFP_KERNEL);
188	if (!data)	343	if (!efi_data)
189	return ERR_PTR(-ENOMEM);	344	return ERR_PTR(-ENOMEM);
190		345
191	status = cs_amp_get_efi_variable(cs_amp_lib_cal_efivars[i].name,	346	status = cs_amp_get_efi_variable(cs_amp_lib_cal_efivars[i].name,
192	cs_amp_lib_cal_efivars[i].guid,	347	cs_amp_lib_cal_efivars[i].guid,
193	&data_size, data);	348	attr, &data_size, efi_data);
194	if (status != EFI_SUCCESS) {	349	if (status != EFI_SUCCESS) {
195	ret = -EINVAL;	350	ret = -EINVAL;
196	goto err;	351	goto err;
197	}	352	}
198		353
199	efi_data = (struct cirrus_amp_efi_data *)data;
200	dev_dbg(dev, "Calibration: Size=%d, Amp Count=%d\n", efi_data->size, efi_data->count);	354	dev_dbg(dev, "Calibration: Size=%d, Amp Count=%d\n", efi_data->size, efi_data->count);
201		355
202	if ((efi_data->count > 128) \|\|	356	if ((efi_data->count > 128) \|\|
@@ -206,28 +360,40 @@ static struct cirrus_amp_efi_data cs_amp_get_cal_efi_buffer(struct device dev) · 3 unmodified lines
206	goto err;	360	goto err;
207	}	361	}
208		362
209	return efi_data;	363	/* This could be zero-filled space pre-allocated by the BIOS */
		364	if (efi_data->size == 0)
		365	efi_data->size = data_size;
		366
		367	return_ptr(efi_data);
210		368
211	err:	369	err:
212	kfree(data);
213	dev_err(dev, "Failed to read calibration data from EFI: %d\n", ret);	370	dev_err(dev, "Failed to read calibration data from EFI: %d\n", ret);
214		371
215	return ERR_PTR(ret);	372	return ERR_PTR(ret);
216	}	373	}
217		374
218	static u64 cs_amp_cal_target_u64(const struct cirrus_amp_cal_data *data)	375	static int cs_amp_set_cal_efi_buffer(struct device *dev,
		376	efi_char16_t *name,
		377	efi_guid_t *guid,
		378	u32 attr,
		379	struct cirrus_amp_efi_data *data)
219	{	380	{
220	return ((u64)data->calTarget[1] << 32) \| data->calTarget[0];	381	efi_status_t status;
		382
		383	status = cs_amp_set_efi_variable(name, guid, attr,
		384	struct_size(data, data, data->count), data);
		385
		386	return cs_amp_convert_efi_status(status);
221	}	387	}
222		388
223	static int _cs_amp_get_efi_calibration_data(struct device *dev, u64 target_uid, int amp_index,	389	static int _cs_amp_get_efi_calibration_data(struct device *dev, u64 target_uid, int amp_index,
224	struct cirrus_amp_cal_data *out_data)	390	struct cirrus_amp_cal_data *out_data)
225	{	391	{
226	struct cirrus_amp_efi_data *efi_data;	392	struct cirrus_amp_efi_data *efi_data __free(kfree) = NULL;
227	struct cirrus_amp_cal_data *cal = NULL;	393	struct cirrus_amp_cal_data *cal = NULL;
228	int i, ret;	394	int i;
229		395
230	efi_data = cs_amp_get_cal_efi_buffer(dev);	396	efi_data = cs_amp_get_cal_efi_buffer(dev, NULL, NULL, NULL);
231	if (IS_ERR(efi_data))	397	if (IS_ERR(efi_data))
232	return PTR_ERR(efi_data);	398	return PTR_ERR(efi_data);
233		399
@@ -266,17 +432,106 @@ static int _cs_amp_get_efi_calibration_data(struct device *dev, u64 target_uid, · 32 unmodified lines
266	dev_warn(dev, "Calibration entry %d does not match silicon ID", amp_index);	432	dev_warn(dev, "Calibration entry %d does not match silicon ID", amp_index);
267	}	433	}
268		434
269	if (cal) {	435	if (!cal) {
270	memcpy(out_data, cal, sizeof(*out_data));
271	ret = 0;
272	} else {
273	dev_warn(dev, "No calibration for silicon ID %#llx\n", target_uid);	436	dev_warn(dev, "No calibration for silicon ID %#llx\n", target_uid);
274	ret = -ENOENT;	437	return -ENOENT;
		438	}
		439
		440	memcpy(out_data, cal, sizeof(*out_data));
		441
		442	return 0;
		443	}
		444
		445	static int _cs_amp_set_efi_calibration_data(struct device *dev, int amp_index, int num_amps,
		446	const struct cirrus_amp_cal_data *in_data)
		447	{
		448	u64 cal_target = cs_amp_cal_target_u64(in_data);
		449	unsigned long num_entries;
		450	struct cirrus_amp_efi_data *data __free(kfree) = NULL;
		451	efi_char16_t *name = CIRRUS_LOGIC_CALIBRATION_EFI_NAME;
		452	efi_guid_t *guid = &CIRRUS_LOGIC_CALIBRATION_EFI_GUID;
		453	u32 attr = CS_AMP_CAL_DEFAULT_EFI_ATTR;
		454	int i, ret;
		455
		456	if (cal_target == 0)
		457	return -EINVAL;
		458
		459	data = cs_amp_get_cal_efi_buffer(dev, &name, &guid, &attr);
		460	ret = PTR_ERR_OR_ZERO(data);
		461	if (ret == -ENOENT) {
		462	data = NULL;
		463	goto alloc_new;
		464	} else if (ret) {
		465	return ret;
		466	}
		467
		468	/*
		469	* If the EFI variable is just zero-filled reserved space the count
		470	* must be set.
		471	*/
		472	if (data->count == 0)
		473	data->count = (data->size - sizeof(data)) / sizeof(data->data[0]);
		474
		475	if (amp_index < 0) {
		476	/* Is there already a slot for this target? */
		477	for (amp_index = 0; amp_index < data->count; amp_index++) {
		478	if (cs_amp_cal_target_u64(&data->data[amp_index]) == cal_target)
		479	break;
		480	}
		481
		482	/* Else find an empty slot */
		483	if (amp_index >= data->count) {
		484	for (amp_index = 0; amp_index < data->count; amp_index++) {
		485	if ((data->data[amp_index].calTime[0] == 0) &&
		486	(data->data[amp_index].calTime[1] == 0))
		487	break;
		488	}
		489	}
		490	} else {
		491	/*
		492	* If the index is forced there could be another active
		493	* slot with the same calTarget. So deduplicate.
		494	*/
		495	for (i = 0; i < data->count; i++) {
		496	if (i == amp_index)
		497	continue;
		498
		499	if ((data->data[i].calTime[0] == 0) && (data->data[i].calTime[1] == 0))
		500	continue;
		501
		502	if (cs_amp_cal_target_u64(&data->data[i]) == cal_target)
		503	memset(data->data[i].calTime, 0, sizeof(data->data[i].calTime));
		504	}
275	}	505	}
276		506
277	kfree(efi_data);	507	alloc_new:
		508	if (amp_index < 0)
		509	amp_index = 0;
		510
		511	num_entries = max(num_amps, amp_index + 1);
		512	if (!data \|\| (data->count < num_entries)) {
		513	struct cirrus_amp_efi_data *old_data __free(kfree) = no_free_ptr(data);
		514	unsigned int new_data_size = struct_size(data, data, num_entries);
		515
		516	data = kzalloc(new_data_size, GFP_KERNEL);
		517	if (!data)
		518	return -ENOMEM;
278		519
279	return ret;	520	if (old_data)
		521	memcpy(data, old_data, struct_size(old_data, data, old_data->count));
		522
		523	data->count = num_entries;
		524	data->size = new_data_size;
		525	}
		526
		527	data->data[amp_index] = *in_data;
		528	ret = cs_amp_set_cal_efi_buffer(dev, name, guid, attr, data);
		529	if (ret) {
		530	dev_err(dev, "Failed writing calibration to EFI: %d\n", ret);
		531	return ret;
		532	}
		533
		534	return 0;
280	}	535	}
281		536
282	/**	537	/**
@@ -325,6 +580,46 @@ int cs_amp_get_efi_calibration_data(struct device *dev, u64 target_uid, int amp_ · 42 unmodified lines
325	}	580	}
326	EXPORT_SYMBOL_NS_GPL(cs_amp_get_efi_calibration_data, "SND_SOC_CS_AMP_LIB");	581	EXPORT_SYMBOL_NS_GPL(cs_amp_get_efi_calibration_data, "SND_SOC_CS_AMP_LIB");
327		582
		583	/**
		584	* cs_amp_set_efi_calibration_data - write a calibration data entry to EFI.
		585	* @dev: struct device of the caller.
		586	* @amp_index: Entry index to use, or -1 to use any available slot.
		587	* @num_amps: Maximum number of amps to reserve slots for, or -1 to ignore.
		588	* @in_data: struct cirrus_amp_cal_data entry to be written to EFI.
		589	*
		590	* If a Vendor-specific variable exists it will be updated,
		591	* else if the Cirrus variable exists it will be updated
		592	* else the Cirrus variable will be created.
		593	*
		594	* If amp_index >= 0 the data will be placed in this entry of the calibration
		595	* data array, overwriting what was in that entry. Any other entries with the
		596	* same calTarget will be marked empty.
		597	*
		598	* If amp_index < 0 and in_data->calTarget matches any existing entry, that
		599	* entry will be overwritten. Else the first available free entry will be used,
		600	* extending the size of the EFI variable if there are no free entries.
		601	*
		602	* If num_amps > 0 the EFI variable will be sized to contain at least this
		603	* many calibration entries, with any new entries marked empty.
		604	*
		605	* Return: 0 if the write was successful, -EFBIG if space could not be made in
		606	* the EFI file to add the entry, -EACCES if it was not possible to
		607	* read or write the EFI variable.
		608	*/
		609	int cs_amp_set_efi_calibration_data(struct device *dev, int amp_index, int num_amps,
		610	const struct cirrus_amp_cal_data *in_data)
		611	{
		612	if (IS_ENABLED(CONFIG_EFI) \|\| IS_ENABLED(CONFIG_SND_SOC_CS_AMP_LIB_TEST)) {
		613	scoped_guard(mutex, &cs_amp_efi_cal_write_lock) {
		614	return _cs_amp_set_efi_calibration_data(dev, amp_index,
		615	num_amps, in_data);
		616	}
		617	}
		618
		619	return -ENOENT;
		620	}
		621	EXPORT_SYMBOL_NS_GPL(cs_amp_set_efi_calibration_data, "SND_SOC_CS_AMP_LIB");
		622
328	struct cs_amp_spkid_efi {	623	struct cs_amp_spkid_efi {
329	efi_char16_t *name;	624	efi_char16_t *name;
330	efi_guid_t *guid;	625	efi_guid_t *guid;
@@ -339,7 +634,7 @@ static int cs_amp_get_efi_byte_spkid(struct device *dev, const struct cs_amp_spk · 8 unmodified lines
339	int i, ret;	634	int i, ret;
340		635
341	size = sizeof(spkid);	636	size = sizeof(spkid);
342	status = cs_amp_get_efi_variable(info->name, info->guid, &size, &spkid);	637	status = cs_amp_get_efi_variable(info->name, info->guid, NULL, &size, &spkid);
343	ret = cs_amp_convert_efi_status(status);	638	ret = cs_amp_convert_efi_status(status);
344	if (ret < 0)	639	if (ret < 0)
345	return ret;	640	return ret;
@@ -400,9 +695,36 @@ int cs_amp_get_vendor_spkid(struct device *dev) · 54 unmodified lines
400	}	695	}
401	EXPORT_SYMBOL_NS_GPL(cs_amp_get_vendor_spkid, "SND_SOC_CS_AMP_LIB");	696	EXPORT_SYMBOL_NS_GPL(cs_amp_get_vendor_spkid, "SND_SOC_CS_AMP_LIB");
402		697
		698	/**
		699	* cs_amp_create_debugfs - create a debugfs directory for a device
		700	*
		701	* @dev: pointer to struct device
		702	*
		703	* Creates a node under "cirrus_logic" in the root of the debugfs filesystem.
		704	* This is for Cirrus-specific debugfs functionality to be grouped in a
		705	* defined way, independently of the debugfs provided by ALSA/ASoC.
		706	* The general ALSA/ASoC debugfs may not be enabled, and does not necessarily
		707	* have a stable layout or naming convention.
		708	*
		709	* Return: Pointer to the dentry for the created directory, or -ENODEV.
		710	*/
		711	struct dentry cs_amp_create_debugfs(struct device dev)
		712	{
		713	struct dentry *dir;
		714
		715	dir = debugfs_lookup("cirrus_logic", NULL);
		716	if (!dir)
		717	dir = debugfs_create_dir("cirrus_logic", NULL);
		718
		719	return debugfs_create_dir(dev_name(dev), dir);
		720	}
		721	EXPORT_SYMBOL_NS_GPL(cs_amp_create_debugfs, "SND_SOC_CS_AMP_LIB");
		722
403	static const struct cs_amp_test_hooks cs_amp_test_hook_ptrs = {	723	static const struct cs_amp_test_hooks cs_amp_test_hook_ptrs = {
404	.get_efi_variable = cs_amp_get_efi_variable,	724	.get_efi_variable = cs_amp_get_efi_variable,
		725	.set_efi_variable = cs_amp_set_efi_variable,
405	.write_cal_coeff = cs_amp_write_cal_coeff,	726	.write_cal_coeff = cs_amp_write_cal_coeff,
		727	.read_cal_coeff = cs_amp_read_cal_coeff,
406	};	728	};
407		729
408	const struct cs_amp_test_hooks * const cs_amp_test_hooks =	730	const struct cs_amp_test_hooks * const cs_amp_test_hooks =

sound/soc/codecs/cs35l33.c+2−2

@@ -547,7 +547,7 @@ static int cs35l33_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, · 546 unmodified lines
547	unsigned int rx_mask, int slots, int slot_width)	547	unsigned int rx_mask, int slots, int slot_width)
548	{	548	{
549	struct snd_soc_component *component = dai->component;	549	struct snd_soc_component *component = dai->component;
550	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	550	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
551	struct cs35l33_private *priv = snd_soc_component_get_drvdata(component);	551	struct cs35l33_private *priv = snd_soc_component_get_drvdata(component);
552	unsigned int reg, bit_pos, i;	552	unsigned int reg, bit_pos, i;
553	int slot, slot_num;	553	int slot, slot_num;
@@ -695,7 +695,7 @@ static int cs35l33_set_hg_data(struct snd_soc_component *component, · 141 unmodified lines
695	struct cs35l33_pdata *pdata)	695	struct cs35l33_pdata *pdata)
696	{	696	{
697	struct cs35l33_hg *hg_config = &pdata->hg_config;	697	struct cs35l33_hg *hg_config = &pdata->hg_config;
698	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	698	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
699	struct cs35l33_private *priv = snd_soc_component_get_drvdata(component);	699	struct cs35l33_private *priv = snd_soc_component_get_drvdata(component);
700		700
701	if (hg_config->enable_hg_algo) {	701	if (hg_config->enable_hg_algo) {

sound/soc/codecs/cs35l36.c+2−4

 static int cs35l36_ldm_sel_get(struct snd_kcontrol *kcontrol,
 			       struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-			snd_soc_kcontrol_component(kcontrol);
 	struct cs35l36_private *cs35l36 =
 			snd_soc_component_get_drvdata(component);
 static int cs35l36_ldm_sel_put(struct snd_kcontrol *kcontrol,
 			       struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-			snd_soc_kcontrol_component(kcontrol);
 	struct cs35l36_private *cs35l36 =
 			snd_soc_component_get_drvdata(component);
 	int val = (ucontrol->value.integer.value[0]) ? CS35L36_NG_AMP_EN_MASK :

sound/soc/codecs/cs35l41.c+1−1

@@ -928,7 +928,7 @@ static const struct snd_soc_dapm_widget cs35l41_ext_bst_widget[] = { · 927 unmodified lines
928	static int cs35l41_component_probe(struct snd_soc_component *component)	928	static int cs35l41_component_probe(struct snd_soc_component *component)
929	{	929	{
930	struct cs35l41_private *cs35l41 = snd_soc_component_get_drvdata(component);	930	struct cs35l41_private *cs35l41 = snd_soc_component_get_drvdata(component);
931	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	931	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
932	int ret;	932	int ret;
933		933
934	if (cs35l41->hw_cfg.bst_type == CS35L41_EXT_BOOST) {	934	if (cs35l41->hw_cfg.bst_type == CS35L41_EXT_BOOST) {

sound/soc/codecs/cs35l45.c+5−7

 static int cs35l45_amplifier_mode_get(struct snd_kcontrol *kcontrol,
 				      struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-			snd_soc_kcontrol_component(kcontrol);
 	struct cs35l45_private *cs35l45 =
 			snd_soc_component_get_drvdata(component);
 static int cs35l45_amplifier_mode_put(struct snd_kcontrol *kcontrol,
 				      struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-			snd_soc_kcontrol_component(kcontrol);
 	struct cs35l45_private *cs35l45 =
 			snd_soc_component_get_drvdata(component);
 	struct snd_soc_dapm_context *dapm =
-			snd_soc_component_get_dapm(component);
+			snd_soc_component_to_dapm(component);
 	unsigned int amp_state;
 	int ret;
 	regmap_clear_bits(cs35l45->regmap, CS35L45_BLOCK_ENABLES,
 				  CS35L45_AMP_EN_MASK);
-	snd_soc_component_disable_pin_unlocked(component, "SPK");
+	snd_soc_dapm_disable_pin_unlocked(dapm, "SPK");
 	snd_soc_dapm_sync_unlocked(dapm);
 	if (ucontrol->value.integer.value[0] == AMP_MODE_SPK) {
 		regmap_set_bits(cs35l45->regmap, CS35L45_BLOCK_ENABLES,
 				CS35L45_AMP_EN_MASK);
-	snd_soc_component_enable_pin_unlocked(component, "SPK");
+	snd_soc_dapm_enable_pin_unlocked(dapm, "SPK");
 	snd_soc_dapm_sync_unlocked(dapm);
 	snd_soc_dapm_mutex_unlock(dapm);

sound/soc/codecs/cs35l56-shared.c+412−27

@@ -6,11 +6,18 @@ · 5 unmodified lines
6	// Cirrus Logic International Semiconductor Ltd.	6	// Cirrus Logic International Semiconductor Ltd.
7		7
8	#include <linux/array_size.h>	8	#include <linux/array_size.h>
		9	#include <linux/cleanup.h>
		10	#include <linux/debugfs.h>
9	#include <linux/firmware/cirrus/wmfw.h>	11	#include <linux/firmware/cirrus/wmfw.h>
		12	#include <linux/fs.h>
10	#include <linux/gpio/consumer.h>	13	#include <linux/gpio/consumer.h>
		14	#include <linux/kstrtox.h>
11	#include <linux/regmap.h>	15	#include <linux/regmap.h>
12	#include <linux/regulator/consumer.h>	16	#include <linux/regulator/consumer.h>
13	#include <linux/spi/spi.h>	17	#include <linux/spi/spi.h>
		18	#include <linux/stddef.h>
		19	#include <linux/string.h>
		20	#include <linux/string_choices.h>
14	#include <linux/types.h>	21	#include <linux/types.h>
15	#include <sound/cs-amp-lib.h>	22	#include <sound/cs-amp-lib.h>
16		23
@@ -206,6 +213,8 @@ static bool cs35l56_readable_reg(struct device *dev, unsigned int reg) · 189 unmodified lines
206	case CS35L56_IRQ1_MASK_8:	213	case CS35L56_IRQ1_MASK_8:
207	case CS35L56_IRQ1_MASK_18:	214	case CS35L56_IRQ1_MASK_18:
208	case CS35L56_IRQ1_MASK_20:	215	case CS35L56_IRQ1_MASK_20:
		216	case CS35L56_MIXER_NGATE_CH1_CFG:
		217	case CS35L56_MIXER_NGATE_CH2_CFG:
209	case CS35L56_DSP_VIRTUAL1_MBOX_1:	218	case CS35L56_DSP_VIRTUAL1_MBOX_1:
210	case CS35L56_DSP_VIRTUAL1_MBOX_2:	219	case CS35L56_DSP_VIRTUAL1_MBOX_2:
211	case CS35L56_DSP_VIRTUAL1_MBOX_3:	220	case CS35L56_DSP_VIRTUAL1_MBOX_3:
@@ -263,6 +272,8 @@ static bool cs35l56_common_volatile_reg(unsigned int reg) · 51 unmodified lines
263	case CS35L56_IRQ1_EINT_1 ... CS35L56_IRQ1_EINT_8:	272	case CS35L56_IRQ1_EINT_1 ... CS35L56_IRQ1_EINT_8:
264	case CS35L56_IRQ1_EINT_18:	273	case CS35L56_IRQ1_EINT_18:
265	case CS35L56_IRQ1_EINT_20:	274	case CS35L56_IRQ1_EINT_20:
		275	case CS35L56_MIXER_NGATE_CH1_CFG:
		276	case CS35L56_MIXER_NGATE_CH2_CFG:
266	case CS35L56_DSP_VIRTUAL1_MBOX_1:	277	case CS35L56_DSP_VIRTUAL1_MBOX_1:
267	case CS35L56_DSP_VIRTUAL1_MBOX_2:	278	case CS35L56_DSP_VIRTUAL1_MBOX_2:
268	case CS35L56_DSP_VIRTUAL1_MBOX_3:	279	case CS35L56_DSP_VIRTUAL1_MBOX_3:
@@ -724,15 +735,11 @@ static void cs35l56_issue_wake_event(struct cs35l56_base *cs35l56_base) · 455 unmodified lines
724	cs35l56_wait_control_port_ready();	735	cs35l56_wait_control_port_ready();
725	}	736	}
726		737
727	int cs35l56_runtime_suspend_common(struct cs35l56_base *cs35l56_base)	738	static int cs35l56_wait_for_ps3(struct cs35l56_base *cs35l56_base)
728	{	739	{
729	unsigned int val;	740	unsigned int val;
730	int ret;	741	int ret;
731		742
732	if (!cs35l56_base->init_done)
733	return 0;
734
735	/* Firmware must have entered a power-save state */
736	ret = regmap_read_poll_timeout(cs35l56_base->regmap,	743	ret = regmap_read_poll_timeout(cs35l56_base->regmap,
737	cs35l56_base->fw_reg->transducer_actual_ps,	744	cs35l56_base->fw_reg->transducer_actual_ps,
738	val, (val >= CS35L56_PS3),	745	val, (val >= CS35L56_PS3),
@@ -741,6 +748,17 @@ int cs35l56_runtime_suspend_common(struct cs35l56_base *cs35l56_base) · 2 unmodified lines
741	if (ret)	748	if (ret)
742	dev_warn(cs35l56_base->dev, "PS3 wait failed: %d\n", ret);	749	dev_warn(cs35l56_base->dev, "PS3 wait failed: %d\n", ret);
743		750
		751	return ret;
		752	}
		753
		754	int cs35l56_runtime_suspend_common(struct cs35l56_base *cs35l56_base)
		755	{
		756	if (!cs35l56_base->init_done)
		757	return 0;
		758
		759	/* Firmware must have entered a power-save state */
		760	cs35l56_wait_for_ps3(cs35l56_base);
		761
744	/* Clear BOOT_DONE so it can be used to detect a reboot */	762	/* Clear BOOT_DONE so it can be used to detect a reboot */
745	regmap_write(cs35l56_base->regmap, CS35L56_IRQ1_EINT_4, CS35L56_OTP_BOOT_DONE_MASK);	763	regmap_write(cs35l56_base->regmap, CS35L56_IRQ1_EINT_4, CS35L56_OTP_BOOT_DONE_MASK);
746		764
@@ -839,6 +857,8 @@ void cs35l56_init_cs_dsp(struct cs35l56_base cs35l56_base, struct cs_dsp cs_ds · 92 unmodified lines
839	cs_dsp->mem = cs35l56_dsp1_regions;	857	cs_dsp->mem = cs35l56_dsp1_regions;
840	cs_dsp->num_mems = ARRAY_SIZE(cs35l56_dsp1_regions);	858	cs_dsp->num_mems = ARRAY_SIZE(cs35l56_dsp1_regions);
841	cs_dsp->no_core_startstop = true;	859	cs_dsp->no_core_startstop = true;
		860
		861	cs35l56_base->dsp = cs_dsp;
842	}	862	}
843	EXPORT_SYMBOL_NS_GPL(cs35l56_init_cs_dsp, "SND_SOC_CS35L56_SHARED");	863	EXPORT_SYMBOL_NS_GPL(cs35l56_init_cs_dsp, "SND_SOC_CS35L56_SHARED");
844		864
@@ -853,7 +873,7 @@ struct cs35l56_pte { · 8 unmodified lines
853	} __packed;	873	} __packed;
854	static_assert((sizeof(struct cs35l56_pte) % sizeof(u32)) == 0);	874	static_assert((sizeof(struct cs35l56_pte) % sizeof(u32)) == 0);
855		875
856	static int cs35l56_read_silicon_uid(struct cs35l56_base cs35l56_base, u64 uid)	876	static int cs35l56_read_silicon_uid(struct cs35l56_base *cs35l56_base)
857	{	877	{
858	struct cs35l56_pte pte;	878	struct cs35l56_pte pte;
859	u64 unique_id;	879	u64 unique_id;
@@ -870,14 +890,15 @@ static int cs35l56_read_silicon_uid(struct cs35l56_base cs35l56_base, u64 uid) · 10 unmodified lines
870	unique_id \|= (u32)pte.x \| ((u32)pte.y << 8) \| ((u32)pte.wafer_id << 16) \|	890	unique_id \|= (u32)pte.x \| ((u32)pte.y << 8) \| ((u32)pte.wafer_id << 16) \|
871	((u32)pte.dvs << 24);	891	((u32)pte.dvs << 24);
872		892
873	*uid = unique_id;	893	cs35l56_base->silicon_uid = unique_id;
874		894
875	return 0;	895	return 0;
876	}	896	}
877		897
878	static int cs35l63_read_silicon_uid(struct cs35l56_base cs35l56_base, u64 uid)	898	static int cs35l63_read_silicon_uid(struct cs35l56_base *cs35l56_base)
879	{	899	{
880	u32 tmp[2];	900	u32 tmp[2];
		901	u64 unique_id;
881	int ret;	902	int ret;
882		903
883	ret = regmap_bulk_read(cs35l56_base->regmap, CS35L56_DIE_STS1, tmp, ARRAY_SIZE(tmp));	904	ret = regmap_bulk_read(cs35l56_base->regmap, CS35L56_DIE_STS1, tmp, ARRAY_SIZE(tmp));
@@ -886,9 +907,11 @@ static int cs35l63_read_silicon_uid(struct cs35l56_base cs35l56_base, u64 uid) · 2 unmodified lines
886	return ret;	907	return ret;
887	}	908	}
888		909
889	*uid = tmp[1];	910	unique_id = tmp[1];
890	*uid <<= 32;	911	unique_id <<= 32;
891	*uid \|= tmp[0];	912	unique_id \|= tmp[0];
		913
		914	cs35l56_base->silicon_uid = unique_id;
892		915
893	return 0;	916	return 0;
894	}	917	}
@@ -915,48 +938,378 @@ static const struct cirrus_amp_cal_controls cs35l63_calibration_controls = { · 20 unmodified lines
915		938
916	int cs35l56_get_calibration(struct cs35l56_base *cs35l56_base)	939	int cs35l56_get_calibration(struct cs35l56_base *cs35l56_base)
917	{	940	{
918	u64 silicon_uid = 0;
919	int ret;	941	int ret;
920		942
921	/* Driver can't apply calibration to a secured part, so skip */	943	/* Driver can't apply calibration to a secured part, so skip */
922	if (cs35l56_base->secured)	944	if (cs35l56_base->secured)
923	return 0;	945	return 0;
924		946
		947	ret = cs_amp_get_efi_calibration_data(cs35l56_base->dev,
		948	cs35l56_base->silicon_uid,
		949	cs35l56_base->cal_index,
		950	&cs35l56_base->cal_data);
		951
		952	/* Only return an error status if probe should be aborted */
		953	if ((ret == -ENOENT) \|\| (ret == -EOVERFLOW))
		954	return 0;
		955
		956	if (ret < 0)
		957	return ret;
		958
		959	cs35l56_base->cal_data_valid = true;
		960
		961	return 0;
		962	}
		963	EXPORT_SYMBOL_NS_GPL(cs35l56_get_calibration, "SND_SOC_CS35L56_SHARED");
		964
		965	int cs35l56_stash_calibration(struct cs35l56_base *cs35l56_base,
		966	const struct cirrus_amp_cal_data *data)
		967	{
		968
		969	/* Ignore if it is empty */
		970	if (!data->calTime[0] && !data->calTime[1])
		971	return -ENODATA;
		972
		973	if (cs_amp_cal_target_u64(data) != cs35l56_base->silicon_uid) {
		974	dev_err(cs35l56_base->dev, "cal_data not for this silicon ID\n");
		975	return -EINVAL;
		976	}
		977
		978	cs35l56_base->cal_data = *data;
		979	cs35l56_base->cal_data_valid = true;
		980
		981	return 0;
		982	}
		983	EXPORT_SYMBOL_NS_GPL(cs35l56_stash_calibration, "SND_SOC_CS35L56_SHARED");
		984
		985	static int cs35l56_perform_calibration(struct cs35l56_base *cs35l56_base)
		986	{
		987	const struct cirrus_amp_cal_controls *calibration_controls =
		988	cs35l56_base->calibration_controls;
		989	struct cs_dsp *dsp = cs35l56_base->dsp;
		990	struct cirrus_amp_cal_data cal_data;
		991	struct cs_dsp_coeff_ctl *ctl;
		992	bool ngate_ch1_was_enabled = false;
		993	bool ngate_ch2_was_enabled = false;
		994	int cali_norm_en_alg_id, cali_norm_en_mem;
		995	int ret;
		996	__be32 val;
		997
		998	if (cs35l56_base->silicon_uid == 0) {
		999	dev_err(cs35l56_base->dev, "Cannot calibrate: no silicon UID\n");
		1000	return -ENXIO;
		1001	}
		1002
925	switch (cs35l56_base->type) {	1003	switch (cs35l56_base->type) {
926	case 0x54:	1004	case 0x54:
927	case 0x56:	1005	case 0x56:
928	case 0x57:	1006	case 0x57:
929	ret = cs35l56_read_silicon_uid(cs35l56_base, &silicon_uid);	1007	if (cs35l56_base->rev < 0xb2) {
930	break;	1008	cali_norm_en_alg_id = 0x9f22f;
931	case 0x63:	1009	cali_norm_en_mem = WMFW_ADSP2_YM;
932	ret = cs35l63_read_silicon_uid(cs35l56_base, &silicon_uid);	1010	} else {
		1011	cali_norm_en_alg_id = 0x9f210;
		1012	cali_norm_en_mem = WMFW_ADSP2_XM;
		1013	}
933	break;	1014	break;
934	default:	1015	default:
935	ret = -ENODEV;	1016	cali_norm_en_alg_id = 0xbf210;
		1017	cali_norm_en_mem = WMFW_ADSP2_XM;
936	break;	1018	break;
937	}	1019	}
938		1020
		1021	ret = pm_runtime_resume_and_get(cs35l56_base->dev);
		1022	if (ret)
		1023	return ret;
		1024
		1025	ret = cs35l56_wait_for_ps3(cs35l56_base);
		1026	if (ret) {
		1027	ret = -EBUSY;
		1028	goto err_pm_put;
		1029	}
		1030
		1031	regmap_update_bits_check(cs35l56_base->regmap, CS35L56_MIXER_NGATE_CH1_CFG,
		1032	CS35L56_AUX_NGATE_CHn_EN, 0, &ngate_ch1_was_enabled);
		1033	regmap_update_bits_check(cs35l56_base->regmap, CS35L56_MIXER_NGATE_CH2_CFG,
		1034	CS35L56_AUX_NGATE_CHn_EN, 0, &ngate_ch2_was_enabled);
		1035
		1036	scoped_guard(mutex, &dsp->pwr_lock) {
		1037	ctl = cs_dsp_get_ctl(dsp,
		1038	calibration_controls->status,
		1039	calibration_controls->mem_region,
		1040	calibration_controls->alg_id);
		1041	if (!ctl) {
		1042	dev_err(cs35l56_base->dev, "Could not get %s control\n",
		1043	calibration_controls->status);
		1044	ret = -EIO;
		1045	goto err;
		1046	}
		1047
		1048	val = cpu_to_be32(0);
		1049	ret = cs_dsp_coeff_write_ctrl(cs_dsp_get_ctl(dsp,
		1050	"CALI_NORM_EN",
		1051	cali_norm_en_mem,
		1052	cali_norm_en_alg_id),
		1053	0, &val, sizeof(val));
		1054	if (ret < 0) {
		1055	dev_err(cs35l56_base->dev, "Could not write %s: %d\n", "CALI_NORM_EN", ret);
		1056	ret = -EIO;
		1057	goto err;
		1058	}
		1059
		1060	ret = cs35l56_mbox_send(cs35l56_base, CS35L56_MBOX_CMD_AUDIO_CALIBRATION);
		1061	if (ret) {
		1062	ret = -EIO;
		1063	goto err;
		1064	}
		1065
		1066	if (read_poll_timeout(cs_dsp_coeff_read_ctrl, ret,
		1067	(val == cpu_to_be32(1)),
		1068	CS35L56_CALIBRATION_POLL_US,
		1069	CS35L56_CALIBRATION_TIMEOUT_US,
		1070	true,
		1071	ctl, 0, &val, sizeof(val))) {
		1072	dev_err(cs35l56_base->dev, "Calibration timed out (CAL_STATUS: %u)\n",
		1073	be32_to_cpu(val));
		1074	switch (be32_to_cpu(val)) {
		1075	case CS35L56_CAL_STATUS_OUT_OF_RANGE:
		1076	ret = -ERANGE;
		1077	goto err;
		1078	default:
		1079	ret = -ETIMEDOUT;
		1080	goto err;
		1081	}
		1082	}
		1083	}
		1084
		1085	cs35l56_base->cal_data_valid = false;
		1086	memset(&cal_data, 0, sizeof(cal_data));
		1087	ret = cs_amp_read_cal_coeffs(dsp, calibration_controls, &cal_data);
		1088	if (ret) {
		1089	ret = -EIO;
		1090	goto err;
		1091	}
		1092
		1093	dev_info(cs35l56_base->dev, "Cal status:%d calR:%d ambient:%d\n",
		1094	cal_data.calStatus, cal_data.calR, cal_data.calAmbient);
		1095
		1096	cal_data.calTarget[0] = (u32)cs35l56_base->silicon_uid;
		1097	cal_data.calTarget[1] = (u32)(cs35l56_base->silicon_uid >> 32);
		1098	cs35l56_base->cal_data = cal_data;
		1099	cs35l56_base->cal_data_valid = true;
		1100
		1101	ret = 0;
		1102
		1103	err:
		1104	if (ngate_ch1_was_enabled) {
		1105	regmap_set_bits(cs35l56_base->regmap, CS35L56_MIXER_NGATE_CH1_CFG,
		1106	CS35L56_AUX_NGATE_CHn_EN);
		1107	}
		1108	if (ngate_ch2_was_enabled) {
		1109	regmap_set_bits(cs35l56_base->regmap, CS35L56_MIXER_NGATE_CH2_CFG,
		1110	CS35L56_AUX_NGATE_CHn_EN);
		1111	}
		1112	err_pm_put:
		1113	pm_runtime_put(cs35l56_base->dev);
		1114
		1115	return ret;
		1116	}
		1117
		1118	ssize_t cs35l56_calibrate_debugfs_write(struct cs35l56_base *cs35l56_base,
		1119	const char __user *from, size_t count,
		1120	loff_t *ppos)
		1121	{
		1122	static const char * const options[] = { "factory", "store_uefi" };
		1123	char buf[11] = { 0 };
		1124	int num_amps, ret;
		1125
		1126	if (!IS_ENABLED(CONFIG_SND_SOC_CS35L56_CAL_DEBUGFS_COMMON))
		1127	return -ENXIO;
		1128
		1129	if (*ppos)
		1130	return -EINVAL;
		1131
		1132	ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, from, count);
939	if (ret < 0)	1133	if (ret < 0)
940	return ret;	1134	return ret;
941		1135
942	dev_dbg(cs35l56_base->dev, "UniqueID = %#llx\n", silicon_uid);	1136	switch (sysfs_match_string(options, buf)) {
		1137	case 0:
		1138	ret = cs35l56_perform_calibration(cs35l56_base);
		1139	if (ret < 0)
		1140	return ret;
		1141	break;
		1142	case 1:
		1143	if (!cs35l56_base->cal_data_valid)
		1144	return -ENODATA;
		1145
		1146	num_amps = cs35l56_base->num_amps;
		1147	if (num_amps == 0)
		1148	num_amps = -1;
		1149
		1150	ret = cs_amp_set_efi_calibration_data(cs35l56_base->dev,
		1151	cs35l56_base->cal_index,
		1152	num_amps,
		1153	&cs35l56_base->cal_data);
		1154	if (ret < 0)
		1155	return ret;
		1156	break;
		1157	default:
		1158	return -EOPNOTSUPP;
		1159	}
943		1160
944	ret = cs_amp_get_efi_calibration_data(cs35l56_base->dev, silicon_uid,	1161	return count;
945	cs35l56_base->cal_index,	1162	}
946	&cs35l56_base->cal_data);	1163	EXPORT_SYMBOL_NS_GPL(cs35l56_calibrate_debugfs_write, "SND_SOC_CS35L56_SHARED");
947		1164
948	/* Only return an error status if probe should be aborted */	1165	ssize_t cs35l56_cal_ambient_debugfs_write(struct cs35l56_base *cs35l56_base,
949	if ((ret == -ENOENT) \|\| (ret == -EOVERFLOW))	1166	const char __user *from, size_t count,
950	return 0;	1167	loff_t *ppos)
		1168	{
		1169	unsigned long val;
		1170	int ret;
		1171
		1172	if (!IS_ENABLED(CONFIG_SND_SOC_CS35L56_CAL_DEBUGFS_COMMON))
		1173	return -ENXIO;
		1174
		1175	if (*ppos)
		1176	return -EINVAL;
		1177
		1178	ret = pm_runtime_resume_and_get(cs35l56_base->dev);
		1179	if (ret)
		1180	return ret;
		1181
		1182	ret = kstrtoul_from_user(from, count, 10, &val);
		1183	if (ret < 0)
		1184	goto out;
		1185
		1186	ret = cs_amp_write_ambient_temp(cs35l56_base->dsp, cs35l56_base->calibration_controls, val);
		1187	if (ret)
		1188	ret = -EIO;
		1189	out:
		1190	pm_runtime_put(cs35l56_base->dev);
951		1191
952	if (ret < 0)	1192	if (ret < 0)
953	return ret;	1193	return ret;
954		1194
955	cs35l56_base->cal_data_valid = true;	1195	return count;
		1196	}
		1197	EXPORT_SYMBOL_NS_GPL(cs35l56_cal_ambient_debugfs_write, "SND_SOC_CS35L56_SHARED");
956		1198
957	return 0;	1199	ssize_t cs35l56_cal_data_debugfs_read(struct cs35l56_base *cs35l56_base,
		1200	char __user *to, size_t count,
		1201	loff_t *ppos)
		1202	{
		1203	if (!IS_ENABLED(CONFIG_SND_SOC_CS35L56_CAL_DEBUGFS_COMMON))
		1204	return -ENXIO;
		1205
		1206	if (!cs35l56_base->cal_data_valid)
		1207	return 0;
		1208
		1209	return simple_read_from_buffer(to, count, ppos, &cs35l56_base->cal_data,
		1210	sizeof(cs35l56_base->cal_data));
958	}	1211	}
959	EXPORT_SYMBOL_NS_GPL(cs35l56_get_calibration, "SND_SOC_CS35L56_SHARED");	1212	EXPORT_SYMBOL_NS_GPL(cs35l56_cal_data_debugfs_read, "SND_SOC_CS35L56_SHARED");
		1213
		1214	ssize_t cs35l56_cal_data_debugfs_write(struct cs35l56_base *cs35l56_base,
		1215	const char __user *from, size_t count,
		1216	loff_t *ppos)
		1217	{
		1218	struct cirrus_amp_cal_data cal_data;
		1219	int ret;
		1220
		1221	if (!IS_ENABLED(CONFIG_SND_SOC_CS35L56_CAL_DEBUGFS_COMMON))
		1222	return -ENXIO;
		1223
		1224	/* Only allow a full blob to be written */
		1225	if (*ppos \|\| (count != sizeof(cal_data)))
		1226	return -EMSGSIZE;
		1227
		1228	ret = simple_write_to_buffer(&cal_data, sizeof(cal_data), ppos, from, count);
		1229	if (ret)
		1230	return ret;
		1231
		1232	ret = cs35l56_stash_calibration(cs35l56_base, &cal_data);
		1233	if (ret)
		1234	return ret;
		1235
		1236	return count;
		1237	}
		1238	EXPORT_SYMBOL_NS_GPL(cs35l56_cal_data_debugfs_write, "SND_SOC_CS35L56_SHARED");
		1239
		1240	void cs35l56_create_cal_debugfs(struct cs35l56_base *cs35l56_base,
		1241	const struct cs35l56_cal_debugfs_fops *fops)
		1242	{
		1243	if (!IS_ENABLED(CONFIG_SND_SOC_CS35L56_CAL_DEBUGFS_COMMON))
		1244	return;
		1245
		1246	cs35l56_base->debugfs = cs_amp_create_debugfs(cs35l56_base->dev);
		1247
		1248	debugfs_create_file("calibrate",
		1249	0200, cs35l56_base->debugfs, cs35l56_base,
		1250	&fops->calibrate);
		1251	debugfs_create_file("cal_temperature",
		1252	0200, cs35l56_base->debugfs, cs35l56_base,
		1253	&fops->cal_temperature);
		1254	debugfs_create_file("cal_data",
		1255	0644, cs35l56_base->debugfs, cs35l56_base,
		1256	&fops->cal_data);
		1257	}
		1258	EXPORT_SYMBOL_NS_GPL(cs35l56_create_cal_debugfs, "SND_SOC_CS35L56_SHARED");
		1259
		1260	void cs35l56_remove_cal_debugfs(struct cs35l56_base *cs35l56_base)
		1261	{
		1262	debugfs_remove_recursive(cs35l56_base->debugfs);
		1263	}
		1264	EXPORT_SYMBOL_NS_GPL(cs35l56_remove_cal_debugfs, "SND_SOC_CS35L56_SHARED");
		1265
		1266	const char * const cs35l56_cal_set_status_text[] = {
		1267	"Unknown", "Default", "Set",
		1268	};
		1269	EXPORT_SYMBOL_NS_GPL(cs35l56_cal_set_status_text, "SND_SOC_CS35L56_SHARED");
		1270
		1271	int cs35l56_cal_set_status_get(struct cs35l56_base *cs35l56_base,
		1272	struct snd_ctl_elem_value *uvalue)
		1273	{
		1274	struct cs_dsp *dsp = cs35l56_base->dsp;
		1275	__be32 cal_set_status_be;
		1276	int alg_id;
		1277	int ret;
		1278
		1279	switch (cs35l56_base->type) {
		1280	case 0x54:
		1281	case 0x56:
		1282	case 0x57:
		1283	alg_id = 0x9f210;
		1284	break;
		1285	default:
		1286	alg_id = 0xbf210;
		1287	break;
		1288	}
		1289
		1290	scoped_guard(mutex, &dsp->pwr_lock) {
		1291	ret = cs_dsp_coeff_read_ctrl(cs_dsp_get_ctl(dsp,
		1292	"CAL_SET_STATUS",
		1293	WMFW_ADSP2_YM, alg_id),
		1294	0, &cal_set_status_be,
		1295	sizeof(cal_set_status_be));
		1296	}
		1297	if (ret) {
		1298	uvalue->value.enumerated.item[0] = CS35L56_CAL_SET_STATUS_UNKNOWN;
		1299	return 0;
		1300	}
		1301
		1302	switch (be32_to_cpu(cal_set_status_be)) {
		1303	case CS35L56_CAL_SET_STATUS_DEFAULT:
		1304	case CS35L56_CAL_SET_STATUS_SET:
		1305	uvalue->value.enumerated.item[0] = be32_to_cpu(cal_set_status_be);
		1306	return 0;
		1307	default:
		1308	uvalue->value.enumerated.item[0] = CS35L56_CAL_SET_STATUS_UNKNOWN;
		1309	return 0;
		1310	}
		1311	}
		1312	EXPORT_SYMBOL_NS_GPL(cs35l56_cal_set_status_get, "SND_SOC_CS35L56_SHARED");
960		1313
961	int cs35l56_read_prot_status(struct cs35l56_base *cs35l56_base,	1314	int cs35l56_read_prot_status(struct cs35l56_base *cs35l56_base,
962	bool fw_missing, unsigned int fw_version)	1315	bool fw_missing, unsigned int fw_version)
@@ -984,6 +1337,23 @@ int cs35l56_read_prot_status(struct cs35l56_base *cs35l56_base, · 21 unmodified lines
984	}	1337	}
985	EXPORT_SYMBOL_NS_GPL(cs35l56_read_prot_status, "SND_SOC_CS35L56_SHARED");	1338	EXPORT_SYMBOL_NS_GPL(cs35l56_read_prot_status, "SND_SOC_CS35L56_SHARED");
986		1339
		1340	void cs35l56_warn_if_firmware_missing(struct cs35l56_base *cs35l56_base)
		1341	{
		1342	unsigned int firmware_version;
		1343	bool firmware_missing;
		1344	int ret;
		1345
		1346	ret = cs35l56_read_prot_status(cs35l56_base, &firmware_missing, &firmware_version);
		1347	if (ret)
		1348	return;
		1349
		1350	if (!firmware_missing)
		1351	return;
		1352
		1353	dev_warn(cs35l56_base->dev, "FIRMWARE_MISSING\n");
		1354	}
		1355	EXPORT_SYMBOL_NS_GPL(cs35l56_warn_if_firmware_missing, "SND_SOC_CS35L56_SHARED");
		1356
987	void cs35l56_log_tuning(struct cs35l56_base cs35l56_base, struct cs_dsp cs_dsp)	1357	void cs35l56_log_tuning(struct cs35l56_base cs35l56_base, struct cs_dsp cs_dsp)
988	{	1358	{
989	__be32 pid, sid, tid;	1359	__be32 pid, sid, tid;
@@ -1111,6 +1481,21 @@ int cs35l56_hw_init(struct cs35l56_base *cs35l56_base) · 121 unmodified lines
1111	CS35L56_TEMP_ERR_EINT1_MASK,	1481	CS35L56_TEMP_ERR_EINT1_MASK,
1112	0);	1482	0);
1113		1483
		1484	switch (cs35l56_base->type) {
		1485	case 0x54:
		1486	case 0x56:
		1487	case 0x57:
		1488	ret = cs35l56_read_silicon_uid(cs35l56_base);
		1489	break;
		1490	default:
		1491	ret = cs35l63_read_silicon_uid(cs35l56_base);
		1492	break;
		1493	}
		1494	if (ret)
		1495	return ret;
		1496
		1497	dev_dbg(cs35l56_base->dev, "SiliconID = %#llx\n", cs35l56_base->silicon_uid);
		1498
1114	return 0;	1499	return 0;
1115	}	1500	}
1116	EXPORT_SYMBOL_NS_GPL(cs35l56_hw_init, "SND_SOC_CS35L56_SHARED");	1501	EXPORT_SYMBOL_NS_GPL(cs35l56_hw_init, "SND_SOC_CS35L56_SHARED");

sound/soc/codecs/cs35l56.c+251−1

@@ -10,6 +10,7 @@ · 9 unmodified lines
10	#include <linux/completion.h>	10	#include <linux/completion.h>
11	#include <linux/debugfs.h>	11	#include <linux/debugfs.h>
12	#include <linux/delay.h>	12	#include <linux/delay.h>
		13	#include <linux/device.h>
13	#include <linux/err.h>	14	#include <linux/err.h>
14	#include <linux/gpio/consumer.h>	15	#include <linux/gpio/consumer.h>
15	#include <linux/interrupt.h>	16	#include <linux/interrupt.h>
@@ -65,6 +66,18 @@ static int cs35l56_dspwait_put_volsw(struct snd_kcontrol *kcontrol, · 49 unmodified lines
65		66
66	static DECLARE_TLV_DB_SCALE(vol_tlv, -10000, 25, 0);	67	static DECLARE_TLV_DB_SCALE(vol_tlv, -10000, 25, 0);
67		68
		69	static SOC_ENUM_SINGLE_DECL(cs35l56_cal_set_status_enum, SND_SOC_NOPM, 0,
		70	cs35l56_cal_set_status_text);
		71
		72	static int cs35l56_cal_set_status_ctl_get(struct snd_kcontrol *kcontrol,
		73	struct snd_ctl_elem_value *ucontrol)
		74	{
		75	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
		76	struct cs35l56_private *cs35l56 = snd_soc_component_get_drvdata(component);
		77
		78	return cs35l56_cal_set_status_get(&cs35l56->base, ucontrol);
		79	}
		80
68	static const struct snd_kcontrol_new cs35l56_controls[] = {	81	static const struct snd_kcontrol_new cs35l56_controls[] = {
69	SOC_SINGLE_EXT("Speaker Switch",	82	SOC_SINGLE_EXT("Speaker Switch",
70	CS35L56_MAIN_RENDER_USER_MUTE, 0, 1, 1,	83	CS35L56_MAIN_RENDER_USER_MUTE, 0, 1, 1,
@@ -82,6 +95,9 @@ static const struct snd_kcontrol_new cs35l56_controls[] = { · 11 unmodified lines
82	SOC_SINGLE_EXT("Posture Number", CS35L56_MAIN_POSTURE_NUMBER,	95	SOC_SINGLE_EXT("Posture Number", CS35L56_MAIN_POSTURE_NUMBER,
83	0, 255, 0,	96	0, 255, 0,
84	cs35l56_dspwait_get_volsw, cs35l56_dspwait_put_volsw),	97	cs35l56_dspwait_get_volsw, cs35l56_dspwait_put_volsw),
		98	SOC_ENUM_EXT_ACC("CAL_SET_STATUS", cs35l56_cal_set_status_enum,
		99	cs35l56_cal_set_status_ctl_get, NULL,
		100	SNDRV_CTL_ELEM_ACCESS_READ \| SNDRV_CTL_ELEM_ACCESS_VOLATILE),
85	};	101	};
86		102
87	static const struct snd_kcontrol_new cs35l63_controls[] = {	103	static const struct snd_kcontrol_new cs35l63_controls[] = {
@@ -101,6 +117,9 @@ static const struct snd_kcontrol_new cs35l63_controls[] = { · 13 unmodified lines
101	SOC_SINGLE_EXT("Posture Number", CS35L63_MAIN_POSTURE_NUMBER,	117	SOC_SINGLE_EXT("Posture Number", CS35L63_MAIN_POSTURE_NUMBER,
102	0, 255, 0,	118	0, 255, 0,
103	cs35l56_dspwait_get_volsw, cs35l56_dspwait_put_volsw),	119	cs35l56_dspwait_get_volsw, cs35l56_dspwait_put_volsw),
		120	SOC_ENUM_EXT_ACC("CAL_SET_STATUS", cs35l56_cal_set_status_enum,
		121	cs35l56_cal_set_status_ctl_get, NULL,
		122	SNDRV_CTL_ELEM_ACCESS_READ \| SNDRV_CTL_ELEM_ACCESS_VOLATILE),
104	};	123	};
105		124
106	static SOC_VALUE_ENUM_SINGLE_DECL(cs35l56_asp1tx1_enum,	125	static SOC_VALUE_ENUM_SINGLE_DECL(cs35l56_asp1tx1_enum,
@@ -250,6 +269,8 @@ static const struct snd_soc_dapm_widget cs35l56_dapm_widgets[] = { · 143 unmodified lines
250	SND_SOC_DAPM_SIGGEN("VDDBMON ADC"),	269	SND_SOC_DAPM_SIGGEN("VDDBMON ADC"),
251	SND_SOC_DAPM_SIGGEN("VBSTMON ADC"),	270	SND_SOC_DAPM_SIGGEN("VBSTMON ADC"),
252	SND_SOC_DAPM_SIGGEN("TEMPMON ADC"),	271	SND_SOC_DAPM_SIGGEN("TEMPMON ADC"),
		272
		273	SND_SOC_DAPM_INPUT("Calibrate"),
253	};	274	};
254		275
255	#define CS35L56_SRC_ROUTE(name) \	276	#define CS35L56_SRC_ROUTE(name) \
@@ -286,6 +307,7 @@ static const struct snd_soc_dapm_route cs35l56_audio_map[] = { · 30 unmodified lines
286	{ "DSP1", NULL, "ASP1RX1" },	307	{ "DSP1", NULL, "ASP1RX1" },
287	{ "DSP1", NULL, "ASP1RX2" },	308	{ "DSP1", NULL, "ASP1RX2" },
288	{ "DSP1", NULL, "SDW1 Playback" },	309	{ "DSP1", NULL, "SDW1 Playback" },
		310	{ "DSP1", NULL, "Calibrate" },
289	{ "AMP", NULL, "DSP1" },	311	{ "AMP", NULL, "DSP1" },
290	{ "SPK", NULL, "AMP" },	312	{ "SPK", NULL, "AMP" },
291		313
@@ -801,6 +823,9 @@ static void cs35l56_patch(struct cs35l56_private *cs35l56, bool firmware_missing · 509 unmodified lines
801	goto err_unlock;	823	goto err_unlock;
802	}	824	}
803		825
		826	/* Check if the firmware is still reported missing */
		827	cs35l56_warn_if_firmware_missing(&cs35l56->base);
		828
804	regmap_clear_bits(cs35l56->base.regmap,	829	regmap_clear_bits(cs35l56->base.regmap,
805	cs35l56->base.fw_reg->prot_sts,	830	cs35l56->base.fw_reg->prot_sts,
806	CS35L56_FIRMWARE_MISSING);	831	CS35L56_FIRMWARE_MISSING);
@@ -874,6 +899,214 @@ err: · 67 unmodified lines
874	pm_runtime_put_autosuspend(cs35l56->base.dev);	899	pm_runtime_put_autosuspend(cs35l56->base.dev);
875	}	900	}
876		901
		902	static struct snd_soc_dapm_context cs35l56_power_up_for_cal(struct cs35l56_private cs35l56)
		903	{
		904	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(cs35l56->component);
		905	int ret;
		906
		907	ret = snd_soc_dapm_enable_pin(dapm, "Calibrate");
		908	if (ret)
		909	return ERR_PTR(ret);
		910
		911	snd_soc_dapm_sync(dapm);
		912
		913	return dapm;
		914	}
		915
		916	static void cs35l56_power_down_after_cal(struct cs35l56_private *cs35l56)
		917	{
		918	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(cs35l56->component);
		919
		920	snd_soc_dapm_disable_pin(dapm, "Calibrate");
		921	snd_soc_dapm_sync(dapm);
		922	}
		923
		924	static ssize_t cs35l56_debugfs_calibrate_write(struct file *file,
		925	const char __user *from,
		926	size_t count, loff_t *ppos)
		927	{
		928	struct cs35l56_base *cs35l56_base = file->private_data;
		929	struct cs35l56_private *cs35l56 = cs35l56_private_from_base(cs35l56_base);
		930	struct snd_soc_dapm_context *dapm;
		931	ssize_t ret;
		932
		933	dapm = cs35l56_power_up_for_cal(cs35l56);
		934	if (IS_ERR(dapm))
		935	return PTR_ERR(dapm);
		936
		937	snd_soc_dapm_mutex_lock(dapm);
		938	ret = cs35l56_calibrate_debugfs_write(&cs35l56->base, from, count, ppos);
		939	snd_soc_dapm_mutex_unlock(dapm);
		940
		941	cs35l56_power_down_after_cal(cs35l56);
		942
		943	return ret;
		944	}
		945
		946	static ssize_t cs35l56_debugfs_cal_temperature_write(struct file *file,
		947	const char __user *from,
		948	size_t count, loff_t *ppos)
		949	{
		950	struct cs35l56_base *cs35l56_base = file->private_data;
		951	struct cs35l56_private *cs35l56 = cs35l56_private_from_base(cs35l56_base);
		952	struct snd_soc_dapm_context *dapm;
		953	ssize_t ret;
		954
		955	dapm = cs35l56_power_up_for_cal(cs35l56);
		956	if (IS_ERR(dapm))
		957	return PTR_ERR(dapm);
		958
		959	ret = cs35l56_cal_ambient_debugfs_write(&cs35l56->base, from, count, ppos);
		960	cs35l56_power_down_after_cal(cs35l56);
		961
		962	return ret;
		963	}
		964
		965	static ssize_t cs35l56_debugfs_cal_data_read(struct file *file,
		966	char __user *to,
		967	size_t count, loff_t *ppos)
		968	{
		969	struct cs35l56_base *cs35l56_base = file->private_data;
		970	struct cs35l56_private *cs35l56 = cs35l56_private_from_base(cs35l56_base);
		971	struct snd_soc_dapm_context *dapm;
		972	ssize_t ret;
		973
		974	dapm = cs35l56_power_up_for_cal(cs35l56);
		975	if (IS_ERR(dapm))
		976	return PTR_ERR(dapm);
		977
		978	ret = cs35l56_cal_data_debugfs_read(&cs35l56->base, to, count, ppos);
		979	cs35l56_power_down_after_cal(cs35l56);
		980
		981	return ret;
		982	}
		983
		984	static int cs35l56_new_cal_data_apply(struct cs35l56_private *cs35l56)
		985	{
		986	struct snd_soc_dapm_context *dapm;
		987	int ret;
		988
		989	if (!cs35l56->base.cal_data_valid)
		990	return -ENXIO;
		991
		992	if (cs35l56->base.secured)
		993	return -EACCES;
		994
		995	dapm = cs35l56_power_up_for_cal(cs35l56);
		996	if (IS_ERR(dapm))
		997	return PTR_ERR(dapm);
		998
		999	snd_soc_dapm_mutex_lock(dapm);
		1000	ret = cs_amp_write_cal_coeffs(&cs35l56->dsp.cs_dsp,
		1001	cs35l56->base.calibration_controls,
		1002	&cs35l56->base.cal_data);
		1003	if (ret == 0)
		1004	cs35l56_mbox_send(&cs35l56->base, CS35L56_MBOX_CMD_AUDIO_REINIT);
		1005	else
		1006	ret = -EIO;
		1007
		1008	snd_soc_dapm_mutex_unlock(dapm);
		1009	cs35l56_power_down_after_cal(cs35l56);
		1010
		1011	return ret;
		1012	}
		1013
		1014	static ssize_t cs35l56_debugfs_cal_data_write(struct file *file,
		1015	const char __user *from,
		1016	size_t count, loff_t *ppos)
		1017	{
		1018	struct cs35l56_base *cs35l56_base = file->private_data;
		1019	struct cs35l56_private *cs35l56 = cs35l56_private_from_base(cs35l56_base);
		1020	int ret;
		1021
		1022	ret = cs35l56_cal_data_debugfs_write(&cs35l56->base, from, count, ppos);
		1023	if (ret == -ENODATA)
		1024	return count; /* Ignore writes of empty cal blobs */
		1025	else if (ret < 0)
		1026	return -EIO;
		1027
		1028	ret = cs35l56_new_cal_data_apply(cs35l56);
		1029	if (ret)
		1030	return ret;
		1031
		1032	return count;
		1033	}
		1034
		1035	static const struct cs35l56_cal_debugfs_fops cs35l56_cal_debugfs_fops = {
		1036	.calibrate = {
		1037	.write = cs35l56_debugfs_calibrate_write,
		1038	},
		1039	.cal_temperature = {
		1040	.write = cs35l56_debugfs_cal_temperature_write,
		1041	},
		1042	.cal_data = {
		1043	.read = cs35l56_debugfs_cal_data_read,
		1044	.write = cs35l56_debugfs_cal_data_write,
		1045	},
		1046	};
		1047
		1048	static int cs35l56_cal_data_rb_ctl_get(struct snd_kcontrol *kcontrol,
		1049	struct snd_ctl_elem_value *ucontrol)
		1050	{
		1051	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
		1052	struct cs35l56_private *cs35l56 = snd_soc_component_get_drvdata(component);
		1053
		1054	if (!cs35l56->base.cal_data_valid)
		1055	return -ENODATA;
		1056
		1057	memcpy(ucontrol->value.bytes.data, &cs35l56->base.cal_data,
		1058	sizeof(cs35l56->base.cal_data));
		1059
		1060	return 0;
		1061	}
		1062
		1063	static int cs35l56_cal_data_ctl_get(struct snd_kcontrol *kcontrol,
		1064	struct snd_ctl_elem_value *ucontrol)
		1065	{
		1066	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
		1067	struct cs35l56_private *cs35l56 = snd_soc_component_get_drvdata(component);
		1068
		1069	/*
		1070	* This control is write-only but mixer libraries often try to read
		1071	* a control before writing it. So we have to implement read.
		1072	* Return zeros so a write of valid data will always be a change
		1073	* from its "current value".
		1074	*/
		1075	memset(ucontrol->value.bytes.data, 0, sizeof(cs35l56->base.cal_data));
		1076
		1077	return 0;
		1078	}
		1079
		1080	static int cs35l56_cal_data_ctl_set(struct snd_kcontrol *kcontrol,
		1081	struct snd_ctl_elem_value *ucontrol)
		1082	{
		1083	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
		1084	struct cs35l56_private *cs35l56 = snd_soc_component_get_drvdata(component);
		1085	const struct cirrus_amp_cal_data cal_data = (const void )ucontrol->value.bytes.data;
		1086	int ret;
		1087
		1088	if (cs35l56->base.cal_data_valid)
		1089	return -EACCES;
		1090
		1091	ret = cs35l56_stash_calibration(&cs35l56->base, cal_data);
		1092	if (ret)
		1093	return ret;
		1094
		1095	ret = cs35l56_new_cal_data_apply(cs35l56);
		1096	if (ret < 0)
		1097	return ret;
		1098
		1099	return 1;
		1100	}
		1101
		1102	static const struct snd_kcontrol_new cs35l56_cal_data_restore_controls[] = {
		1103	SND_SOC_BYTES_E("CAL_DATA", 0, sizeof(struct cirrus_amp_cal_data) / sizeof(u32),
		1104	cs35l56_cal_data_ctl_get, cs35l56_cal_data_ctl_set),
		1105	SND_SOC_BYTES_E_ACC("CAL_DATA_RB", 0, sizeof(struct cirrus_amp_cal_data) / sizeof(u32),
		1106	cs35l56_cal_data_rb_ctl_get, NULL,
		1107	SNDRV_CTL_ELEM_ACCESS_READ \| SNDRV_CTL_ELEM_ACCESS_VOLATILE),
		1108	};
		1109
877	static int cs35l56_set_fw_suffix(struct cs35l56_private *cs35l56)	1110	static int cs35l56_set_fw_suffix(struct cs35l56_private *cs35l56)
878	{	1111	{
879	if (cs35l56->dsp.fwf_suffix)	1112	if (cs35l56->dsp.fwf_suffix)
@@ -904,6 +1137,7 @@ static int cs35l56_set_fw_suffix(struct cs35l56_private *cs35l56) · 24 unmodified lines
904		1137
905	static int cs35l56_component_probe(struct snd_soc_component *component)	1138	static int cs35l56_component_probe(struct snd_soc_component *component)
906	{	1139	{
		1140	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
907	struct cs35l56_private *cs35l56 = snd_soc_component_get_drvdata(component);	1141	struct cs35l56_private *cs35l56 = snd_soc_component_get_drvdata(component);
908	struct dentry *debugfs_root = component->debugfs_root;	1142	struct dentry *debugfs_root = component->debugfs_root;
909	unsigned short vendor, device;	1143	unsigned short vendor, device;
@@ -968,9 +1202,22 @@ static int cs35l56_component_probe(struct snd_soc_component *component) · 58 unmodified lines
968	break;	1202	break;
969	}	1203	}
970		1204
		1205	if (!ret && IS_ENABLED(CONFIG_SND_SOC_CS35L56_CAL_SET_CTRL)) {
		1206	ret = snd_soc_add_component_controls(component,
		1207	cs35l56_cal_data_restore_controls,
		1208	ARRAY_SIZE(cs35l56_cal_data_restore_controls));
		1209	}
		1210
971	if (ret)	1211	if (ret)
972	return dev_err_probe(cs35l56->base.dev, ret, "unable to add controls\n");	1212	return dev_err_probe(cs35l56->base.dev, ret, "unable to add controls\n");
973		1213
		1214	ret = snd_soc_dapm_disable_pin(dapm, "Calibrate");
		1215	if (ret)
		1216	return ret;
		1217
		1218	if (IS_ENABLED(CONFIG_SND_SOC_CS35L56_CAL_DEBUGFS))
		1219	cs35l56_create_cal_debugfs(&cs35l56->base, &cs35l56_cal_debugfs_fops);
		1220
974	queue_work(cs35l56->dsp_wq, &cs35l56->dsp_work);	1221	queue_work(cs35l56->dsp_wq, &cs35l56->dsp_work);
975		1222
976	return 0;	1223	return 0;
@@ -982,6 +1229,8 @@ static void cs35l56_component_remove(struct snd_soc_component *component) · 5 unmodified lines
982		1229
983	cancel_work_sync(&cs35l56->dsp_work);	1230	cancel_work_sync(&cs35l56->dsp_work);
984		1231
		1232	cs35l56_remove_cal_debugfs(&cs35l56->base);
		1233
985	if (cs35l56->dsp.cs_dsp.booted)	1234	if (cs35l56->dsp.cs_dsp.booted)
986	wm_adsp_power_down(&cs35l56->dsp);	1235	wm_adsp_power_down(&cs35l56->dsp);
987		1236
@@ -1000,6 +1249,7 @@ static int cs35l56_set_bias_level(struct snd_soc_component *component, · 12 unmodified lines
1000	enum snd_soc_bias_level level)	1249	enum snd_soc_bias_level level)
1001	{	1250	{
1002	struct cs35l56_private *cs35l56 = snd_soc_component_get_drvdata(component);	1251	struct cs35l56_private *cs35l56 = snd_soc_component_get_drvdata(component);
		1252	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
1003		1253
1004	switch (level) {	1254	switch (level) {
1005	case SND_SOC_BIAS_STANDBY:	1255	case SND_SOC_BIAS_STANDBY:
@@ -1007,7 +1257,7 @@ static int cs35l56_set_bias_level(struct snd_soc_component *component, · 1 unmodified line
1007	* Wait for patching to complete when transitioning from	1257	* Wait for patching to complete when transitioning from
1008	* BIAS_OFF to BIAS_STANDBY	1258	* BIAS_OFF to BIAS_STANDBY
1009	*/	1259	*/
1010	if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF)	1260	if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF)
1011	cs35l56_wait_dsp_ready(cs35l56);	1261	cs35l56_wait_dsp_ready(cs35l56);
1012		1262
1013	break;	1263	break;

sound/soc/codecs/cs35l56.h+6−0

 #define CS35L56_H
 #include <linux/completion.h>
+#include <linux/container_of.h>
 #include <linux/regulator/consumer.h>
 #include <linux/pm_runtime.h>
 #include <linux/workqueue.h>
 	u8 sdw_unique_id;
 };
+static inline struct cs35l56_private *cs35l56_private_from_base(struct cs35l56_base *cs35l56_base)
+{
+	return container_of(cs35l56_base, struct cs35l56_private, base);
+}
 extern const struct dev_pm_ops cs35l56_pm_ops_i2c_spi;
 int cs35l56_system_suspend(struct device *dev);

sound/soc/codecs/cs4234.c+4−3

 static int cs4234_dac14_grp_delay_put(struct snd_kcontrol *kctrl,
 				      struct snd_ctl_elem_value *uctrl)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kctrl);
+	struct snd_soc_component *component = snd_kcontrol_chip(kctrl);
 	struct cs4234 *cs4234 = snd_soc_component_get_drvdata(component);
-	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	unsigned int val = 0;
 	int ret = 0;
 				 enum snd_soc_bias_level level)
 {
 	struct cs4234 *cs4234 = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	switch (level) {
 	case SND_SOC_BIAS_PREPARE:
-		switch (snd_soc_component_get_bias_level(component)) {
+		switch (snd_soc_dapm_get_bias_level(dapm)) {
 		case SND_SOC_BIAS_STANDBY:
 			wait_for_completion(&cs4234->vq_ramp_complete);
 			break;

sound/soc/codecs/cs4270.c+1−1

@@ -433,7 +433,7 @@ static int cs4270_dai_mute(struct snd_soc_dai *dai, int mute, int direction) · 432 unmodified lines
433	static int cs4270_soc_put_mute(struct snd_kcontrol *kcontrol,	433	static int cs4270_soc_put_mute(struct snd_kcontrol *kcontrol,
434	struct snd_ctl_elem_value *ucontrol)	434	struct snd_ctl_elem_value *ucontrol)
435	{	435	{
436	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	436	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
437	struct cs4270_private *cs4270 = snd_soc_component_get_drvdata(component);	437	struct cs4270_private *cs4270 = snd_soc_component_get_drvdata(component);
438	int left = !ucontrol->value.integer.value[0];	438	int left = !ucontrol->value.integer.value[0];
439	int right = !ucontrol->value.integer.value[1];	439	int right = !ucontrol->value.integer.value[1];

sound/soc/codecs/cs4271.c+30−6

  * DAPM support not implemented.
  */
+#include <linux/clk.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 	/* enable soft reset workaround */
 	bool				enable_soft_reset;
 	struct regulator_bulk_data      supplies[ARRAY_SIZE(supply_names)];
+	struct clk *clk;
 };
 static const struct snd_soc_dapm_widget cs4271_dapm_widgets[] = {
 static int cs4271_get_deemph(struct snd_kcontrol *kcontrol,
 			     struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct cs4271_private *cs4271 = snd_soc_component_get_drvdata(component);
 	ucontrol->value.integer.value[0] = cs4271->deemph;
 static int cs4271_put_deemph(struct snd_kcontrol *kcontrol,
 			     struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct cs4271_private *cs4271 = snd_soc_component_get_drvdata(component);
 	cs4271->deemph = ucontrol->value.integer.value[0];
 		return ret;
 	regcache_mark_dirty(cs4271->regmap);
+	clk_disable_unprepare(cs4271->clk);
 	regulator_bulk_disable(ARRAY_SIZE(cs4271->supplies), cs4271->supplies);
 	return 0;
 		return ret;
 	}
+	ret = clk_prepare_enable(cs4271->clk);
+	if (ret) {
+		dev_err(component->dev, "Failed to enable clk: %d\n", ret);
+		return ret;
+	}
 	/* Do a proper reset after power up */
 	cs4271_reset(component);
 		cs4271->enable_soft_reset = cs4271plat->enable_soft_reset;
 	}
+	ret = clk_prepare_enable(cs4271->clk);
+	if (ret) {
+		dev_err(component->dev, "Failed to enable clk: %d\n", ret);
+		goto err_disable_regulators;
+	}
 	/* Reset codec */
 	cs4271_reset(component);
 	ret = regcache_sync(cs4271->regmap);
 	if (ret < 0)
-		goto err_disable_regulator;
+		goto err_disable_clk;
 	ret = regmap_update_bits(cs4271->regmap, CS4271_MODE2,
 				 CS4271_MODE2_PDN | CS4271_MODE2_CPEN,
 				 CS4271_MODE2_PDN | CS4271_MODE2_CPEN);
 	if (ret < 0)
-		goto err_disable_regulator;
+		goto err_disable_clk;
 	ret = regmap_update_bits(cs4271->regmap, CS4271_MODE2,
 				 CS4271_MODE2_PDN, 0);
 	if (ret < 0)
-		goto err_disable_regulator;
+		goto err_disable_clk;
 	/* Power-up sequence requires 85 uS */
 	udelay(85);
 	return 0;
-err_disable_regulator:
+err_disable_clk:
+	clk_disable_unprepare(cs4271->clk);
+err_disable_regulators:
 	regulator_bulk_disable(ARRAY_SIZE(cs4271->supplies), cs4271->supplies);
 	return ret;
 }
 	regcache_mark_dirty(cs4271->regmap);
 	regulator_bulk_disable(ARRAY_SIZE(cs4271->supplies), cs4271->supplies);
+	clk_disable_unprepare(cs4271->clk);
 };
 static const struct snd_soc_component_driver soc_component_dev_cs4271 = {
 				     "error retrieving RESET GPIO\n");
 	gpiod_set_consumer_name(cs4271->reset, "CS4271 Reset");
+	cs4271->clk = devm_clk_get_optional(dev, "mclk");
+	if (IS_ERR(cs4271->clk))
+		return dev_err_probe(dev, PTR_ERR(cs4271->clk), "Failed to get mclk\n");
 	for (i = 0; i < ARRAY_SIZE(supply_names); i++)
 		cs4271->supplies[i].supply = supply_names[i];

sound/soc/codecs/cs42l42.c+1−1

@@ -403,7 +403,7 @@ static DECLARE_TLV_DB_SCALE(mixer_tlv, -6300, 100, true); · 402 unmodified lines
403	static int cs42l42_slow_start_put(struct snd_kcontrol *kcontrol,	403	static int cs42l42_slow_start_put(struct snd_kcontrol *kcontrol,
404	struct snd_ctl_elem_value *ucontrol)	404	struct snd_ctl_elem_value *ucontrol)
405	{	405	{
406	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	406	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
407	u8 val;	407	u8 val;
408		408
409	/* all bits of SLOW_START_EN must change together */	409	/* all bits of SLOW_START_EN must change together */

sound/soc/codecs/cs42l43-jack.c+7−7

sound/soc/codecs/cs42l43.c+19−19

sound/soc/codecs/cs42l51.c+3−3

sound/soc/codecs/cs42l52.c+3−2

 					enum snd_soc_bias_level level)
 {
 	struct cs42l52_private *cs42l52 = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	switch (level) {
 	case SND_SOC_BIAS_ON:
 				    CS42L52_PWRCTL1_PDN_CODEC, 0);
 		break;
 	case SND_SOC_BIAS_STANDBY:
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) {
 			regcache_cache_only(cs42l52->regmap, false);
 			regcache_sync(cs42l52->regmap);
 		}
 	struct cs42l52_private *cs42l52 =
 		container_of(work, struct cs42l52_private, beep_work);
 	struct snd_soc_component *component = cs42l52->component;
-	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	int i;
 	int val = 0;
 	int best = 0;

sound/soc/codecs/cs42l56.c+3−2

 					enum snd_soc_bias_level level)
 {
 	struct cs42l56_private *cs42l56 = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	int ret;
 	switch (level) {
 				    CS42L56_PDN_ALL_MASK, 0);
 		break;
 	case SND_SOC_BIAS_STANDBY:
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) {
 			regcache_cache_only(cs42l56->regmap, false);
 			regcache_sync(cs42l56->regmap);
 			ret = regulator_bulk_enable(ARRAY_SIZE(cs42l56->supplies),
 	struct cs42l56_private *cs42l56 =
 		container_of(work, struct cs42l56_private, beep_work);
 	struct snd_soc_component *component = cs42l56->component;
-	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	int i;
 	int val = 0;
 	int best = 0;

sound/soc/codecs/cs42l73.c+2−1

 				  enum snd_soc_bias_level level)
 {
 	struct cs42l73_private *cs42l73 = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	switch (level) {
 	case SND_SOC_BIAS_ON:
 		break;
 	case SND_SOC_BIAS_STANDBY:
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) {
 			regcache_cache_only(cs42l73->regmap, false);
 			regcache_sync(cs42l73->regmap);
 		}

sound/soc/codecs/cs42l84.c+2−2

@@ -84,7 +84,7 @@ static const struct regmap_config cs42l84_regmap = { · 83 unmodified lines
84	static int cs42l84_put_dac_vol(struct snd_kcontrol *kctl,	84	static int cs42l84_put_dac_vol(struct snd_kcontrol *kctl,
85	struct snd_ctl_elem_value *val)	85	struct snd_ctl_elem_value *val)
86	{	86	{
87	struct snd_soc_component *component = snd_soc_kcontrol_component(kctl);	87	struct snd_soc_component *component = snd_kcontrol_chip(kctl);
88	struct soc_mixer_control mc = (struct soc_mixer_control ) kctl->private_value;	88	struct soc_mixer_control mc = (struct soc_mixer_control ) kctl->private_value;
89	int vola, volb;	89	int vola, volb;
90	int ret, ret2, updated = 0;	90	int ret, ret2, updated = 0;
@@ -138,7 +138,7 @@ bail: · 47 unmodified lines
138	static int cs42l84_get_dac_vol(struct snd_kcontrol *kctl,	138	static int cs42l84_get_dac_vol(struct snd_kcontrol *kctl,
139	struct snd_ctl_elem_value *val)	139	struct snd_ctl_elem_value *val)
140	{	140	{
141	struct snd_soc_component *component = snd_soc_kcontrol_component(kctl);	141	struct snd_soc_component *component = snd_kcontrol_chip(kctl);
142	struct soc_mixer_control mc = (struct soc_mixer_control ) kctl->private_value;	142	struct soc_mixer_control mc = (struct soc_mixer_control ) kctl->private_value;
143	int vola, volb;	143	int vola, volb;
144	int ret;	144	int ret;

sound/soc/codecs/cs42xx8.c+1−1

@@ -465,7 +465,7 @@ EXPORT_SYMBOL_GPL(cs42xx8_regmap_config); · 464 unmodified lines
465	static int cs42xx8_component_probe(struct snd_soc_component *component)	465	static int cs42xx8_component_probe(struct snd_soc_component *component)
466	{	466	{
467	struct cs42xx8_priv *cs42xx8 = snd_soc_component_get_drvdata(component);	467	struct cs42xx8_priv *cs42xx8 = snd_soc_component_get_drvdata(component);
468	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	468	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
469		469
470	switch (cs42xx8->drvdata->num_adcs) {	470	switch (cs42xx8->drvdata->num_adcs) {
471	case 3:	471	case 3:

sound/soc/codecs/cs43130.c+1−1

@@ -1062,7 +1062,7 @@ static int cs43130_pcm_ch_put(struct snd_kcontrol *kcontrol, · 1061 unmodified lines
1062	{	1062	{
1063	struct soc_enum e = (struct soc_enum )kcontrol->private_value;	1063	struct soc_enum e = (struct soc_enum )kcontrol->private_value;
1064	unsigned int *item = ucontrol->value.enumerated.item;	1064	unsigned int *item = ucontrol->value.enumerated.item;
1065	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	1065	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
1066	struct cs43130_private *cs43130 = snd_soc_component_get_drvdata(component);	1066	struct cs43130_private *cs43130 = snd_soc_component_get_drvdata(component);
1067	unsigned int val;	1067	unsigned int val;
1068		1068

sound/soc/codecs/cs47l15.c+5−6

 static int cs47l15_in1_adc_get(struct snd_kcontrol *kcontrol,
 			       struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-		snd_soc_kcontrol_component(kcontrol);
 	struct cs47l15 *cs47l15 = snd_soc_component_get_drvdata(component);
 	ucontrol->value.integer.value[0] = !!cs47l15->in1_lp_mode;
 static int cs47l15_in1_adc_put(struct snd_kcontrol *kcontrol,
 			       struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-		snd_soc_kcontrol_component(kcontrol);
 	struct cs47l15 *cs47l15 = snd_soc_component_get_drvdata(component);
 	if (!!ucontrol->value.integer.value[0] == cs47l15->in1_lp_mode)
 static int cs47l15_component_probe(struct snd_soc_component *component)
 {
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	struct cs47l15 *cs47l15 = snd_soc_component_get_drvdata(component);
 	struct madera *madera = cs47l15->core.madera;
 	int ret;
 	snd_soc_component_init_regmap(component, madera->regmap);
 	mutex_lock(&madera->dapm_ptr_lock);
-	madera->dapm = snd_soc_component_get_dapm(component);
+	madera->dapm = snd_soc_component_to_dapm(component);
 	mutex_unlock(&madera->dapm_ptr_lock);
 	ret = madera_init_inputs(component);
 	if (ret)
 		return ret;
-	snd_soc_component_disable_pin(component, "HAPTICS");
+	snd_soc_dapm_disable_pin(dapm, "HAPTICS");
 	ret = snd_soc_add_component_controls(component,
 					     madera_adsp_rate_controls,

sound/soc/codecs/cs47l24.c+2−2

@@ -1124,7 +1124,7 @@ static irqreturn_t cs47l24_adsp2_irq(int irq, void *data) · 1123 unmodified lines
1124		1124
1125	static int cs47l24_component_probe(struct snd_soc_component *component)	1125	static int cs47l24_component_probe(struct snd_soc_component *component)
1126	{	1126	{
1127	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	1127	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
1128	struct cs47l24_priv *priv = snd_soc_component_get_drvdata(component);	1128	struct cs47l24_priv *priv = snd_soc_component_get_drvdata(component);
1129	struct arizona *arizona = priv->core.arizona;	1129	struct arizona *arizona = priv->core.arizona;
1130	int ret;	1130	int ret;
@@ -1153,7 +1153,7 @@ static int cs47l24_component_probe(struct snd_soc_component *component) · 22 unmodified lines
1153	if (ret)	1153	if (ret)
1154	goto err_adsp2_codec_probe;	1154	goto err_adsp2_codec_probe;
1155		1155
1156	snd_soc_component_disable_pin(component, "HAPTICS");	1156	snd_soc_dapm_disable_pin(dapm, "HAPTICS");
1157		1157
1158	return 0;	1158	return 0;
1159		1159

sound/soc/codecs/cs47l35.c+3−2

 static int cs47l35_component_probe(struct snd_soc_component *component)
 {
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	struct cs47l35 *cs47l35 = snd_soc_component_get_drvdata(component);
 	struct madera *madera = cs47l35->core.madera;
 	int i, ret;
 	snd_soc_component_init_regmap(component, madera->regmap);
 	mutex_lock(&madera->dapm_ptr_lock);
-	madera->dapm = snd_soc_component_get_dapm(component);
+	madera->dapm = snd_soc_component_to_dapm(component);
 	mutex_unlock(&madera->dapm_ptr_lock);
 	ret = madera_init_inputs(component);
 	if (ret)
 		return ret;
-	snd_soc_component_disable_pin(component, "HAPTICS");
+	snd_soc_dapm_disable_pin(dapm, "HAPTICS");
 	ret = snd_soc_add_component_controls(component,
 					     madera_adsp_rate_controls,

sound/soc/codecs/cs47l85.c+3−2

 static int cs47l85_component_probe(struct snd_soc_component *component)
 {
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	struct cs47l85 *cs47l85 = snd_soc_component_get_drvdata(component);
 	struct madera *madera = cs47l85->core.madera;
 	int i, ret;
 	snd_soc_component_init_regmap(component, madera->regmap);
 	mutex_lock(&madera->dapm_ptr_lock);
-	madera->dapm = snd_soc_component_get_dapm(component);
+	madera->dapm = snd_soc_component_to_dapm(component);
 	mutex_unlock(&madera->dapm_ptr_lock);
 	ret = madera_init_inputs(component);
 	if (ret)
 		return ret;
-	snd_soc_component_disable_pin(component, "HAPTICS");
+	snd_soc_dapm_disable_pin(dapm, "HAPTICS");
 	ret = snd_soc_add_component_controls(component,
 					     madera_adsp_rate_controls,

sound/soc/codecs/cs47l90.c+3−2

 static int cs47l90_component_probe(struct snd_soc_component *component)
 {
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	struct cs47l90 *cs47l90 = snd_soc_component_get_drvdata(component);
 	struct madera *madera = cs47l90->core.madera;
 	int ret, i;
 	snd_soc_component_init_regmap(component, madera->regmap);
 	mutex_lock(&madera->dapm_ptr_lock);
-	madera->dapm = snd_soc_component_get_dapm(component);
+	madera->dapm = snd_soc_component_to_dapm(component);
 	mutex_unlock(&madera->dapm_ptr_lock);
 	ret = madera_init_inputs(component);
 	if (ret)
 		return ret;
-	snd_soc_component_disable_pin(component, "HAPTICS");
+	snd_soc_dapm_disable_pin(dapm, "HAPTICS");
 	ret = snd_soc_add_component_controls(component,
 					     madera_adsp_rate_controls,

sound/soc/codecs/cs47l92.c+5−6

 static int cs47l92_put_demux(struct snd_kcontrol *kcontrol,
 			     struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol);
-		snd_soc_dapm_kcontrol_component(kcontrol);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
-	struct snd_soc_dapm_context *dapm =
-		snd_soc_component_get_dapm(component);
 	struct cs47l92 *cs47l92 = snd_soc_component_get_drvdata(component);
 	struct madera_priv *priv = &cs47l92->core;
 	struct madera *madera = priv->madera;
 static int cs47l92_component_probe(struct snd_soc_component *component)
 {
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	struct cs47l92 *cs47l92 = snd_soc_component_get_drvdata(component);
 	struct madera *madera = cs47l92->core.madera;
 	int ret;
 	snd_soc_component_init_regmap(component, madera->regmap);
 	mutex_lock(&madera->dapm_ptr_lock);
-	madera->dapm = snd_soc_component_get_dapm(component);
+	madera->dapm = snd_soc_component_to_dapm(component);
 	mutex_unlock(&madera->dapm_ptr_lock);
 	ret = madera_init_inputs(component);
 	if (ret)
 		return ret;
-	snd_soc_component_disable_pin(component, "HAPTICS");
+	snd_soc_dapm_disable_pin(dapm, "HAPTICS");
 	ret = snd_soc_add_component_controls(component,
 					     madera_adsp_rate_controls,

sound/soc/codecs/cs48l32.c+20−20

sound/soc/codecs/cs530x-i2c.c+20−4

 //
 // CS530x CODEC driver
 //
-// Copyright (C) 2024 Cirrus Logic, Inc. and
+// Copyright (C) 2024-2025 Cirrus Logic, Inc. and
-//                    Cirrus Logic International Semiconductor Ltd.
+//                         Cirrus Logic International Semiconductor Ltd.
 #include <linux/device.h>
 #include <linux/module.h>
 static const struct of_device_id cs530x_of_match[] = {
 	{
+		.compatible = "cirrus,cs4282",
+		.data = (void *)CS4282,
+	}, {
+		.compatible = "cirrus,cs4302",
+		.data = (void *)CS4302,
+	}, {
+		.compatible = "cirrus,cs4304",
+		.data = (void *)CS4304,
+	}, {
+		.compatible = "cirrus,cs4308",
+		.data = (void *)CS4308,
+	}, {
 		.compatible = "cirrus,cs5302",
 		.data = (void *)CS5302,
 	}, {
 MODULE_DEVICE_TABLE(of, cs530x_of_match);
 static const struct i2c_device_id cs530x_i2c_id[] = {
+	{ "cs4282", CS4282 },
+	{ "cs4302", CS4302 },
+	{ "cs4304", CS4304 },
+	{ "cs4308", CS4308 },
 	{ "cs5302", CS5302 },
 	{ "cs5304", CS5304 },
 	{ "cs5308", CS5308 },
 	i2c_set_clientdata(client, cs530x);
-	cs530x->regmap = devm_regmap_init_i2c(client, &cs530x_regmap);
+	cs530x->regmap = devm_regmap_init_i2c(client, &cs530x_regmap_i2c);
 	if (IS_ERR(cs530x->regmap))
 		return dev_err_probe(&client->dev, PTR_ERR(cs530x->regmap),
-			      "Failed to allocate register map\n");
+				     "Failed to allocate register map\n");
 	cs530x->devtype = (uintptr_t)i2c_get_match_data(client);
 	cs530x->dev = &client->dev;

sound/soc/codecs/cs530x-spi.c+92−0

@@ -0,0 +1,92 @@
	1	// SPDX-License-Identifier: GPL-2.0
	2	//
	3	// CS530x CODEC driver
	4	//
	5	// Copyright (C) 2025 Cirrus Logic, Inc. and
	6	// Cirrus Logic International Semiconductor Ltd.
	7
	8	#include <linux/module.h>
	9	#include <linux/platform_device.h>
	10	#include <linux/spi/spi.h>
	11
	12	#include "cs530x.h"
	13
	14	static const struct of_device_id cs530x_of_match[] = {
	15	{
	16	.compatible = "cirrus,cs4282",
	17	.data = (void *)CS4282,
	18	}, {
	19	.compatible = "cirrus,cs4302",
	20	.data = (void *)CS4302,
	21	}, {
	22	.compatible = "cirrus,cs4304",
	23	.data = (void *)CS4304,
	24	}, {
	25	.compatible = "cirrus,cs4308",
	26	.data = (void *)CS4308,
	27	}, {
	28	.compatible = "cirrus,cs5302",
	29	.data = (void *)CS5302,
	30	}, {
	31	.compatible = "cirrus,cs5304",
	32	.data = (void *)CS5304,
	33	}, {
	34	.compatible = "cirrus,cs5304",
	35	.data = (void *)CS5308,
	36	},
	37	{}
	38	};
	39	MODULE_DEVICE_TABLE(of, cs530x_of_match);
	40
	41	static const struct spi_device_id cs530x_spi_id[] = {
	42	{ "cs4282", CS4282 },
	43	{ "cs4302", CS4302 },
	44	{ "cs4304", CS4304 },
	45	{ "cs4308", CS4308 },
	46	{ "cs5302", CS5302 },
	47	{ "cs5304", CS5304 },
	48	{ "cs5308", CS5308 },
	49	{ }
	50	};
	51	MODULE_DEVICE_TABLE(spi, cs530x_spi_id);
	52
	53	static int cs530x_spi_probe(struct spi_device *spi)
	54	{
	55	struct cs530x_priv *cs530x;
	56	struct device *dev = &spi->dev;
	57	int ret;
	58
	59	cs530x = devm_kzalloc(dev, sizeof(struct cs530x_priv), GFP_KERNEL);
	60	if (cs530x == NULL)
	61	return -ENOMEM;
	62
	63	spi_set_drvdata(spi, cs530x);
	64
	65	cs530x->regmap = devm_regmap_init_spi(spi, &cs530x_regmap_spi);
	66	if (IS_ERR(cs530x->regmap)) {
	67	ret = PTR_ERR(cs530x->regmap);
	68	dev_err(dev, "Failed to allocate register map: %d\n", ret);
	69	return ret;
	70	}
	71
	72	cs530x->devtype = (unsigned long)spi_get_device_match_data(spi);
	73	cs530x->dev = &spi->dev;
	74
	75	return cs530x_probe(cs530x);
	76	}
	77
	78	static struct spi_driver cs530x_spi_driver = {
	79	.driver = {
	80	.name = "cs530x",
	81	.of_match_table = cs530x_of_match,
	82	},
	83	.id_table = cs530x_spi_id,
	84	.probe = cs530x_spi_probe,
	85	};
	86
	87	module_spi_driver(cs530x_spi_driver);
	88
	89	MODULE_DESCRIPTION("SPI CS530X driver");
	90	MODULE_IMPORT_NS("SND_SOC_CS530X");
	91	MODULE_AUTHOR("Vitaly Rodionov <vitalyr@opensource.cirrus.com>");
	92	MODULE_LICENSE("GPL");

sound/soc/codecs/cs530x.c+449−77

@@ -2,28 +2,26 @@ · 1 unmodified line
2	//	2	//
3	// CS530x CODEC driver	3	// CS530x CODEC driver
4	//	4	//
5	// Copyright (C) 2024 Cirrus Logic, Inc. and	5	// Copyright (C) 2024-2025 Cirrus Logic, Inc. and
6	// Cirrus Logic International Semiconductor Ltd.	6	// Cirrus Logic International Semiconductor Ltd.
7		7
8	#include <sound/core.h>
9	#include <linux/delay.h>	8	#include <linux/delay.h>
10	#include <linux/i2c.h>	9	#include <linux/i2c.h>
11	#include <linux/init.h>	10	#include <linux/init.h>
12	#include <sound/initval.h>
13	#include <linux/module.h>	11	#include <linux/module.h>
14	#include <sound/pcm.h>
15	#include <sound/pcm_params.h>
16	#include <linux/pm.h>	12	#include <linux/pm.h>
17	#include <linux/property.h>	13	#include <linux/property.h>
18	#include <linux/slab.h>	14	#include <linux/slab.h>
		15	#include <linux/spi/spi.h>
		16	#include <sound/core.h>
		17	#include <sound/initval.h>
		18	#include <sound/pcm.h>
		19	#include <sound/pcm_params.h>
19	#include <sound/soc.h>	20	#include <sound/soc.h>
20	#include <sound/tlv.h>	21	#include <sound/tlv.h>
21		22
22	#include "cs530x.h"	23	#include "cs530x.h"
23		24
24	#define CS530X_MAX_ADC_CH 8
25	#define CS530X_MIN_ADC_CH 2
26
27	static const char *cs530x_supply_names[CS530X_NUM_SUPPLIES] = {	25	static const char *cs530x_supply_names[CS530X_NUM_SUPPLIES] = {
28	"vdd-a",	26	"vdd-a",
29	"vdd-io",	27	"vdd-io",
@@ -48,6 +46,18 @@ static const struct reg_default cs530x_reg_defaults[] = { · 18 unmodified lines
48	{ CS530X_IN_VOL_CTRL3_1, 0x8000 },	46	{ CS530X_IN_VOL_CTRL3_1, 0x8000 },
49	{ CS530X_IN_VOL_CTRL4_0, 0x8000 },	47	{ CS530X_IN_VOL_CTRL4_0, 0x8000 },
50	{ CS530X_IN_VOL_CTRL4_1, 0x8000 },	48	{ CS530X_IN_VOL_CTRL4_1, 0x8000 },
		49	{ CS530X_OUT_ENABLES, 0 },
		50	{ CS530X_OUT_RAMP_SUM, 0x0022 },
		51	{ CS530X_OUT_FILTER, 0 },
		52	{ CS530X_OUT_INV, 0 },
		53	{ CS530X_OUT_VOL_CTRL1_0, 0x8000 },
		54	{ CS530X_OUT_VOL_CTRL1_1, 0x8000 },
		55	{ CS530X_OUT_VOL_CTRL2_0, 0x8000 },
		56	{ CS530X_OUT_VOL_CTRL2_1, 0x8000 },
		57	{ CS530X_OUT_VOL_CTRL3_0, 0x8000 },
		58	{ CS530X_OUT_VOL_CTRL3_1, 0x8000 },
		59	{ CS530X_OUT_VOL_CTRL4_0, 0x8000 },
		60	{ CS530X_OUT_VOL_CTRL4_1, 0x8000 },
51	{ CS530X_PAD_FN, 0 },	61	{ CS530X_PAD_FN, 0 },
52	{ CS530X_PAD_LVL, 0 },	62	{ CS530X_PAD_LVL, 0 },
53	};	63	};
@@ -73,6 +83,19 @@ static bool cs530x_read_and_write_regs(unsigned int reg) · 19 unmodified lines
73	case CS530X_IN_VOL_CTRL3_1:	83	case CS530X_IN_VOL_CTRL3_1:
74	case CS530X_IN_VOL_CTRL4_0:	84	case CS530X_IN_VOL_CTRL4_0:
75	case CS530X_IN_VOL_CTRL4_1:	85	case CS530X_IN_VOL_CTRL4_1:
		86	case CS530X_OUT_ENABLES:
		87	case CS530X_OUT_RAMP_SUM:
		88	case CS530X_OUT_DEEMPH:
		89	case CS530X_OUT_FILTER:
		90	case CS530X_OUT_INV:
		91	case CS530X_OUT_VOL_CTRL1_0:
		92	case CS530X_OUT_VOL_CTRL1_1:
		93	case CS530X_OUT_VOL_CTRL2_0:
		94	case CS530X_OUT_VOL_CTRL2_1:
		95	case CS530X_OUT_VOL_CTRL3_0:
		96	case CS530X_OUT_VOL_CTRL3_1:
		97	case CS530X_OUT_VOL_CTRL4_0:
		98	case CS530X_OUT_VOL_CTRL4_1:
76	case CS530X_PAD_FN:	99	case CS530X_PAD_FN:
77	case CS530X_PAD_LVL:	100	case CS530X_PAD_LVL:
78	return true;	101	return true;
@@ -97,6 +120,7 @@ static bool cs530x_writeable_register(struct device *dev, unsigned int reg) · 18 unmodified lines
97	switch (reg) {	120	switch (reg) {
98	case CS530X_SW_RESET:	121	case CS530X_SW_RESET:
99	case CS530X_IN_VOL_CTRL5:	122	case CS530X_IN_VOL_CTRL5:
		123	case CS530X_OUT_VOL_CTRL5:
100	return true;	124	return true;
101	default:	125	default:
102	return cs530x_read_and_write_regs(reg);	126	return cs530x_read_and_write_regs(reg);
@@ -104,10 +128,10 @@ static bool cs530x_writeable_register(struct device *dev, unsigned int reg) · 1 unmodified line
104	}	128	}
105		129
106	static int cs530x_put_volsw_vu(struct snd_kcontrol *kcontrol,	130	static int cs530x_put_volsw_vu(struct snd_kcontrol *kcontrol,
107	struct snd_ctl_elem_value *ucontrol)	131	struct snd_ctl_elem_value *ucontrol)
108	{	132	{
109	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	133	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
110	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	134	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
111	struct cs530x_priv *cs530x = snd_soc_component_get_drvdata(component);	135	struct cs530x_priv *cs530x = snd_soc_component_get_drvdata(component);
112	struct regmap *regmap = cs530x->regmap;	136	struct regmap *regmap = cs530x->regmap;
113	int ret;	137	int ret;
@@ -118,8 +142,8 @@ static int cs530x_put_volsw_vu(struct snd_kcontrol *kcontrol, · 4 unmodified lines
118	if (ret)	142	if (ret)
119	goto volsw_err;	143	goto volsw_err;
120		144
121	/* Write IN_VU bit for the volume change to take effect */	145	/* Write INOUT_VU bit for the volume change to take effect */
122	regmap_write(regmap, CS530X_IN_VOL_CTRL5, CS530X_IN_VU);	146	regmap_write(regmap, CS530X_IN_VOL_CTRL5, CS530X_INOUT_VU);
123		147
124	volsw_err:	148	volsw_err:
125	snd_soc_dapm_mutex_unlock(dapm);	149	snd_soc_dapm_mutex_unlock(dapm);
@@ -129,7 +153,7 @@ volsw_err: · 3 unmodified lines
129		153
130	static const DECLARE_TLV_DB_SCALE(in_vol_tlv, -1270, 50, 0);	154	static const DECLARE_TLV_DB_SCALE(in_vol_tlv, -1270, 50, 0);
131		155
132	static const char * const cs530x_in_filter_text[] = {	156	static const char * const cs530x_inout_filter_text[] = {
133	"Min Phase Slow Roll-off",	157	"Min Phase Slow Roll-off",
134	"Min Phase Fast Roll-off",	158	"Min Phase Fast Roll-off",
135	"Linear Phase Slow Roll-off",	159	"Linear Phase Slow Roll-off",
@@ -137,24 +161,36 @@ static const char * const cs530x_in_filter_text[] = { · 1 unmodified line
137	};	161	};
138		162
139	static SOC_ENUM_SINGLE_DECL(cs530x_in_filter_enum, CS530X_IN_FILTER,	163	static SOC_ENUM_SINGLE_DECL(cs530x_in_filter_enum, CS530X_IN_FILTER,
140	CS530X_IN_FILTER_SHIFT,	164	CS530X_INOUT_FILTER_SHIFT,
141	cs530x_in_filter_text);	165	cs530x_inout_filter_text);
142		166
143	static const char * const cs530x_in_4ch_sum_text[] = {	167	static SOC_ENUM_SINGLE_DECL(cs530x_out_filter_enum, CS530X_OUT_FILTER,
		168	CS530X_INOUT_FILTER_SHIFT,
		169	cs530x_inout_filter_text);
		170
		171	static const char * const cs530x_4ch_sum_text[] = {
144	"None",	172	"None",
145	"Groups of 2",	173	"Groups of 2",
146	"Groups of 4",	174	"Groups of 4",
147	};	175	};
148		176
149	static SOC_ENUM_SINGLE_DECL(cs530x_in_sum_ch4_enum, CS530X_IN_RAMP_SUM,	177	static SOC_ENUM_SINGLE_DECL(cs530x_in_sum_ch4_enum, CS530X_IN_RAMP_SUM,
150	CS530X_IN_SUM_MODE_SHIFT,	178	CS530X_INOUT_SUM_MODE_SHIFT,
151	cs530x_in_4ch_sum_text);	179	cs530x_4ch_sum_text);
152		180
153	static const struct snd_kcontrol_new cs530x_in_sum_4ch_controls[] = {	181	static const struct snd_kcontrol_new cs530x_in_sum_4ch_controls[] = {
154	SOC_ENUM("IN Sum Select", cs530x_in_sum_ch4_enum),	182	SOC_ENUM("IN Sum Select", cs530x_in_sum_ch4_enum),
155	};	183	};
156		184
157	static const char * const cs530x_in_8ch_sum_text[] = {	185	static SOC_ENUM_SINGLE_DECL(cs530x_out_sum_ch4_enum, CS530X_OUT_RAMP_SUM,
		186	CS530X_INOUT_SUM_MODE_SHIFT,
		187	cs530x_4ch_sum_text);
		188
		189	static const struct snd_kcontrol_new cs530x_out_sum_4ch_controls[] = {
		190	SOC_ENUM("OUT Sum Select", cs530x_out_sum_ch4_enum),
		191	};
		192
		193	static const char * const cs530x_8ch_sum_text[] = {
158	"None",	194	"None",
159	"Groups of 2",	195	"Groups of 2",
160	"Groups of 4",	196	"Groups of 4",
@@ -162,13 +198,20 @@ static const char * const cs530x_in_8ch_sum_text[] = { · 1 unmodified line
162	};	198	};
163		199
164	static SOC_ENUM_SINGLE_DECL(cs530x_in_sum_ch8_enum, CS530X_IN_RAMP_SUM,	200	static SOC_ENUM_SINGLE_DECL(cs530x_in_sum_ch8_enum, CS530X_IN_RAMP_SUM,
165	CS530X_IN_SUM_MODE_SHIFT,	201	CS530X_INOUT_SUM_MODE_SHIFT,
166	cs530x_in_8ch_sum_text);	202	cs530x_8ch_sum_text);
167		203
168	static const struct snd_kcontrol_new cs530x_in_sum_8ch_controls[] = {	204	static const struct snd_kcontrol_new cs530x_in_sum_8ch_controls[] = {
169	SOC_ENUM("IN Sum Select", cs530x_in_sum_ch8_enum),	205	SOC_ENUM("IN Sum Select", cs530x_in_sum_ch8_enum),
170	};	206	};
171		207
		208	static SOC_ENUM_SINGLE_DECL(cs530x_out_sum_ch8_enum, CS530X_OUT_RAMP_SUM,
		209	CS530X_INOUT_SUM_MODE_SHIFT,
		210	cs530x_8ch_sum_text);
		211
		212	static const struct snd_kcontrol_new cs530x_out_sum_8ch_controls[] = {
		213	SOC_ENUM("OUT Sum Select", cs530x_out_sum_ch8_enum),
		214	};
172		215
173	static const char * const cs530x_vol_ramp_text[] = {	216	static const char * const cs530x_vol_ramp_text[] = {
174	"0ms/6dB", "0.5ms/6dB", "1ms/6dB", "2ms/6dB", "4ms/6dB", "8ms/6dB",	217	"0ms/6dB", "0.5ms/6dB", "1ms/6dB", "2ms/6dB", "4ms/6dB", "8ms/6dB",
@@ -193,8 +236,8 @@ SOC_ENUM("IN DEC Filter Select", cs530x_in_filter_enum), · 18 unmodified lines
193	SOC_ENUM("Input Ramp Up", cs530x_ramp_inc_enum),	236	SOC_ENUM("Input Ramp Up", cs530x_ramp_inc_enum),
194	SOC_ENUM("Input Ramp Down", cs530x_ramp_dec_enum),	237	SOC_ENUM("Input Ramp Down", cs530x_ramp_dec_enum),
195		238
196	SOC_SINGLE("ADC1 Invert Switch", CS530X_IN_INV, CS530X_IN1_INV_SHIFT, 1, 0),	239	SOC_SINGLE("ADC1 Invert Switch", CS530X_IN_INV, CS530X_INOUT1_INV_SHIFT, 1, 0),
197	SOC_SINGLE("ADC2 Invert Switch", CS530X_IN_INV, CS530X_IN2_INV_SHIFT, 1, 0),	240	SOC_SINGLE("ADC2 Invert Switch", CS530X_IN_INV, CS530X_INOUT2_INV_SHIFT, 1, 0),
198	};	241	};
199		242
200	static const struct snd_kcontrol_new cs530x_in_3_to_4_controls[] = {	243	static const struct snd_kcontrol_new cs530x_in_3_to_4_controls[] = {
@@ -203,8 +246,8 @@ SOC_SINGLE_EXT_TLV("IN3 Volume", CS530X_IN_VOL_CTRL2_0, 0, 255, 1, · 2 unmodified lines
203	SOC_SINGLE_EXT_TLV("IN4 Volume", CS530X_IN_VOL_CTRL2_1, 0, 255, 1,	246	SOC_SINGLE_EXT_TLV("IN4 Volume", CS530X_IN_VOL_CTRL2_1, 0, 255, 1,
204	snd_soc_get_volsw, cs530x_put_volsw_vu, in_vol_tlv),	247	snd_soc_get_volsw, cs530x_put_volsw_vu, in_vol_tlv),
205		248
206	SOC_SINGLE("ADC3 Invert Switch", CS530X_IN_INV, CS530X_IN3_INV_SHIFT, 1, 0),	249	SOC_SINGLE("ADC3 Invert Switch", CS530X_IN_INV, CS530X_INOUT3_INV_SHIFT, 1, 0),
207	SOC_SINGLE("ADC4 Invert Switch", CS530X_IN_INV, CS530X_IN4_INV_SHIFT, 1, 0),	250	SOC_SINGLE("ADC4 Invert Switch", CS530X_IN_INV, CS530X_INOUT4_INV_SHIFT, 1, 0),
208	};	251	};
209		252
210	static const struct snd_kcontrol_new cs530x_in_5_to_8_controls[] = {	253	static const struct snd_kcontrol_new cs530x_in_5_to_8_controls[] = {
@@ -217,14 +260,14 @@ SOC_SINGLE_EXT_TLV("IN7 Volume", CS530X_IN_VOL_CTRL4_0, 0, 255, 1, · 6 unmodified lines
217	SOC_SINGLE_EXT_TLV("IN8 Volume", CS530X_IN_VOL_CTRL4_1, 0, 255, 1,	260	SOC_SINGLE_EXT_TLV("IN8 Volume", CS530X_IN_VOL_CTRL4_1, 0, 255, 1,
218	snd_soc_get_volsw, cs530x_put_volsw_vu, in_vol_tlv),	261	snd_soc_get_volsw, cs530x_put_volsw_vu, in_vol_tlv),
219		262
220	SOC_SINGLE("ADC5 Invert Switch", CS530X_IN_INV, CS530X_IN5_INV_SHIFT, 1, 0),	263	SOC_SINGLE("ADC5 Invert Switch", CS530X_IN_INV, CS530X_INOUT5_INV_SHIFT, 1, 0),
221	SOC_SINGLE("ADC6 Invert Switch", CS530X_IN_INV, CS530X_IN6_INV_SHIFT, 1, 0),	264	SOC_SINGLE("ADC6 Invert Switch", CS530X_IN_INV, CS530X_INOUT6_INV_SHIFT, 1, 0),
222	SOC_SINGLE("ADC7 Invert Switch", CS530X_IN_INV, CS530X_IN7_INV_SHIFT, 1, 0),	265	SOC_SINGLE("ADC7 Invert Switch", CS530X_IN_INV, CS530X_INOUT7_INV_SHIFT, 1, 0),
223	SOC_SINGLE("ADC8 Invert Switch", CS530X_IN_INV, CS530X_IN8_INV_SHIFT, 1, 0),	266	SOC_SINGLE("ADC8 Invert Switch", CS530X_IN_INV, CS530X_INOUT8_INV_SHIFT, 1, 0),
224	};	267	};
225		268
226	static int cs530x_adc_event(struct snd_soc_dapm_widget *w,	269	static int cs530x_adc_event(struct snd_soc_dapm_widget *w,
227	struct snd_kcontrol *kcontrol, int event)	270	struct snd_kcontrol *kcontrol, int event)
228	{	271	{
229	struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);	272	struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
230	struct cs530x_priv *cs530x = snd_soc_component_get_drvdata(component);	273	struct cs530x_priv *cs530x = snd_soc_component_get_drvdata(component);
@@ -236,24 +279,110 @@ static int cs530x_adc_event(struct snd_soc_dapm_widget *w, · 5 unmodified lines
236	break;	279	break;
237	case SND_SOC_DAPM_POST_PMU:	280	case SND_SOC_DAPM_POST_PMU:
238	regmap_clear_bits(regmap, CS530X_IN_VOL_CTRL1_0 +	281	regmap_clear_bits(regmap, CS530X_IN_VOL_CTRL1_0 +
239	(w->shift * 2), CS530X_IN_MUTE);	282	(w->shift * 2), CS530X_INOUT_MUTE);
240	regmap_clear_bits(regmap, CS530X_IN_VOL_CTRL1_0 +	283	regmap_clear_bits(regmap, CS530X_IN_VOL_CTRL1_0 +
241	((w->shift+1) * 2), CS530X_IN_MUTE);	284	((w->shift + 1) * 2), CS530X_INOUT_MUTE);
242		285
243	cs530x->adc_pairs_count--;	286	cs530x->adc_pairs_count--;
244	if (!cs530x->adc_pairs_count) {	287	if (!cs530x->adc_pairs_count) {
245	usleep_range(1000, 1100);	288	usleep_range(1000, 1100);
246	return regmap_write(regmap, CS530X_IN_VOL_CTRL5,	289	return regmap_write(regmap, CS530X_IN_VOL_CTRL5,
247	CS530X_IN_VU);	290	CS530X_INOUT_VU);
248	}	291	}
249	break;	292	break;
250	case SND_SOC_DAPM_PRE_PMD:	293	case SND_SOC_DAPM_PRE_PMD:
251	regmap_set_bits(regmap, CS530X_IN_VOL_CTRL1_0 +	294	regmap_set_bits(regmap, CS530X_IN_VOL_CTRL1_0 +
252	(w->shift * 2), CS530X_IN_MUTE);	295	(w->shift * 2), CS530X_INOUT_MUTE);
253	regmap_set_bits(regmap, CS530X_IN_VOL_CTRL1_0 +	296	regmap_set_bits(regmap, CS530X_IN_VOL_CTRL1_0 +
254	((w->shift+1) * 2), CS530X_IN_MUTE);	297	((w->shift + 1) * 2), CS530X_INOUT_MUTE);
255	return regmap_write(regmap, CS530X_IN_VOL_CTRL5,	298	return regmap_write(regmap, CS530X_IN_VOL_CTRL5,
256	CS530X_IN_VU);	299	CS530X_INOUT_VU);
		300	default:
		301	return -EINVAL;
		302	}
		303
		304	return 0;
		305	}
		306
		307	static SOC_ENUM_SINGLE_DECL(cs530x_ramp_out_inc_enum, CS530X_OUT_RAMP_SUM,
		308	CS530X_RAMP_RATE_INC_SHIFT,
		309	cs530x_vol_ramp_text);
		310
		311	static SOC_ENUM_SINGLE_DECL(cs530x_ramp_out_dec_enum, CS530X_OUT_RAMP_SUM,
		312	CS530X_RAMP_RATE_DEC_SHIFT,
		313	cs530x_vol_ramp_text);
		314
		315	static const struct snd_kcontrol_new cs530x_out_1_to_2_controls[] = {
		316	SOC_SINGLE_EXT_TLV("OUT1 Volume", CS530X_OUT_VOL_CTRL1_0, 0, 255, 1,
		317	snd_soc_get_volsw, cs530x_put_volsw_vu, in_vol_tlv),
		318	SOC_SINGLE_EXT_TLV("OUT2 Volume", CS530X_OUT_VOL_CTRL1_1, 0, 255, 1,
		319	snd_soc_get_volsw, cs530x_put_volsw_vu, in_vol_tlv),
		320
		321	SOC_ENUM("OUT DEC Filter Select", cs530x_out_filter_enum),
		322	SOC_ENUM("Output Ramp Up", cs530x_ramp_out_inc_enum),
		323	SOC_ENUM("Output Ramp Down", cs530x_ramp_out_dec_enum),
		324
		325	SOC_SINGLE("DAC1 Invert Switch", CS530X_OUT_INV, CS530X_INOUT1_INV_SHIFT, 1, 0),
		326	SOC_SINGLE("DAC2 Invert Switch", CS530X_OUT_INV, CS530X_INOUT2_INV_SHIFT, 1, 0),
		327	};
		328
		329	static const struct snd_kcontrol_new cs530x_out_3_to_4_controls[] = {
		330	SOC_SINGLE_EXT_TLV("OUT3 Volume", CS530X_OUT_VOL_CTRL2_0, 0, 255, 1,
		331	snd_soc_get_volsw, cs530x_put_volsw_vu, in_vol_tlv),
		332	SOC_SINGLE_EXT_TLV("OUT4 Volume", CS530X_OUT_VOL_CTRL2_1, 0, 255, 1,
		333	snd_soc_get_volsw, cs530x_put_volsw_vu, in_vol_tlv),
		334
		335	SOC_SINGLE("DAC3 Invert Switch", CS530X_OUT_INV, CS530X_INOUT3_INV_SHIFT, 1, 0),
		336	SOC_SINGLE("DAC4 Invert Switch", CS530X_OUT_INV, CS530X_INOUT4_INV_SHIFT, 1, 0),
		337	};
		338
		339	static const struct snd_kcontrol_new cs530x_out_5_to_8_controls[] = {
		340	SOC_SINGLE_EXT_TLV("OUT5 Volume", CS530X_OUT_VOL_CTRL3_0, 0, 255, 1,
		341	snd_soc_get_volsw, cs530x_put_volsw_vu, in_vol_tlv),
		342	SOC_SINGLE_EXT_TLV("OUT6 Volume", CS530X_OUT_VOL_CTRL3_1, 0, 255, 1,
		343	snd_soc_get_volsw, cs530x_put_volsw_vu, in_vol_tlv),
		344	SOC_SINGLE_EXT_TLV("OUT7 Volume", CS530X_OUT_VOL_CTRL4_0, 0, 255, 1,
		345	snd_soc_get_volsw, cs530x_put_volsw_vu, in_vol_tlv),
		346	SOC_SINGLE_EXT_TLV("OUT8 Volume", CS530X_OUT_VOL_CTRL4_1, 0, 255, 1,
		347	snd_soc_get_volsw, cs530x_put_volsw_vu, in_vol_tlv),
		348
		349	SOC_SINGLE("DAC5 Invert Switch", CS530X_OUT_INV, CS530X_INOUT5_INV_SHIFT, 1, 0),
		350	SOC_SINGLE("DAC6 Invert Switch", CS530X_OUT_INV, CS530X_INOUT6_INV_SHIFT, 1, 0),
		351	SOC_SINGLE("DAC7 Invert Switch", CS530X_OUT_INV, CS530X_INOUT7_INV_SHIFT, 1, 0),
		352	SOC_SINGLE("DAC8 Invert Switch", CS530X_OUT_INV, CS530X_INOUT8_INV_SHIFT, 1, 0),
		353	};
		354
		355	static int cs530x_dac_event(struct snd_soc_dapm_widget *w,
		356	struct snd_kcontrol *kcontrol, int event)
		357	{
		358	struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
		359	struct cs530x_priv *cs530x = snd_soc_component_get_drvdata(component);
		360	struct regmap *regmap = cs530x->regmap;
		361
		362	switch (event) {
		363	case SND_SOC_DAPM_PRE_PMU:
		364	cs530x->dac_pairs_count++;
		365	break;
		366	case SND_SOC_DAPM_POST_PMU:
		367	regmap_clear_bits(regmap, CS530X_OUT_VOL_CTRL1_0 +
		368	(w->shift * 2), CS530X_INOUT_MUTE);
		369	regmap_clear_bits(regmap, CS530X_OUT_VOL_CTRL1_0 +
		370	((w->shift + 1) * 2), CS530X_INOUT_MUTE);
		371
		372	cs530x->dac_pairs_count--;
		373	if (!cs530x->dac_pairs_count) {
		374	usleep_range(1000, 1100);
		375	return regmap_write(regmap, CS530X_OUT_VOL_CTRL5,
		376	CS530X_INOUT_VU);
		377	}
		378	break;
		379	case SND_SOC_DAPM_PRE_PMD:
		380	regmap_set_bits(regmap, CS530X_OUT_VOL_CTRL1_0 +
		381	(w->shift * 2), CS530X_INOUT_MUTE);
		382	regmap_set_bits(regmap, CS530X_OUT_VOL_CTRL1_0 +
		383	((w->shift + 1) * 2), CS530X_INOUT_MUTE);
		384	return regmap_write(regmap, CS530X_OUT_VOL_CTRL5,
		385	CS530X_INOUT_VU);
257	default:	386	default:
258	return -EINVAL;	387	return -EINVAL;
259	}	388	}
@@ -263,18 +392,24 @@ static int cs530x_adc_event(struct snd_soc_dapm_widget *w, · 3 unmodified lines
263		392
264	static const struct snd_kcontrol_new adc12_ctrl =	393	static const struct snd_kcontrol_new adc12_ctrl =
265	SOC_DAPM_SINGLE_VIRT("Switch", 1);	394	SOC_DAPM_SINGLE_VIRT("Switch", 1);
266
267	static const struct snd_kcontrol_new adc34_ctrl =	395	static const struct snd_kcontrol_new adc34_ctrl =
268	SOC_DAPM_SINGLE_VIRT("Switch", 1);	396	SOC_DAPM_SINGLE_VIRT("Switch", 1);
269
270	static const struct snd_kcontrol_new adc56_ctrl =	397	static const struct snd_kcontrol_new adc56_ctrl =
271	SOC_DAPM_SINGLE_VIRT("Switch", 1);	398	SOC_DAPM_SINGLE_VIRT("Switch", 1);
272
273	static const struct snd_kcontrol_new adc78_ctrl =	399	static const struct snd_kcontrol_new adc78_ctrl =
274	SOC_DAPM_SINGLE_VIRT("Switch", 1);	400	SOC_DAPM_SINGLE_VIRT("Switch", 1);
275		401	static const struct snd_kcontrol_new dac12_ctrl =
		402	SOC_DAPM_SINGLE_VIRT("Switch", 1);
		403	static const struct snd_kcontrol_new dac34_ctrl =
		404	SOC_DAPM_SINGLE_VIRT("Switch", 1);
		405	static const struct snd_kcontrol_new dac56_ctrl =
		406	SOC_DAPM_SINGLE_VIRT("Switch", 1);
		407	static const struct snd_kcontrol_new dac78_ctrl =
		408	SOC_DAPM_SINGLE_VIRT("Switch", 1);
276	static const struct snd_kcontrol_new in_hpf_ctrl =	409	static const struct snd_kcontrol_new in_hpf_ctrl =
277	SOC_DAPM_SINGLE_VIRT("Switch", 1);	410	SOC_DAPM_SINGLE_VIRT("Switch", 1);
		411	static const struct snd_kcontrol_new out_hpf_ctrl =
		412	SOC_DAPM_SINGLE_VIRT("Switch", 1);
278		413
279	/* General DAPM widgets for all devices */	414	/* General DAPM widgets for all devices */
280	static const struct snd_soc_dapm_widget cs530x_gen_dapm_widgets[] = {	415	static const struct snd_soc_dapm_widget cs530x_gen_dapm_widgets[] = {
@@ -291,7 +426,7 @@ SND_SOC_DAPM_ADC_E("ADC1", NULL, CS530X_IN_ENABLES, 0, 0, · 10 unmodified lines
291	SND_SOC_DAPM_PRE_PMU),	426	SND_SOC_DAPM_PRE_PMU),
292	SND_SOC_DAPM_ADC("ADC2", NULL, CS530X_IN_ENABLES, 1, 0),	427	SND_SOC_DAPM_ADC("ADC2", NULL, CS530X_IN_ENABLES, 1, 0),
293	SND_SOC_DAPM_SWITCH("ADC12 Enable", SND_SOC_NOPM, 0, 0, &adc12_ctrl),	428	SND_SOC_DAPM_SWITCH("ADC12 Enable", SND_SOC_NOPM, 0, 0, &adc12_ctrl),
294	SND_SOC_DAPM_SWITCH("IN HPF", CS530X_IN_FILTER, CS530X_IN_HPF_EN_SHIFT,	429	SND_SOC_DAPM_SWITCH("IN HPF", CS530X_IN_FILTER, CS530X_INOUT_HPF_EN_SHIFT,
295	0, &in_hpf_ctrl),	430	0, &in_hpf_ctrl),
296	};	431	};
297		432
@@ -387,7 +522,7 @@ static const struct snd_soc_dapm_route adc_ch5_8_routes[] = { · 89 unmodified lines
387		522
388	static void cs530x_add_12_adc_widgets(struct snd_soc_component *component)	523	static void cs530x_add_12_adc_widgets(struct snd_soc_component *component)
389	{	524	{
390	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	525	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
391		526
392	snd_soc_add_component_controls(component,	527	snd_soc_add_component_controls(component,
393	cs530x_in_1_to_2_controls,	528	cs530x_in_1_to_2_controls,
@@ -402,7 +537,7 @@ static void cs530x_add_12_adc_widgets(struct snd_soc_component *component) · 8 unmodified lines
402		537
403	static void cs530x_add_34_adc_widgets(struct snd_soc_component *component)	538	static void cs530x_add_34_adc_widgets(struct snd_soc_component *component)
404	{	539	{
405	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	540	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
406		541
407	snd_soc_add_component_controls(component,	542	snd_soc_add_component_controls(component,
408	cs530x_in_3_to_4_controls,	543	cs530x_in_3_to_4_controls,
@@ -415,6 +550,153 @@ static void cs530x_add_34_adc_widgets(struct snd_soc_component *component) · 6 unmodified lines
415	ARRAY_SIZE(adc_ch3_4_routes));	550	ARRAY_SIZE(adc_ch3_4_routes));
416	}	551	}
417		552
		553	/* DAC's Channels 1 and 2 plus generic DAC DAPM events */
		554	static const struct snd_soc_dapm_widget cs530x_dac_ch12_dapm_widgets[] = {
		555	SND_SOC_DAPM_OUTPUT("OUT1"),
		556	SND_SOC_DAPM_OUTPUT("OUT2"),
		557	SND_SOC_DAPM_DAC_E("DAC1", NULL, CS530X_OUT_ENABLES, 0, 0,
		558	cs530x_dac_event,
		559	SND_SOC_DAPM_PRE_PMD \| SND_SOC_DAPM_POST_PMU \|
		560	SND_SOC_DAPM_PRE_PMU),
		561	SND_SOC_DAPM_DAC("DAC2", NULL, CS530X_OUT_ENABLES, 1, 0),
		562	SND_SOC_DAPM_SWITCH("DAC12 Enable", SND_SOC_NOPM, 0, 0, &dac12_ctrl),
		563	SND_SOC_DAPM_SWITCH("OUT HPF", CS530X_OUT_FILTER, CS530X_INOUT_HPF_EN_SHIFT,
		564	0, &out_hpf_ctrl),
		565	};
		566
		567	/* DAC's Channels 3 and 4 */
		568	static const struct snd_soc_dapm_widget cs530x_dac_ch34_dapm_widgets[] = {
		569	SND_SOC_DAPM_OUTPUT("OUT3"),
		570	SND_SOC_DAPM_OUTPUT("OUT4"),
		571	SND_SOC_DAPM_DAC_E("DAC3", NULL, CS530X_OUT_ENABLES, 2, 0,
		572	cs530x_dac_event,
		573	SND_SOC_DAPM_PRE_PMD \| SND_SOC_DAPM_POST_PMU \|
		574	SND_SOC_DAPM_PRE_PMU),
		575	SND_SOC_DAPM_DAC("DAC4", NULL, CS530X_OUT_ENABLES, 3, 0),
		576	SND_SOC_DAPM_SWITCH("DAC34 Enable", SND_SOC_NOPM, 0, 0, &dac34_ctrl),
		577	};
		578
		579	/* DAC's Channels 5 to 8 */
		580	static const struct snd_soc_dapm_widget cs530x_dac_ch58_dapm_widgets[] = {
		581	SND_SOC_DAPM_OUTPUT("OUT5"),
		582	SND_SOC_DAPM_OUTPUT("OUT6"),
		583	SND_SOC_DAPM_OUTPUT("OUT7"),
		584	SND_SOC_DAPM_OUTPUT("OUT8"),
		585	SND_SOC_DAPM_DAC_E("DAC5", NULL, CS530X_OUT_ENABLES, 4, 0,
		586	cs530x_dac_event,
		587	SND_SOC_DAPM_PRE_PMD \| SND_SOC_DAPM_POST_PMU \|
		588	SND_SOC_DAPM_PRE_PMU),
		589	SND_SOC_DAPM_DAC("DAC6", NULL, CS530X_OUT_ENABLES, 5, 0),
		590	SND_SOC_DAPM_SWITCH("DAC56 Enable", SND_SOC_NOPM, 0, 0, &dac56_ctrl),
		591	SND_SOC_DAPM_DAC_E("DAC7", NULL, CS530X_OUT_ENABLES, 6, 0,
		592	cs530x_dac_event,
		593	SND_SOC_DAPM_PRE_PMD \| SND_SOC_DAPM_POST_PMU \|
		594	SND_SOC_DAPM_PRE_PMU),
		595	SND_SOC_DAPM_DAC("DAC8", NULL, CS530X_OUT_ENABLES, 7, 0),
		596	SND_SOC_DAPM_SWITCH("DAC78 Enable", SND_SOC_NOPM, 0, 0, &dac78_ctrl),
		597	};
		598
		599	static const struct snd_soc_dapm_route dac_ch1_2_routes[] = {
		600	{ "DAC1", NULL, "Global Enable" },
		601	{ "DAC2", NULL, "Global Enable" },
		602
		603	{ "DAC12 Enable", "Switch", "OUT1" },
		604	{ "DAC12 Enable", "Switch", "OUT2" },
		605	{ "DAC1", NULL, "DAC12 Enable" },
		606	{ "DAC2", NULL, "DAC12 Enable" },
		607	{ "OUT HPF", "Switch", "DAC1" },
		608	{ "OUT HPF", "Switch", "DAC2" },
		609
		610	{ "OUT HPF", NULL, "AIF Playback" },
		611	{ "DAC1", NULL, "AIF Playback" },
		612	{ "DAC2", NULL, "AIF Playback" },
		613
		614	{ "OUT1", NULL, "DAC1" },
		615	{ "OUT2", NULL, "DAC2" },
		616	};
		617
		618	static const struct snd_soc_dapm_route dac_ch3_4_routes[] = {
		619	{ "DAC3", NULL, "Global Enable" },
		620	{ "DAC4", NULL, "Global Enable" },
		621
		622	{ "DAC34 Enable", "Switch", "OUT3" },
		623	{ "DAC34 Enable", "Switch", "OUT4" },
		624	{ "DAC3", NULL, "DAC34 Enable" },
		625	{ "DAC4", NULL, "DAC34 Enable" },
		626	{ "OUT HPF", "Switch", "DAC3" },
		627	{ "OUT HPF", "Switch", "DAC4" },
		628
		629	{ "DAC3", NULL, "AIF Playback" },
		630	{ "DAC4", NULL, "AIF Playback" },
		631
		632	{ "OUT3", NULL, "DAC3" },
		633	{ "OUT4", NULL, "DAC4" },
		634	};
		635
		636	static const struct snd_soc_dapm_route dac_ch5_8_routes[] = {
		637	{ "DAC5", NULL, "Global Enable" },
		638	{ "DAC6", NULL, "Global Enable" },
		639
		640	{ "DAC56 Enable", "Switch", "OUT5" },
		641	{ "DAC56 Enable", "Switch", "OUT6" },
		642	{ "DAC5", NULL, "DAC56 Enable" },
		643	{ "DAC6", NULL, "DAC56 Enable" },
		644	{ "OUT HPF", "Switch", "DAC5" },
		645	{ "OUT HPF", "Switch", "DAC6" },
		646
		647	{ "DAC5", NULL, "AIF Playback" },
		648	{ "DAC6", NULL, "AIF Playback" },
		649
		650	{ "OUT5", NULL, "DAC5" },
		651	{ "OUT6", NULL, "DAC6" },
		652
		653	{ "DAC7", NULL, "Global Enable" },
		654	{ "DAC8", NULL, "Global Enable" },
		655
		656	{ "DAC78 Enable", "Switch", "OUT7" },
		657	{ "DAC78 Enable", "Switch", "OUT8" },
		658	{ "DAC7", NULL, "DAC78 Enable" },
		659	{ "DAC8", NULL, "DAC78 Enable" },
		660	{ "OUT HPF", "Switch", "DAC7" },
		661	{ "OUT HPF", "Switch", "DAC8" },
		662
		663	{ "DAC7", NULL, "AIF Playback" },
		664	{ "DAC8", NULL, "AIF Playback" },
		665
		666	{ "OUT7", NULL, "DAC7" },
		667	{ "OUT8", NULL, "DAC8" },
		668	};
		669
		670	static void cs530x_add_12_dac_widgets(struct snd_soc_component *component)
		671	{
		672	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
		673
		674	snd_soc_add_component_controls(component,
		675	cs530x_out_1_to_2_controls,
		676	ARRAY_SIZE(cs530x_out_1_to_2_controls));
		677
		678	snd_soc_dapm_new_controls(dapm, cs530x_dac_ch12_dapm_widgets,
		679	ARRAY_SIZE(cs530x_dac_ch12_dapm_widgets));
		680
		681	snd_soc_dapm_add_routes(dapm, dac_ch1_2_routes,
		682	ARRAY_SIZE(dac_ch1_2_routes));
		683	}
		684
		685	static void cs530x_add_34_dac_widgets(struct snd_soc_component *component)
		686	{
		687	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
		688
		689	snd_soc_add_component_controls(component,
		690	cs530x_out_3_to_4_controls,
		691	ARRAY_SIZE(cs530x_out_3_to_4_controls));
		692
		693	snd_soc_dapm_new_controls(dapm, cs530x_dac_ch34_dapm_widgets,
		694	ARRAY_SIZE(cs530x_dac_ch34_dapm_widgets));
		695
		696	snd_soc_dapm_add_routes(dapm, dac_ch3_4_routes,
		697	ARRAY_SIZE(dac_ch3_4_routes));
		698	}
		699
418	static int cs530x_set_bclk(struct snd_soc_component *component, const int freq)	700	static int cs530x_set_bclk(struct snd_soc_component *component, const int freq)
419	{	701	{
420	struct cs530x_priv *cs530x = snd_soc_component_get_drvdata(component);	702	struct cs530x_priv *cs530x = snd_soc_component_get_drvdata(component);
@@ -450,7 +732,7 @@ static int cs530x_set_bclk(struct snd_soc_component *component, const int freq) · 29 unmodified lines
450	}	732	}
451		733
452	static int cs530x_set_pll_refclk(struct snd_soc_component *component,	734	static int cs530x_set_pll_refclk(struct snd_soc_component *component,
453	const unsigned int freq)	735	const unsigned int freq)
454	{	736	{
455	struct cs530x_priv *priv = snd_soc_component_get_drvdata(component);	737	struct cs530x_priv *priv = snd_soc_component_get_drvdata(component);
456	struct regmap *regmap = priv->regmap;	738	struct regmap *regmap = priv->regmap;
@@ -492,37 +774,35 @@ static int cs530x_hw_params(struct snd_pcm_substream *substream, · 35 unmodified lines
492	int ret = 0, fs = params_rate(params), bclk;	774	int ret = 0, fs = params_rate(params), bclk;
493	unsigned int fs_val;	775	unsigned int fs_val;
494		776
495
496	switch (fs) {	777	switch (fs) {
497	case 32000:	778	case 32000:
498	fs_val = CS530X_FS_32K;	779	fs_val = CS530X_FS_32K;
499	break;	780	break;
500	case 44100:	781	case 44100:
501	case 48000:	782	case 48000:
502	fs_val = CS530X_FS_48K_44P1K;	783	fs_val = CS530X_FS_44P1K_48K;
503	break;	784	break;
504	case 88200:	785	case 88200:
505	case 96000:	786	case 96000:
506	fs_val = CS530X_FS_96K_88P2K;	787	fs_val = CS530X_FS_88P2K_96K;
507	break;	788	break;
508	case 176400:	789	case 176400:
509	case 192000:	790	case 192000:
510	fs_val = CS530X_FS_192K_176P4K;	791	fs_val = CS530X_FS_176P4K_192K;
511	break;	792	break;
512	case 356800:	793	case 356800:
513	case 384000:	794	case 384000:
514	fs_val = CS530X_FS_384K_356P8K;	795	fs_val = CS530X_FS_356P8K_384K;
515	break;	796	break;
516	case 705600:	797	case 705600:
517	case 768000:	798	case 768000:
518	fs_val = CS530X_FS_768K_705P6K;	799	fs_val = CS530X_FS_705P6K_768K;
519	break;	800	break;
520	default:	801	default:
521	dev_err(component->dev, "Invalid sample rate %d\n", fs);	802	dev_err(component->dev, "Invalid sample rate %d\n", fs);
522	return -EINVAL;	803	return -EINVAL;
523	}	804	}
524		805
525	cs530x->fs = fs;
526	regmap_update_bits(regmap, CS530X_CLK_CFG_1,	806	regmap_update_bits(regmap, CS530X_CLK_CFG_1,
527	CS530X_SAMPLE_RATE_MASK, fs_val);	807	CS530X_SAMPLE_RATE_MASK, fs_val);
528		808
@@ -540,7 +820,7 @@ static int cs530x_hw_params(struct snd_pcm_substream *substream, · 11 unmodified lines
540	}	820	}
541		821
542	if (!regmap_test_bits(regmap, CS530X_CLK_CFG_0,	822	if (!regmap_test_bits(regmap, CS530X_CLK_CFG_0,
543	CS530X_PLL_REFCLK_SRC_MASK)) {	823	CS530X_PLL_REFCLK_SRC_MASK)) {
544	ret = cs530x_set_pll_refclk(component, bclk);	824	ret = cs530x_set_pll_refclk(component, bclk);
545	if (ret)	825	if (ret)
546	return ret;	826	return ret;
@@ -614,7 +894,7 @@ static bool cs530x_check_mclk_freq(struct snd_soc_component *component, · 67 unmodified lines
614	}	894	}
615		895
616	static int cs530x_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,	896	static int cs530x_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
617	unsigned int rx_mask, int slots, int slot_width)	897	unsigned int rx_mask, int slots, int slot_width)
618	{	898	{
619	struct snd_soc_component *component = dai->component;	899	struct snd_soc_component *component = dai->component;
620	struct cs530x_priv *cs530x = snd_soc_component_get_drvdata(component);	900	struct cs530x_priv *cs530x = snd_soc_component_get_drvdata(component);
@@ -675,8 +955,11 @@ static const struct snd_soc_dai_driver cs530x_dai = { · 54 unmodified lines
675	.name = "cs530x-dai",	955	.name = "cs530x-dai",
676	.capture = {	956	.capture = {
677	.stream_name = "AIF Capture",	957	.stream_name = "AIF Capture",
678	.channels_min = 2,	958	.rates = SNDRV_PCM_RATE_KNOT,
679	.channels_max = 8,	959	.formats = SNDRV_PCM_FMTBIT_S32_LE,
		960	},
		961	.playback = {
		962	.stream_name = "AIF Playback",
680	.rates = SNDRV_PCM_RATE_KNOT,	963	.rates = SNDRV_PCM_RATE_KNOT,
681	.formats = SNDRV_PCM_FMTBIT_S32_LE,	964	.formats = SNDRV_PCM_FMTBIT_S32_LE,
682	},	965	},
@@ -686,8 +969,8 @@ static const struct snd_soc_dai_driver cs530x_dai = { · 3 unmodified lines
686	};	969	};
687		970
688	static int cs530x_set_pll(struct snd_soc_component *component, int pll_id,	971	static int cs530x_set_pll(struct snd_soc_component *component, int pll_id,
689	int source, unsigned int freq_in,	972	int source, unsigned int freq_in,
690	unsigned int freq_out)	973	unsigned int freq_out)
691	{	974	{
692	struct cs530x_priv *cs530x = snd_soc_component_get_drvdata(component);	975	struct cs530x_priv *cs530x = snd_soc_component_get_drvdata(component);
693	struct regmap *regmap = cs530x->regmap;	976	struct regmap *regmap = cs530x->regmap;
@@ -724,13 +1007,50 @@ static int cs530x_set_pll(struct snd_soc_component *component, int pll_id, · 30 unmodified lines
724	static int cs530x_component_probe(struct snd_soc_component *component)	1007	static int cs530x_component_probe(struct snd_soc_component *component)
725	{	1008	{
726	struct cs530x_priv *cs530x = snd_soc_component_get_drvdata(component);	1009	struct cs530x_priv *cs530x = snd_soc_component_get_drvdata(component);
727	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	1010	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
728	int num_widgets;	1011	int num_widgets;
729		1012
730	snd_soc_dapm_new_controls(dapm, cs530x_gen_dapm_widgets,	1013	snd_soc_dapm_new_controls(dapm, cs530x_gen_dapm_widgets,
731	ARRAY_SIZE(cs530x_gen_dapm_widgets));	1014	ARRAY_SIZE(cs530x_gen_dapm_widgets));
732		1015
733	switch (cs530x->devtype) {	1016	switch (cs530x->devtype) {
		1017	case CS4282:
		1018	cs530x_add_12_adc_widgets(component);
		1019	cs530x_add_12_dac_widgets(component);
		1020	break;
		1021	case CS4302:
		1022	cs530x_add_12_dac_widgets(component);
		1023	break;
		1024	case CS4304:
		1025	cs530x_add_12_dac_widgets(component);
		1026	cs530x_add_34_dac_widgets(component);
		1027
		1028	num_widgets = ARRAY_SIZE(cs530x_out_sum_4ch_controls);
		1029	snd_soc_add_component_controls(component,
		1030	cs530x_out_sum_4ch_controls,
		1031	num_widgets);
		1032	break;
		1033	case CS4308:
		1034	cs530x_add_12_dac_widgets(component);
		1035	cs530x_add_34_dac_widgets(component);
		1036
		1037	num_widgets = ARRAY_SIZE(cs530x_out_5_to_8_controls);
		1038	snd_soc_add_component_controls(component,
		1039	cs530x_out_5_to_8_controls,
		1040	num_widgets);
		1041
		1042	num_widgets = ARRAY_SIZE(cs530x_out_sum_8ch_controls);
		1043	snd_soc_add_component_controls(component,
		1044	cs530x_out_sum_8ch_controls,
		1045	num_widgets);
		1046
		1047	num_widgets = ARRAY_SIZE(cs530x_dac_ch58_dapm_widgets);
		1048	snd_soc_dapm_new_controls(dapm, cs530x_dac_ch58_dapm_widgets,
		1049	num_widgets);
		1050
		1051	snd_soc_dapm_add_routes(dapm, dac_ch5_8_routes,
		1052	ARRAY_SIZE(dac_ch5_8_routes));
		1053	break;
734	case CS5302:	1054	case CS5302:
735	cs530x_add_12_adc_widgets(component);	1055	cs530x_add_12_adc_widgets(component);
736	break;	1056	break;
@@ -743,7 +1063,6 @@ static int cs530x_component_probe(struct snd_soc_component *component) · 6 unmodified lines
743	cs530x_in_sum_4ch_controls,	1063	cs530x_in_sum_4ch_controls,
744	num_widgets);	1064	num_widgets);
745	break;	1065	break;
746
747	case CS5308:	1066	case CS5308:
748	cs530x_add_12_adc_widgets(component);	1067	cs530x_add_12_adc_widgets(component);
749	cs530x_add_34_adc_widgets(component);	1068	cs530x_add_34_adc_widgets(component);
@@ -775,20 +1094,21 @@ static int cs530x_component_probe(struct snd_soc_component *component) · 25 unmodified lines
775	}	1094	}
776		1095
777	static int cs530x_set_sysclk(struct snd_soc_component *component, int clk_id,	1096	static int cs530x_set_sysclk(struct snd_soc_component *component, int clk_id,
778	int source, unsigned int freq, int dir)	1097	int source, unsigned int freq, int dir)
779	{	1098	{
780	struct cs530x_priv *cs530x = snd_soc_component_get_drvdata(component);	1099	struct cs530x_priv *cs530x = snd_soc_component_get_drvdata(component);
781	struct regmap *regmap = cs530x->regmap;	1100	struct regmap *regmap = cs530x->regmap;
782		1101
783	switch (source) {	1102	switch (source) {
784	case CS530X_SYSCLK_SRC_MCLK:	1103	case CS530X_SYSCLK_SRC_MCLK:
785	if (freq != 24560000 && freq != 22572000) {	1104	switch (freq) {
786	dev_err(component->dev, "Invalid MCLK source rate %d\n",	1105	case CS530X_SYSCLK_REF_45_1MHZ:
787	freq);	1106	case CS530X_SYSCLK_REF_49_1MHZ:
		1107	break;
		1108	default:
		1109	dev_err(component->dev, "Invalid MCLK source rate %d\n", freq);
788	return -EINVAL;	1110	return -EINVAL;
789	}	1111	}
790
791	cs530x->mclk_rate = freq;
792	break;	1112	break;
793	case CS530X_SYSCLK_SRC_PLL:	1113	case CS530X_SYSCLK_SRC_PLL:
794	break;	1114	break;
@@ -809,7 +1129,7 @@ static const struct snd_soc_component_driver soc_component_dev_cs530x = { · 14 unmodified lines
809	.endianness = 1,	1129	.endianness = 1,
810	};	1130	};
811		1131
812	const struct regmap_config cs530x_regmap = {	1132	const struct regmap_config cs530x_regmap_i2c = {
813	.reg_bits = 16,	1133	.reg_bits = 16,
814	.val_bits = 16,	1134	.val_bits = 16,
815		1135
@@ -821,7 +1141,27 @@ const struct regmap_config cs530x_regmap = { · 5 unmodified lines
821	.reg_defaults = cs530x_reg_defaults,	1141	.reg_defaults = cs530x_reg_defaults,
822	.num_reg_defaults = ARRAY_SIZE(cs530x_reg_defaults),	1142	.num_reg_defaults = ARRAY_SIZE(cs530x_reg_defaults),
823	};	1143	};
824	EXPORT_SYMBOL_NS_GPL(cs530x_regmap, "SND_SOC_CS530X");	1144	EXPORT_SYMBOL_NS_GPL(cs530x_regmap_i2c, "SND_SOC_CS530X");
		1145
		1146	const struct regmap_config cs530x_regmap_spi = {
		1147	.reg_bits = 16,
		1148	.pad_bits = 16,
		1149	.val_bits = 16,
		1150
		1151	.reg_stride = 2,
		1152
		1153	.reg_format_endian = REGMAP_ENDIAN_BIG,
		1154	.val_format_endian = REGMAP_ENDIAN_BIG,
		1155
		1156	.max_register = CS530X_MAX_REGISTER,
		1157	.writeable_reg = cs530x_writeable_register,
		1158	.readable_reg = cs530x_readable_register,
		1159
		1160	.cache_type = REGCACHE_MAPLE,
		1161	.reg_defaults = cs530x_reg_defaults,
		1162	.num_reg_defaults = ARRAY_SIZE(cs530x_reg_defaults),
		1163	};
		1164	EXPORT_SYMBOL_NS_GPL(cs530x_regmap_spi, "SND_SOC_CS530X");
825		1165
826	static int cs530x_check_device_id(struct cs530x_priv *cs530x)	1166	static int cs530x_check_device_id(struct cs530x_priv *cs530x)
827	{	1167	{
@@ -837,9 +1177,20 @@ static int cs530x_check_device_id(struct cs530x_priv *cs530x) · 9 unmodified lines
837	if (ret)	1177	if (ret)
838	return dev_err_probe(dev, ret, "Can't read REV ID\n");	1178	return dev_err_probe(dev, ret, "Can't read REV ID\n");
839		1179
840	dev_dbg(dev, "Device ID 0x%x Rev ID 0x%x\n", dev_id, rev);
841
842	switch (dev_id) {	1180	switch (dev_id) {
		1181	case CS530X_2CH_CODEC_DEV_ID:
		1182	cs530x->num_dacs = 2;
		1183	cs530x->num_adcs = 2;
		1184	break;
		1185	case CS530X_2CH_DAC_DEV_ID:
		1186	cs530x->num_dacs = 2;
		1187	break;
		1188	case CS530X_4CH_DAC_DEV_ID:
		1189	cs530x->num_dacs = 4;
		1190	break;
		1191	case CS530X_8CH_DAC_DEV_ID:
		1192	cs530x->num_dacs = 8;
		1193	break;
843	case CS530X_2CH_ADC_DEV_ID:	1194	case CS530X_2CH_ADC_DEV_ID:
844	cs530x->num_adcs = 2;	1195	cs530x->num_adcs = 2;
845	break;	1196	break;
@@ -854,6 +1205,15 @@ static int cs530x_check_device_id(struct cs530x_priv *cs530x) · 8 unmodified lines
854	dev_id);	1205	dev_id);
855	}	1206	}
856		1207
		1208	if (cs530x->devtype != dev_id) {
		1209	dev_err(dev, "Read device ID 0x%x is not the expected devtype 0x%x\n",
		1210	dev_id, cs530x->devtype);
		1211	return -EINVAL;
		1212	}
		1213
		1214	dev_dbg(dev, "Device ID 0x%x Rev ID 0x%x (%d in %d out)\n", dev_id, rev,
		1215	cs530x->num_adcs, cs530x->num_dacs);
		1216
857	return 0;	1217	return 0;
858	}	1218	}
859		1219
@@ -882,6 +1242,9 @@ static int cs530x_parse_device_properties(struct cs530x_priv *cs530x) · 22 unmodified lines
882	val \|= CS530X_IN12_HIZ;	1242	val \|= CS530X_IN12_HIZ;
883		1243
884	return regmap_set_bits(regmap, CS530X_IN_HIZ, val);	1244	return regmap_set_bits(regmap, CS530X_IN_HIZ, val);
		1245	case 0:
		1246	/* No ADCs */
		1247	return 0;
885	default:	1248	default:
886	return dev_err_probe(dev, -EINVAL,	1249	return dev_err_probe(dev, -EINVAL,
887	"Invalid number of adcs %d\n",	1250	"Invalid number of adcs %d\n",
@@ -895,8 +1258,8 @@ int cs530x_probe(struct cs530x_priv *cs530x) · 7 unmodified lines
895	int ret, i;	1258	int ret, i;
896		1259
897	cs530x->dev_dai = devm_kmemdup(dev, &cs530x_dai,	1260	cs530x->dev_dai = devm_kmemdup(dev, &cs530x_dai,
898	sizeof(*(cs530x->dev_dai)),	1261	sizeof(*(cs530x->dev_dai)),
899	GFP_KERNEL);	1262	GFP_KERNEL);
900	if (!cs530x->dev_dai)	1263	if (!cs530x->dev_dai)
901	return -ENOMEM;	1264	return -ENOMEM;
902		1265
@@ -914,10 +1277,10 @@ int cs530x_probe(struct cs530x_priv *cs530x) · 11 unmodified lines
914	return dev_err_probe(dev, ret, "Failed to enable supplies");	1277	return dev_err_probe(dev, ret, "Failed to enable supplies");
915		1278
916	cs530x->reset_gpio = devm_gpiod_get_optional(dev, "reset",	1279	cs530x->reset_gpio = devm_gpiod_get_optional(dev, "reset",
917	GPIOD_OUT_HIGH);	1280	GPIOD_OUT_HIGH);
918	if (IS_ERR(cs530x->reset_gpio)) {	1281	if (IS_ERR(cs530x->reset_gpio)) {
919	ret = dev_err_probe(dev, PTR_ERR(cs530x->reset_gpio),	1282	ret = dev_err_probe(dev, PTR_ERR(cs530x->reset_gpio),
920	"Reset gpio not available\n");	1283	"Reset gpio not available\n");
921	goto err_regulator;	1284	goto err_regulator;
922	}	1285	}
923		1286
@@ -944,10 +1307,19 @@ int cs530x_probe(struct cs530x_priv *cs530x) · 20 unmodified lines
944	if (ret)	1307	if (ret)
945	goto err_reset;	1308	goto err_reset;
946		1309
947	cs530x->dev_dai->capture.channels_max = cs530x->num_adcs;	1310	if (cs530x->num_adcs) {
		1311	cs530x->dev_dai->capture.channels_min = 2;
		1312	cs530x->dev_dai->capture.channels_max = cs530x->num_adcs;
		1313	}
		1314
		1315	if (cs530x->num_dacs) {
		1316	cs530x->dev_dai->playback.channels_min = 2;
		1317	cs530x->dev_dai->playback.channels_max = cs530x->num_dacs;
		1318	}
948		1319
949	ret = devm_snd_soc_register_component(dev,	1320	ret = devm_snd_soc_register_component(dev,
950	&soc_component_dev_cs530x, cs530x->dev_dai, 1);	1321	&soc_component_dev_cs530x,
		1322	cs530x->dev_dai, 1);
951	if (ret) {	1323	if (ret) {
952	dev_err_probe(dev, ret, "Can't register cs530x component\n");	1324	dev_err_probe(dev, ret, "Can't register cs530x component\n");
953	goto err_reset;	1325	goto err_reset;

sound/soc/codecs/cs530x.h+60−30

 /*
  * CS530x CODEC driver internal data
  *
- * Copyright (C) 2023-2024 Cirrus Logic, Inc. and
+ * Copyright (C) 2023-2025 Cirrus Logic, Inc. and
  *                         Cirrus Logic International Semiconductor Ltd.
  */
 #include <linux/regulator/consumer.h>
 /* Devices */
+#define CS530X_2CH_CODEC_DEV_ID		 0x4282
+#define CS530X_2CH_DAC_DEV_ID		 0x4302
+#define CS530X_4CH_DAC_DEV_ID		 0x4304
+#define CS530X_8CH_DAC_DEV_ID		 0x4308
 #define CS530X_2CH_ADC_DEV_ID		 0x5302
 #define CS530X_4CH_ADC_DEV_ID		 0x5304
 #define CS530X_8CH_ADC_DEV_ID		 0x5308
 #define CS530X_IN_VOL_CTRL4_1	        0x000009E
 #define CS530X_IN_VOL_CTRL5		0x00000A0
+#define CS530X_OUT_ENABLES		0x00000C0
+#define CS530X_OUT_RAMP_SUM		0x00000C2
+#define CS530X_OUT_DEEMPH		0x00000C4
+#define CS530X_OUT_FILTER		0x00000C6
+#define CS530X_OUT_INV			0x00000CA
+#define CS530X_OUT_VOL_CTRL1_0		0x00000D0
+#define CS530X_OUT_VOL_CTRL1_1		0x00000D2
+#define CS530X_OUT_VOL_CTRL2_0		0x00000D4
+#define CS530X_OUT_VOL_CTRL2_1		0x00000D6
+#define CS530X_OUT_VOL_CTRL3_0		0x00000D8
+#define CS530X_OUT_VOL_CTRL3_1		0x00000DA
+#define CS530X_OUT_VOL_CTRL4_0		0x00000DC
+#define CS530X_OUT_VOL_CTRL4_1		0x00000DE
+#define CS530X_OUT_VOL_CTRL5		0x00000E0
 #define CS530X_PAD_FN			0x0003D24
 #define CS530X_PAD_LVL			0x0003D28
 /* CLK_CFG_1 */
 #define CS530X_SAMPLE_RATE_MASK		GENMASK(2, 0)
 #define CS530X_FS_32K			0
-#define CS530X_FS_48K_44P1K		1
+#define CS530X_FS_44P1K_48K		1
-#define CS530X_FS_96K_88P2K		2
+#define CS530X_FS_88P2K_96K		2
-#define CS530X_FS_192K_176P4K		3
+#define CS530X_FS_176P4K_192K		3
-#define CS530X_FS_384K_356P8K		4
+#define CS530X_FS_356P8K_384K		4
-#define CS530X_FS_768K_705P6K		5
+#define CS530X_FS_705P6K_768K		5
 /* CHIP_ENABLE */
 #define CS530X_GLOBAL_EN		BIT(0)
 #define CS530X_TDM_EN_MASK		BIT(2)
 #define CS530X_ASP_FMT_I2S		0
 #define CS530X_ASP_FMT_LJ		1
-#define CS530X_ASP_FMT_DSP_A		0x6
+#define CS530X_ASP_FMT_DSP_A		6
 /* TDM Slots */
 #define CS530X_0_1_TDM_SLOT_MASK	GENMASK(1, 0)
 #define CS530X_14_15_TDM_SLOT_MASK	GENMASK(15, 14)
 #define CS530X_14_15_TDM_SLOT_VAL	7
-/* IN_RAMP_SUM */
+/* IN_RAMP_SUM and OUT_RAMP_SUM */
 #define CS530X_RAMP_RATE_INC_SHIFT	0
 #define CS530X_RAMP_RATE_DEC_SHIFT	4
-#define CS530X_IN_SUM_MODE_SHIFT	13
+#define CS530X_INOUT_SUM_MODE_SHIFT	13
-/* IN_FILTER */
+/* IN_FILTER and OUT_FILTER */
-#define CS530X_IN_FILTER_SHIFT		8
+#define CS530X_INOUT_FILTER_SHIFT		8
-#define CS530X_IN_HPF_EN_SHIFT		12
+#define CS530X_INOUT_HPF_EN_SHIFT		12
 /* IN_HIZ */
 #define CS530X_IN12_HIZ			BIT(0)
 #define CS530X_IN56_HIZ			BIT(2)
 #define CS530X_IN78_HIZ			BIT(3)
-/* IN_INV */
+/* IN_INV and OUT_INV */
-#define CS530X_IN1_INV_SHIFT		0
+#define CS530X_INOUT1_INV_SHIFT		0
-#define CS530X_IN2_INV_SHIFT		1
+#define CS530X_INOUT2_INV_SHIFT		1
-#define CS530X_IN3_INV_SHIFT		2
+#define CS530X_INOUT3_INV_SHIFT		2
-#define CS530X_IN4_INV_SHIFT		3
+#define CS530X_INOUT4_INV_SHIFT		3
-#define CS530X_IN5_INV_SHIFT		4
+#define CS530X_INOUT5_INV_SHIFT		4
-#define CS530X_IN6_INV_SHIFT		5
+#define CS530X_INOUT6_INV_SHIFT		5
-#define CS530X_IN7_INV_SHIFT		6
+#define CS530X_INOUT7_INV_SHIFT		6
-#define CS530X_IN8_INV_SHIFT		7
+#define CS530X_INOUT8_INV_SHIFT		7
-/* IN_VOL_CTLy_z */
+/* IN_VOL_CTLy_z and OUT_VOL_CTLy_z */
-#define CS530X_IN_MUTE			BIT(15)
+#define CS530X_INOUT_MUTE			BIT(15)
 /* IN_VOL_CTL5 */
 #define CS530X_IN_VU			BIT(0)
 #define CS530X_CONFIG3_LVL		BIT(7)
 #define CS530X_CONFIG4_LVL		BIT(8)
 #define CS530X_CONFIG5_LVL		BIT(9)
+/* IN_VOL_CTL5 and OUT_VOL_CTL5 */
+#define CS530X_INOUT_VU			BIT(0)
+/* MCLK Reference Source Frequency */
+/* 41KHz related */
+#define CS530X_SYSCLK_REF_45_1MHZ	45158400
+/* 48KHz related */
+#define CS530X_SYSCLK_REF_49_1MHZ	49152000
 /* System Clock Source */
 #define CS530X_SYSCLK_SRC_MCLK		0
 #define CS530X_NUM_SUPPLIES		2
 enum cs530x_type {
-	CS5302,
+	CS4282 = CS530X_2CH_CODEC_DEV_ID,
-	CS5304,
+	CS4302 = CS530X_2CH_DAC_DEV_ID,
-	CS5308,
+	CS4304 = CS530X_4CH_DAC_DEV_ID,
+	CS4308 = CS530X_8CH_DAC_DEV_ID,
+	CS5302 = CS530X_2CH_ADC_DEV_ID,
+	CS5304 = CS530X_4CH_ADC_DEV_ID,
+	CS5308 = CS530X_8CH_ADC_DEV_ID,
 };
 /* codec private data */
 	struct regulator_bulk_data supplies[CS530X_NUM_SUPPLIES];
-	unsigned int mclk_rate;
 	int tdm_width;
 	int tdm_slots;
-	int fs;
 	int adc_pairs_count;
+	int dac_pairs_count;
 	struct gpio_desc *reset_gpio;
 };
-extern const struct regmap_config cs530x_regmap;
+extern const struct regmap_config cs530x_regmap_i2c;
+extern const struct regmap_config cs530x_regmap_spi;
 int cs530x_probe(struct cs530x_priv *cs530x);
 #endif

sound/soc/codecs/cs53l30.c+5−4

 static int cs53l30_set_bias_level(struct snd_soc_component *component,
 				  enum snd_soc_bias_level level)
 {
-	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	struct cs53l30_private *priv = snd_soc_component_get_drvdata(component);
+	enum snd_soc_bias_level bias_level = snd_soc_dapm_get_bias_level(dapm);
 	unsigned int reg;
 	int i, inter_max_check, ret;
 	case SND_SOC_BIAS_ON:
 		break;
 	case SND_SOC_BIAS_PREPARE:
-		if (dapm->bias_level == SND_SOC_BIAS_STANDBY)
+		if (bias_level == SND_SOC_BIAS_STANDBY)
 			regmap_update_bits(priv->regmap, CS53L30_PWRCTL,
 					   CS53L30_PDN_LP_MASK, 0);
 		break;
 	case SND_SOC_BIAS_STANDBY:
-		if (dapm->bias_level == SND_SOC_BIAS_OFF) {
+		if (bias_level == SND_SOC_BIAS_OFF) {
 			ret = clk_prepare_enable(priv->mclk);
 			if (ret) {
 				dev_err(component->dev,
 static int cs53l30_component_probe(struct snd_soc_component *component)
 {
 	struct cs53l30_private *priv = snd_soc_component_get_drvdata(component);
-	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	if (priv->use_sdout2)
 		snd_soc_dapm_add_routes(dapm, cs53l30_dapm_routes_sdout2,

sound/soc/codecs/cx20442.c+3−2

 		enum snd_soc_bias_level level)
 {
 	struct cx20442_priv *cx20442 = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	int err = 0;
 	switch (level) {
 	case SND_SOC_BIAS_PREPARE:
-		if (snd_soc_component_get_bias_level(component) != SND_SOC_BIAS_STANDBY)
+		if (snd_soc_dapm_get_bias_level(dapm) != SND_SOC_BIAS_STANDBY)
 			break;
 		if (IS_ERR(cx20442->por))
 			err = PTR_ERR(cx20442->por);
 			err = regulator_enable(cx20442->por);
 		break;
 	case SND_SOC_BIAS_STANDBY:
-		if (snd_soc_component_get_bias_level(component) != SND_SOC_BIAS_PREPARE)
+		if (snd_soc_dapm_get_bias_level(dapm) != SND_SOC_BIAS_PREPARE)
 			break;
 		if (IS_ERR(cx20442->por))
 			err = PTR_ERR(cx20442->por);

sound/soc/codecs/cx2072x.c+3−3

@@ -1341,8 +1341,8 @@ static int cx2072x_set_bias_level(struct snd_soc_component *codec, · 1340 unmodified lines
1341	enum snd_soc_bias_level level)	1341	enum snd_soc_bias_level level)
1342	{	1342	{
1343	struct cx2072x_priv *cx2072x = snd_soc_component_get_drvdata(codec);	1343	struct cx2072x_priv *cx2072x = snd_soc_component_get_drvdata(codec);
1344	const enum snd_soc_bias_level old_level =	1344	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(codec);
1345	snd_soc_component_get_bias_level(codec);	1345	const enum snd_soc_bias_level old_level = snd_soc_dapm_get_bias_level(dapm);
1346		1346
1347	if (level == SND_SOC_BIAS_STANDBY && old_level == SND_SOC_BIAS_OFF)	1347	if (level == SND_SOC_BIAS_STANDBY && old_level == SND_SOC_BIAS_OFF)
1348	regmap_write(cx2072x->regmap, CX2072X_AFG_POWER_STATE, 0);	1348	regmap_write(cx2072x->regmap, CX2072X_AFG_POWER_STATE, 0);
@@ -1363,7 +1363,7 @@ static int cx2072x_set_bias_level(struct snd_soc_component *codec, · 14 unmodified lines
1363	static void cx2072x_enable_jack_detect(struct snd_soc_component *codec)	1363	static void cx2072x_enable_jack_detect(struct snd_soc_component *codec)
1364	{	1364	{
1365	struct cx2072x_priv *cx2072x = snd_soc_component_get_drvdata(codec);	1365	struct cx2072x_priv *cx2072x = snd_soc_component_get_drvdata(codec);
1366	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(codec);	1366	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(codec);
1367		1367
1368	/* No-sticky input type */	1368	/* No-sticky input type */
1369	regmap_write(cx2072x->regmap, CX2072X_GPIO_STICKY_MASK, 0x1f);	1369	regmap_write(cx2072x->regmap, CX2072X_GPIO_STICKY_MASK, 0x1f);

sound/soc/codecs/da7210.c+2−2

@@ -326,7 +326,7 @@ static SOC_ENUM_SINGLE_DECL(da7210_hp_mode_sel, · 325 unmodified lines
326	static int da7210_put_alc_sw(struct snd_kcontrol *kcontrol,	326	static int da7210_put_alc_sw(struct snd_kcontrol *kcontrol,
327	struct snd_ctl_elem_value *ucontrol)	327	struct snd_ctl_elem_value *ucontrol)
328	{	328	{
329	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	329	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
330		330
331	if (ucontrol->value.integer.value[0]) {	331	if (ucontrol->value.integer.value[0]) {
332	/* Check if noise suppression is enabled */	332	/* Check if noise suppression is enabled */
@@ -349,7 +349,7 @@ static int da7210_put_alc_sw(struct snd_kcontrol *kcontrol, · 16 unmodified lines
349	static int da7210_put_noise_sup_sw(struct snd_kcontrol *kcontrol,	349	static int da7210_put_noise_sup_sw(struct snd_kcontrol *kcontrol,
350	struct snd_ctl_elem_value *ucontrol)	350	struct snd_ctl_elem_value *ucontrol)
351	{	351	{
352	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	352	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
353	u8 val;	353	u8 val;
354		354
355	if (ucontrol->value.integer.value[0]) {	355	if (ucontrol->value.integer.value[0]) {

sound/soc/codecs/da7213.c+11−10

 static int da7213_volsw_locked_get(struct snd_kcontrol *kcontrol,
 				   struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct da7213_priv *da7213 = snd_soc_component_get_drvdata(component);
 	int ret;
 static int da7213_volsw_locked_put(struct snd_kcontrol *kcontrol,
 				   struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct da7213_priv *da7213 = snd_soc_component_get_drvdata(component);
 	int ret;
 static int da7213_enum_locked_get(struct snd_kcontrol *kcontrol,
 				struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct da7213_priv *da7213 = snd_soc_component_get_drvdata(component);
 	int ret;
 static int da7213_enum_locked_put(struct snd_kcontrol *kcontrol,
 				struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct da7213_priv *da7213 = snd_soc_component_get_drvdata(component);
 	int ret;
 static int da7213_put_mixin_gain(struct snd_kcontrol *kcontrol,
 				struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct da7213_priv *da7213 = snd_soc_component_get_drvdata(component);
 	int ret;
 static int da7213_put_alc_sw(struct snd_kcontrol *kcontrol,
 			    struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct da7213_priv *da7213 = snd_soc_component_get_drvdata(component);
 	/* Force ALC offset calibration if enabling ALC */
 static int da7213_tonegen_freq_get(struct snd_kcontrol *kcontrol,
 				   struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct da7213_priv *da7213 = snd_soc_component_get_drvdata(component);
 	struct soc_mixer_control *mixer_ctrl =
 		(struct soc_mixer_control *) kcontrol->private_value;
 static int da7213_tonegen_freq_put(struct snd_kcontrol *kcontrol,
 				   struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct da7213_priv *da7213 = snd_soc_component_get_drvdata(component);
 	struct soc_mixer_control *mixer_ctrl =
 		(struct soc_mixer_control *) kcontrol->private_value;
 				 enum snd_soc_bias_level level)
 {
 	struct da7213_priv *da7213 = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	int ret;
 	switch (level) {
 		break;
 	case SND_SOC_BIAS_PREPARE:
 		/* Enable MCLK for transition to ON state */
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_STANDBY) {
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_STANDBY) {
 			if (da7213->mclk) {
 				ret = clk_prepare_enable(da7213->mclk);
 				if (ret) {
 		}
 		break;
 	case SND_SOC_BIAS_STANDBY:
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) {
 			/* Enable VMID reference & master bias */
 			snd_soc_component_update_bits(component, DA7213_REFERENCES,
 					    DA7213_VMID_EN | DA7213_BIAS_EN,

sound/soc/codecs/da7218.c+11−10

 static int da7218_mixin_gain_put(struct snd_kcontrol *kcontrol,
 				 struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct da7218_priv *da7218 = snd_soc_component_get_drvdata(component);
 	int ret;
 {
 	struct soc_mixer_control *mc =
 		(struct soc_mixer_control *) kcontrol->private_value;
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct da7218_priv *da7218 = snd_soc_component_get_drvdata(component);
 	unsigned int lvalue = ucontrol->value.integer.value[0];
 	unsigned int rvalue = ucontrol->value.integer.value[1];
 static int da7218_tonegen_freq_get(struct snd_kcontrol *kcontrol,
 				   struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct da7218_priv *da7218 = snd_soc_component_get_drvdata(component);
 	struct soc_mixer_control *mixer_ctrl =
 		(struct soc_mixer_control *) kcontrol->private_value;
 static int da7218_tonegen_freq_put(struct snd_kcontrol *kcontrol,
 				   struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct da7218_priv *da7218 = snd_soc_component_get_drvdata(component);
 	struct soc_mixer_control *mixer_ctrl =
 		(struct soc_mixer_control *) kcontrol->private_value;
 static int da7218_mic_lvl_det_sw_put(struct snd_kcontrol *kcontrol,
 				     struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct da7218_priv *da7218 = snd_soc_component_get_drvdata(component);
 	struct soc_mixer_control *mixer_ctrl =
 		(struct soc_mixer_control *) kcontrol->private_value;
 static int da7218_mic_lvl_det_sw_get(struct snd_kcontrol *kcontrol,
 				     struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct da7218_priv *da7218 = snd_soc_component_get_drvdata(component);
 	struct soc_mixer_control *mixer_ctrl =
 		(struct soc_mixer_control *) kcontrol->private_value;
 static int da7218_biquad_coeff_get(struct snd_kcontrol *kcontrol,
 				   struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct da7218_priv *da7218 = snd_soc_component_get_drvdata(component);
 	struct soc_bytes_ext *bytes_ext =
 		(struct soc_bytes_ext *) kcontrol->private_value;
 static int da7218_biquad_coeff_put(struct snd_kcontrol *kcontrol,
 				   struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct da7218_priv *da7218 = snd_soc_component_get_drvdata(component);
 	struct soc_bytes_ext *bytes_ext =
 		(struct soc_bytes_ext *) kcontrol->private_value;
 				 enum snd_soc_bias_level level)
 {
 	struct da7218_priv *da7218 = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	int ret;
 	switch (level) {
 		break;
 	case SND_SOC_BIAS_PREPARE:
 		/* Enable MCLK for transition to ON state */
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_STANDBY) {
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_STANDBY) {
 			if (da7218->mclk) {
 				ret = clk_prepare_enable(da7218->mclk);
 				if (ret) {
 		break;
 	case SND_SOC_BIAS_STANDBY:
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) {
 			/* Master bias */
 			snd_soc_component_update_bits(component, DA7218_REFERENCES,
 					    DA7218_BIAS_EN_MASK,

sound/soc/codecs/da7219-aad.c+5−5

sound/soc/codecs/da7219.c+16−13

 static int da7219_volsw_locked_get(struct snd_kcontrol *kcontrol,
 				   struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component);
 	int ret;
 static int da7219_volsw_locked_put(struct snd_kcontrol *kcontrol,
 				   struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component);
 	int ret;
 static int da7219_enum_locked_get(struct snd_kcontrol *kcontrol,
 				struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component);
 	int ret;
 static int da7219_enum_locked_put(struct snd_kcontrol *kcontrol,
 				struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component);
 	int ret;
 static int da7219_mixin_gain_put(struct snd_kcontrol *kcontrol,
 				 struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component);
 	int ret;
 static int da7219_alc_sw_put(struct snd_kcontrol *kcontrol,
 			     struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component);
 static int da7219_tonegen_freq_get(struct snd_kcontrol *kcontrol,
 				   struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component);
 	struct soc_mixer_control *mixer_ctrl =
 		(struct soc_mixer_control *) kcontrol->private_value;
 static int da7219_tonegen_freq_put(struct snd_kcontrol *kcontrol,
 				   struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component);
 	struct soc_mixer_control *mixer_ctrl =
 		(struct soc_mixer_control *) kcontrol->private_value;
 				 enum snd_soc_bias_level level)
 {
 	struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	int ret;
 	switch (level) {
 		break;
 	case SND_SOC_BIAS_PREPARE:
 		/* Enable MCLK for transition to ON state */
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_STANDBY) {
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_STANDBY) {
 			if (da7219->mclk) {
 				ret = clk_prepare_enable(da7219->mclk);
 				if (ret) {
 		break;
 	case SND_SOC_BIAS_STANDBY:
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF)
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF)
 			/* Master bias */
 			snd_soc_component_update_bits(component, DA7219_REFERENCES,
 					    DA7219_BIAS_EN_MASK,
 					    DA7219_BIAS_EN_MASK);
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_PREPARE) {
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_PREPARE) {
 			/* Remove MCLK */
 			if (da7219->mclk)
 				clk_disable_unprepare(da7219->mclk);
 static int da7219_suspend(struct snd_soc_component *component)
 {
 	struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	/* Suspend AAD if we're not a wake-up source */
 	if (!da7219->wakeup_source)
 		da7219_aad_suspend(component);
-	snd_soc_component_force_bias_level(component, SND_SOC_BIAS_OFF);
+	snd_soc_dapm_force_bias_level(dapm, SND_SOC_BIAS_OFF);
 	return 0;
 }
 static int da7219_resume(struct snd_soc_component *component)
 {
 	struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
-	snd_soc_component_force_bias_level(component, SND_SOC_BIAS_STANDBY);
+	snd_soc_dapm_force_bias_level(dapm, SND_SOC_BIAS_STANDBY);
 	/* Resume AAD if previously suspended */
 	if (!da7219->wakeup_source)

sound/soc/codecs/da732x.c+4−3

 static int da732x_hpf_set(struct snd_kcontrol *kcontrol,
 			  struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct soc_enum *enum_ctrl = (struct soc_enum *)kcontrol->private_value;
 	unsigned int reg = enum_ctrl->reg;
 	unsigned int sel = ucontrol->value.enumerated.item[0];
 static int da732x_hpf_get(struct snd_kcontrol *kcontrol,
 			  struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct soc_enum *enum_ctrl = (struct soc_enum *)kcontrol->private_value;
 	unsigned int reg = enum_ctrl->reg;
 	int val;
 				 enum snd_soc_bias_level level)
 {
 	struct da732x_priv *da732x = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	switch (level) {
 	case SND_SOC_BIAS_ON:
 	case SND_SOC_BIAS_PREPARE:
 		break;
 	case SND_SOC_BIAS_STANDBY:
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) {
 			/* Init Codec */
 			snd_soc_component_write(component, DA732X_REG_REF1,
 				      DA732X_VMID_FASTCHG);

sound/soc/codecs/da9055.c+4−2

 static int da9055_put_alc_sw(struct snd_kcontrol *kcontrol,
 			     struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	u8 reg_val, adc_left, adc_right, mic_left, mic_right;
 	int avg_left_data, avg_right_data, offset_l, offset_r;
 static int da9055_set_bias_level(struct snd_soc_component *component,
 				 enum snd_soc_bias_level level)
 {
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	switch (level) {
 	case SND_SOC_BIAS_ON:
 	case SND_SOC_BIAS_PREPARE:
 		break;
 	case SND_SOC_BIAS_STANDBY:
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) {
 			/* Enable VMID reference & master bias */
 			snd_soc_component_update_bits(component, DA9055_REFERENCES,
 					    DA9055_VMID_EN | DA9055_BIAS_EN,

sound/soc/codecs/es7134.c+1−1

@@ -104,7 +104,7 @@ static int es7134_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) · 103 unmodified lines
104		104
105	static int es7134_component_probe(struct snd_soc_component *c)	105	static int es7134_component_probe(struct snd_soc_component *c)
106	{	106	{
107	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(c);	107	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(c);
108	struct es7134_data *priv = snd_soc_component_get_drvdata(c);	108	struct es7134_data *priv = snd_soc_component_get_drvdata(c);
109	const struct es7134_chip *chip = priv->chip;	109	const struct es7134_chip *chip = priv->chip;
110	int ret;	110	int ret;

sound/soc/codecs/es8311.c+2−1

 				 enum snd_soc_bias_level level)
 {
 	struct es8311_priv *es8311 = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	switch (level) {
 	case SND_SOC_BIAS_ON:
 	case SND_SOC_BIAS_PREPARE:
 		break;
 	case SND_SOC_BIAS_STANDBY:
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) {
 			int ret = clk_prepare_enable(es8311->mclk);
 			if (ret) {
 				dev_err(component->dev,

sound/soc/codecs/es8316.c+2−2

@@ -590,7 +590,7 @@ static struct snd_soc_dai_driver es8316_dai = { · 589 unmodified lines
590	static void es8316_enable_micbias_for_mic_gnd_short_detect(	590	static void es8316_enable_micbias_for_mic_gnd_short_detect(
591	struct snd_soc_component *component)	591	struct snd_soc_component *component)
592	{	592	{
593	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	593	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
594		594
595	snd_soc_dapm_mutex_lock(dapm);	595	snd_soc_dapm_mutex_lock(dapm);
596	snd_soc_dapm_force_enable_pin_unlocked(dapm, "Bias");	596	snd_soc_dapm_force_enable_pin_unlocked(dapm, "Bias");
@@ -605,7 +605,7 @@ static void es8316_enable_micbias_for_mic_gnd_short_detect( · 8 unmodified lines
605	static void es8316_disable_micbias_for_mic_gnd_short_detect(	605	static void es8316_disable_micbias_for_mic_gnd_short_detect(
606	struct snd_soc_component *component)	606	struct snd_soc_component *component)
607	{	607	{
608	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	608	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
609		609
610	snd_soc_dapm_mutex_lock(dapm);	610	snd_soc_dapm_mutex_lock(dapm);
611	snd_soc_dapm_disable_pin_unlocked(dapm, "Mic Bias");	611	snd_soc_dapm_disable_pin_unlocked(dapm, "Mic Bias");

sound/soc/codecs/es8326.c+8−8

@@ -737,7 +737,7 @@ static struct snd_soc_dai_driver es8326_dai = { · 736 unmodified lines
737		737
738	static void es8326_enable_micbias(struct snd_soc_component *component)	738	static void es8326_enable_micbias(struct snd_soc_component *component)
739	{	739	{
740	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	740	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
741		741
742	snd_soc_dapm_mutex_lock(dapm);	742	snd_soc_dapm_mutex_lock(dapm);
743	snd_soc_dapm_force_enable_pin_unlocked(dapm, "MICBIAS1");	743	snd_soc_dapm_force_enable_pin_unlocked(dapm, "MICBIAS1");
@@ -748,7 +748,7 @@ static void es8326_enable_micbias(struct snd_soc_component *component) · 4 unmodified lines
748		748
749	static void es8326_disable_micbias(struct snd_soc_component *component)	749	static void es8326_disable_micbias(struct snd_soc_component *component)
750	{	750	{
751	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	751	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
752		752
753	snd_soc_dapm_mutex_lock(dapm);	753	snd_soc_dapm_mutex_lock(dapm);
754	snd_soc_dapm_disable_pin_unlocked(dapm, "MICBIAS1");	754	snd_soc_dapm_disable_pin_unlocked(dapm, "MICBIAS1");
@@ -812,12 +812,12 @@ static void es8326_jack_button_handler(struct work_struct *work) · 57 unmodified lines
812	press_count = 0;	812	press_count = 0;
813	}	813	}
814	button_to_report = cur_button;	814	button_to_report = cur_button;
815	queue_delayed_work(system_wq, &es8326->button_press_work,	815	queue_delayed_work(system_dfl_wq, &es8326->button_press_work,
816	msecs_to_jiffies(35));	816	msecs_to_jiffies(35));
817	} else if (prev_button != cur_button) {	817	} else if (prev_button != cur_button) {
818	/* mismatch, detect again */	818	/* mismatch, detect again */
819	prev_button = cur_button;	819	prev_button = cur_button;
820	queue_delayed_work(system_wq, &es8326->button_press_work,	820	queue_delayed_work(system_dfl_wq, &es8326->button_press_work,
821	msecs_to_jiffies(35));	821	msecs_to_jiffies(35));
822	} else {	822	} else {
823	/* released or no pressed */	823	/* released or no pressed */
@@ -912,7 +912,7 @@ static void es8326_jack_detect_handler(struct work_struct *work) · 88 unmodified lines
912	(ES8326_INT_SRC_PIN9 \| ES8326_INT_SRC_BUTTON));	912	(ES8326_INT_SRC_PIN9 \| ES8326_INT_SRC_BUTTON));
913	regmap_write(es8326->regmap, ES8326_SYS_BIAS, 0x1f);	913	regmap_write(es8326->regmap, ES8326_SYS_BIAS, 0x1f);
914	regmap_update_bits(es8326->regmap, ES8326_HP_DRIVER_REF, 0x0f, 0x0d);	914	regmap_update_bits(es8326->regmap, ES8326_HP_DRIVER_REF, 0x0f, 0x0d);
915	queue_delayed_work(system_wq, &es8326->jack_detect_work,	915	queue_delayed_work(system_dfl_wq, &es8326->jack_detect_work,
916	msecs_to_jiffies(400));	916	msecs_to_jiffies(400));
917	es8326->hp = 1;	917	es8326->hp = 1;
918	goto exit;	918	goto exit;
@@ -923,7 +923,7 @@ static void es8326_jack_detect_handler(struct work_struct *work) · 4 unmodified lines
923	regmap_write(es8326->regmap, ES8326_INT_SOURCE,	923	regmap_write(es8326->regmap, ES8326_INT_SOURCE,
924	(ES8326_INT_SRC_PIN9 \| ES8326_INT_SRC_BUTTON));	924	(ES8326_INT_SRC_PIN9 \| ES8326_INT_SRC_BUTTON));
925	es8326_enable_micbias(es8326->component);	925	es8326_enable_micbias(es8326->component);
926	queue_delayed_work(system_wq, &es8326->button_press_work, 10);	926	queue_delayed_work(system_dfl_wq, &es8326->button_press_work, 10);
927	goto exit;	927	goto exit;
928	}	928	}
929	if ((iface & ES8326_HPBUTTON_FLAG) == 0x01) {	929	if ((iface & ES8326_HPBUTTON_FLAG) == 0x01) {
@@ -958,10 +958,10 @@ static irqreturn_t es8326_irq(int irq, void *dev_id) · 28 unmodified lines
958	goto out;	958	goto out;
959		959
960	if (es8326->jack->status & SND_JACK_HEADSET)	960	if (es8326->jack->status & SND_JACK_HEADSET)
961	queue_delayed_work(system_wq, &es8326->jack_detect_work,	961	queue_delayed_work(system_dfl_wq, &es8326->jack_detect_work,
962	msecs_to_jiffies(10));	962	msecs_to_jiffies(10));
963	else	963	else
964	queue_delayed_work(system_wq, &es8326->jack_detect_work,	964	queue_delayed_work(system_dfl_wq, &es8326->jack_detect_work,
965	msecs_to_jiffies(300));	965	msecs_to_jiffies(300));
966		966
967	out:	967	out:

sound/soc/codecs/es8328.c+5−3

 static int es8328_get_deemph(struct snd_kcontrol *kcontrol,
 			     struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct es8328_priv *es8328 = snd_soc_component_get_drvdata(component);
 	ucontrol->value.integer.value[0] = es8328->deemph;
 static int es8328_put_deemph(struct snd_kcontrol *kcontrol,
 			     struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct es8328_priv *es8328 = snd_soc_component_get_drvdata(component);
 	unsigned int deemph = ucontrol->value.integer.value[0];
 	int ret;
 static int es8328_set_bias_level(struct snd_soc_component *component,
 				 enum snd_soc_bias_level level)
 {
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	switch (level) {
 	case SND_SOC_BIAS_ON:
 		break;
 		break;
 	case SND_SOC_BIAS_STANDBY:
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) {
 			snd_soc_component_update_bits(component, ES8328_CONTROL1,
 					ES8328_CONTROL1_VMIDSEL_MASK |
 					ES8328_CONTROL1_ENREF,

sound/soc/codecs/es8389.c+2−2

@@ -57,8 +57,8 @@ static const DECLARE_TLV_DB_SCALE(alc_max_level, -3200, 200, 0); · 56 unmodified lines
57	static int es8389_dmic_set(struct snd_kcontrol *kcontrol,	57	static int es8389_dmic_set(struct snd_kcontrol *kcontrol,
58	struct snd_ctl_elem_value *ucontrol)	58	struct snd_ctl_elem_value *ucontrol)
59	{	59	{
60	struct snd_soc_component *component = snd_soc_dapm_kcontrol_component(kcontrol);	60	struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol);
61	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kcontrol);	61	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol);
62	struct es8389_private *es8389 = snd_soc_component_get_drvdata(component);	62	struct es8389_private *es8389 = snd_soc_component_get_drvdata(component);
63	struct soc_enum e = (struct soc_enum )kcontrol->private_value;	63	struct soc_enum e = (struct soc_enum )kcontrol->private_value;
64	unsigned int val;	64	unsigned int val;

sound/soc/codecs/fs210x.c+1−1

@@ -924,7 +924,7 @@ static int fs210x_get_drvdata_from_kctrl(struct snd_kcontrol *kctrl, · 923 unmodified lines
924	return -EINVAL;	924	return -EINVAL;
925	}	925	}
926		926
927	cmpnt = snd_soc_kcontrol_component(kctrl);	927	cmpnt = snd_kcontrol_chip(kctrl);
928	if (!cmpnt) {	928	if (!cmpnt) {
929	pr_err("fs210x: component is null\n");	929	pr_err("fs210x: component is null\n");
930	return -EINVAL;	930	return -EINVAL;

sound/soc/codecs/hda.c+1−1

@@ -96,7 +96,7 @@ static int hda_codec_register_dais(struct hda_codec *codec, struct snd_soc_compo · 95 unmodified lines
96	if (ret < 0)	96	if (ret < 0)
97	return ret;	97	return ret;
98		98
99	dapm = snd_soc_component_get_dapm(component);	99	dapm = snd_soc_component_to_dapm(component);
100		100
101	list_for_each_entry(pcm, &codec->pcm_list_head, list) {	101	list_for_each_entry(pcm, &codec->pcm_list_head, list) {
102	struct snd_soc_dai *dai;	102	struct snd_soc_dai *dai;

sound/soc/codecs/hdac_hda.c+1−3

 {
 	struct hdac_hda_priv *hda_pvt =
 			snd_soc_component_get_drvdata(component);
-	struct snd_soc_dapm_context *dapm =
-			snd_soc_component_get_dapm(component);
 	struct hdac_device *hdev = &hda_pvt->codec->core;
 	struct hda_codec *hcodec = hda_pvt->codec;
 	struct hda_codec_driver *driver = hda_codec_to_driver(hcodec);
 	 */
 	pm_runtime_get_noresume(&hdev->dev);
-	hcodec->bus->card = dapm->card->snd_card;
+	hcodec->bus->card = component->card->snd_card;
 	ret = snd_hda_codec_set_name(hcodec, hcodec->preset->name);
 	if (ret < 0) {

sound/soc/codecs/hdac_hdmi.c+20−15

 					struct snd_kcontrol *kc, int event)
 {
 	struct hdac_hdmi_port *port = w->priv;
-	struct hdac_device *hdev = dev_to_hdac_dev(w->dapm->dev);
+	struct device *dev = snd_soc_dapm_to_dev(w->dapm);
+	struct hdac_device *hdev = dev_to_hdac_dev(dev);
 	struct hdac_hdmi_pcm *pcm;
 	dev_dbg(&hdev->dev, "%s: widget: %s event: %x\n",
 					struct snd_kcontrol *kc, int event)
 {
 	struct hdac_hdmi_cvt *cvt = w->priv;
-	struct hdac_device *hdev = dev_to_hdac_dev(w->dapm->dev);
+	struct device *dev = snd_soc_dapm_to_dev(w->dapm);
+	struct hdac_device *hdev = dev_to_hdac_dev(dev);
 	struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(hdev);
 	struct hdac_hdmi_pcm *pcm;
 					struct snd_kcontrol *kc, int event)
 {
 	struct hdac_hdmi_port *port = w->priv;
-	struct hdac_device *hdev = dev_to_hdac_dev(w->dapm->dev);
+	struct device *dev = snd_soc_dapm_to_dev(w->dapm);
+	struct hdac_device *hdev = dev_to_hdac_dev(dev);
 	int mux_idx;
 	dev_dbg(&hdev->dev, "%s: widget: %s event: %x\n",
 	if (!kc)
 		kc  = w->kcontrols[0];
-	mux_idx = dapm_kcontrol_get_value(kc);
+	mux_idx = snd_soc_dapm_kcontrol_get_value(kc);
 	/* set the device if pin is mst_capable */
 	if (hdac_hdmi_port_select_set(hdev, port) < 0)
 	int ret;
 	struct hdac_hdmi_port *p, *p_next;
 	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
-	struct snd_soc_dapm_widget *w = snd_soc_dapm_kcontrol_widget(kcontrol);
+	struct snd_soc_dapm_widget *w = snd_soc_dapm_kcontrol_to_widget(kcontrol);
 	struct snd_soc_dapm_context *dapm = w->dapm;
+	struct device *dev = snd_soc_dapm_to_dev(dapm);
 	struct hdac_hdmi_port *port = w->priv;
-	struct hdac_device *hdev = dev_to_hdac_dev(dapm->dev);
+	struct hdac_device *hdev = dev_to_hdac_dev(dev);
 	struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(hdev);
 	struct hdac_hdmi_pcm *pcm;
 	const char *cvt_name =  e->texts[ucontrol->value.enumerated.item[0]];
  */
 static int create_fill_widget_route_map(struct snd_soc_dapm_context *dapm)
 {
+	struct device *dev = snd_soc_dapm_to_dev(dapm);
+	struct snd_soc_card *card = snd_soc_dapm_to_card(dapm);
 	struct snd_soc_dapm_widget *widgets;
 	struct snd_soc_dapm_route *route;
-	struct hdac_device *hdev = dev_to_hdac_dev(dapm->dev);
+	struct hdac_device *hdev = dev_to_hdac_dev(dev);
 	struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(hdev);
 	struct snd_soc_dai_driver *dai_drv = hdmi->dai_drv;
 	char widget_name[NAME_SIZE];
 	if (list_empty(&hdmi->cvt_list) || list_empty(&hdmi->pin_list))
 		return -EINVAL;
-	widgets = devm_kzalloc(dapm->dev, (sizeof(*widgets) *
+	widgets = devm_kzalloc(dev, (sizeof(*widgets) *
 				((2 * hdmi->num_ports) + hdmi->num_cvt)),
 				GFP_KERNEL);
 	/* DAPM widgets to represent each converter widget */
 	list_for_each_entry(cvt, &hdmi->cvt_list, head) {
 		sprintf(widget_name, "Converter %d", cvt->nid);
-		ret = hdac_hdmi_fill_widget_info(dapm->dev, &widgets[i],
+		ret = hdac_hdmi_fill_widget_info(dev, &widgets[i],
 			snd_soc_dapm_aif_in, cvt,
 			widget_name, dai_drv[i].playback.stream_name, NULL, 0,
 			hdac_hdmi_cvt_output_widget_event,
 		for (j = 0; j < pin->num_ports; j++) {
 			sprintf(widget_name, "hif%d-%d Output",
 				pin->nid, pin->ports[j].id);
-			ret = hdac_hdmi_fill_widget_info(dapm->dev, &widgets[i],
+			ret = hdac_hdmi_fill_widget_info(dev, &widgets[i],
 					snd_soc_dapm_output, &pin->ports[j],
 					widget_name, NULL, NULL, 0,
 					hdac_hdmi_pin_output_widget_event,
 		}
 	}
-	route = devm_kzalloc(dapm->dev, (sizeof(*route) * num_routes),
+	route = devm_kzalloc(dev, (sizeof(*route) * num_routes),
 							GFP_KERNEL);
 	if (!route)
 		return -ENOMEM;
 		((2 * hdmi->num_ports) + hdmi->num_cvt));
 	snd_soc_dapm_add_routes(dapm, route, num_routes);
-	snd_soc_dapm_new_widgets(dapm->card);
+	snd_soc_dapm_new_widgets(card);
 	return 0;
 {
 	struct hdac_hdmi_priv *hdmi = snd_soc_component_get_drvdata(component);
 	struct hdac_device *hdev = hdmi->hdev;
-	struct snd_soc_dapm_context *dapm =
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
-		snd_soc_component_get_dapm(component);
 	struct hdac_ext_link *hlink;
 	int ret;
 	hdac_hdmi_present_sense_all_pins(hdev, hdmi, true);
 	/* Imp: Store the card pointer in hda_codec */
-	hdmi->card = dapm->card->snd_card;
+	hdmi->card = component->card->snd_card;
 	/*
 	 * Setup a device_link between card device and HDMI codec device.

sound/soc/codecs/hdmi-codec.c+1−1

@@ -908,7 +908,7 @@ static int hdmi_dai_probe(struct snd_soc_dai *dai) · 907 unmodified lines
908	};	908	};
909	int ret, i;	909	int ret, i;
910		910
911	dapm = snd_soc_component_get_dapm(dai->component);	911	dapm = snd_soc_component_to_dapm(dai->component);
912		912
913	/* One of the directions might be omitted for unidirectional DAIs */	913	/* One of the directions might be omitted for unidirectional DAIs */
914	for (i = 0; i < ARRAY_SIZE(route); i++) {	914	for (i = 0; i < ARRAY_SIZE(route); i++) {

sound/soc/codecs/idt821034.c+4−4

sound/soc/codecs/jz4740.c+2−1

 static int jz4740_codec_set_bias_level(struct snd_soc_component *component,
 	enum snd_soc_bias_level level)
 {
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	struct jz4740_codec *jz4740_codec = snd_soc_component_get_drvdata(component);
 	struct regmap *regmap = jz4740_codec->regmap;
 	unsigned int mask;
 		break;
 	case SND_SOC_BIAS_STANDBY:
 		/* The only way to clear the suspend flag is to reset the codec */
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF)
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF)
 			jz4740_codec_wakeup(regmap);
 		mask = JZ4740_CODEC_1_VREF_DISABLE |

sound/soc/codecs/jz4760.c+4−3

 				struct snd_soc_dai *dai)
 {
 	struct snd_soc_component *codec = dai->component;
-	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(codec);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(codec);
 	int ret = 0;
 	/*
 				  struct snd_soc_dai *dai)
 {
 	struct snd_soc_component *codec = dai->component;
-	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(codec);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(codec);
 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
 		snd_soc_dapm_disable_pin(dapm, "SYSCLK");
 				    int cmd, struct snd_soc_dai *dai)
 {
 	struct snd_soc_component *codec = dai->component;
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(codec);
 	int ret = 0;
 	switch (cmd) {
 	case SNDRV_PCM_TRIGGER_RESUME:
 	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
 		if (substream->stream != SNDRV_PCM_STREAM_PLAYBACK)
-			snd_soc_component_force_bias_level(codec, SND_SOC_BIAS_ON);
+			snd_soc_dapm_force_bias_level(dapm, SND_SOC_BIAS_ON);
 		break;
 	case SNDRV_PCM_TRIGGER_STOP:
 	case SNDRV_PCM_TRIGGER_SUSPEND:

sound/soc/codecs/jz4770.c+4−4

 				struct snd_soc_dai *dai)
 {
 	struct snd_soc_component *codec = dai->component;
-	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(codec);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(codec);
 	/*
 	 * SYSCLK output from the codec to the AIC is required to keep the
 				  struct snd_soc_dai *dai)
 {
 	struct snd_soc_component *codec = dai->component;
-	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(codec);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(codec);
 	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
 		snd_soc_dapm_disable_pin(dapm, "SYSCLK");
 				    int cmd, struct snd_soc_dai *dai)
 {
 	struct snd_soc_component *codec = dai->component;
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(codec);
 	int ret = 0;
 	switch (cmd) {
 	case SNDRV_PCM_TRIGGER_RESUME:
 	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
 		if (substream->stream != SNDRV_PCM_STREAM_PLAYBACK)
-			snd_soc_component_force_bias_level(codec,
+			snd_soc_dapm_force_bias_level(dapm, SND_SOC_BIAS_ON);
-							   SND_SOC_BIAS_ON);
 		break;
 	case SNDRV_PCM_TRIGGER_STOP:
 	case SNDRV_PCM_TRIGGER_SUSPEND:

sound/soc/codecs/lm49453.c+2−1

 				  enum snd_soc_bias_level level)
 {
 	struct lm49453_priv *lm49453 = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	switch (level) {
 	case SND_SOC_BIAS_ON:
 		break;
 	case SND_SOC_BIAS_STANDBY:
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF)
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF)
 			regcache_sync(lm49453->regmap);
 		snd_soc_component_update_bits(component, LM49453_P0_PMC_SETUP_REG,

sound/soc/codecs/lpass-rx-macro.c+56−60

@@ -1682,7 +1682,7 @@ static const struct regmap_config rx_regmap_config = { · 1681 unmodified lines
1682	static int rx_macro_int_dem_inp_mux_put(struct snd_kcontrol *kcontrol,	1682	static int rx_macro_int_dem_inp_mux_put(struct snd_kcontrol *kcontrol,
1683	struct snd_ctl_elem_value *ucontrol)	1683	struct snd_ctl_elem_value *ucontrol)
1684	{	1684	{
1685	struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_widget(kcontrol);	1685	struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_to_widget(kcontrol);
1686	struct snd_soc_component *component = snd_soc_dapm_to_component(widget->dapm);	1686	struct snd_soc_component *component = snd_soc_dapm_to_component(widget->dapm);
1687	struct rx_macro *rx = snd_soc_component_get_drvdata(component);	1687	struct rx_macro *rx = snd_soc_component_get_drvdata(component);
1688	struct soc_enum e = (struct soc_enum )kcontrol->private_value;	1688	struct soc_enum e = (struct soc_enum )kcontrol->private_value;
@@ -1905,52 +1905,48 @@ static int rx_macro_digital_mute(struct snd_soc_dai *dai, int mute, int stream) · 216 unmodified lines
1905	{	1905	{
1906	struct snd_soc_component *component = dai->component;	1906	struct snd_soc_component *component = dai->component;
1907	struct rx_macro *rx = snd_soc_component_get_drvdata(component);	1907	struct rx_macro *rx = snd_soc_component_get_drvdata(component);
1908	uint16_t j, reg, mix_reg, dsm_reg;	1908	u32 port, j, reg, mix_reg, int_mux_cfg0, int_mux_cfg1;
1909	u16 int_mux_cfg0, int_mux_cfg1;	1909	u32 mask, val;
1910	u8 int_mux_cfg0_val, int_mux_cfg1_val;	1910	u8 int_mux_cfg0_val, int_mux_cfg1_val;
1911		1911
1912	switch (dai->id) {	1912	if (stream != SNDRV_PCM_STREAM_PLAYBACK)
1913	case RX_MACRO_AIF1_PB:	1913	return 0;
1914	case RX_MACRO_AIF2_PB:	1914
1915	case RX_MACRO_AIF3_PB:	1915	for (j = 0; j < INTERP_MAX; j++) {
1916	case RX_MACRO_AIF4_PB:	1916	reg = CDC_RX_RXn_RX_PATH_CTL(rx, j);
1917	for (j = 0; j < INTERP_MAX; j++) {	1917	mix_reg = CDC_RX_RXn_RX_PATH_MIX_CTL(rx, j);
1918	reg = CDC_RX_RXn_RX_PATH_CTL(rx, j);	1918
1919	mix_reg = CDC_RX_RXn_RX_PATH_MIX_CTL(rx, j);	1919	mask = CDC_RX_PATH_PGA_MUTE_MASK;
1920	dsm_reg = CDC_RX_RXn_RX_PATH_DSM_CTL(rx, j);	1920	val = 0;
1921		1921	if (mute)
1922	if (mute) {	1922	val \|= CDC_RX_PATH_PGA_MUTE_ENABLE;
1923	snd_soc_component_update_bits(component, reg,	1923	if (rx->main_clk_users[j] > 0) {
1924	CDC_RX_PATH_PGA_MUTE_MASK,	1924	mask \|= CDC_RX_PATH_CLK_EN_MASK;
1925	CDC_RX_PATH_PGA_MUTE_ENABLE);	1925	val \|= CDC_RX_PATH_CLK_ENABLE;
1926	snd_soc_component_update_bits(component, mix_reg,	1926	}
1927	CDC_RX_PATH_PGA_MUTE_MASK,	1927
1928	CDC_RX_PATH_PGA_MUTE_ENABLE);	1928	int_mux_cfg0 = CDC_RX_INP_MUX_RX_INT0_CFG0 + j * 8;
1929	} else {	1929	int_mux_cfg1 = int_mux_cfg0 + 4;
1930	snd_soc_component_update_bits(component, reg,	1930	int_mux_cfg0_val = snd_soc_component_read(component, int_mux_cfg0);
1931	CDC_RX_PATH_PGA_MUTE_MASK, 0x0);	1931	int_mux_cfg1_val = snd_soc_component_read(component, int_mux_cfg1);
1932	snd_soc_component_update_bits(component, mix_reg,	1932
1933	CDC_RX_PATH_PGA_MUTE_MASK, 0x0);	1933	for_each_set_bit(port, &rx->active_ch_mask[dai->id], RX_MACRO_PORTS_MAX) {
		1934	if (((int_mux_cfg0_val & 0x0f) == port + INTn_1_INP_SEL_RX0) \|\|
		1935	((int_mux_cfg0_val >> 4) == port + INTn_1_INP_SEL_RX0) \|\|
		1936	((int_mux_cfg1_val >> 4) == port + INTn_1_INP_SEL_RX0)) {
		1937	snd_soc_component_update_bits(component, reg, mask, val);
1934	}	1938	}
1935		1939
1936	int_mux_cfg0 = CDC_RX_INP_MUX_RX_INT0_CFG0 + j * 8;	1940	if ((int_mux_cfg1_val & 0x0f) == port + INTn_2_INP_SEL_RX0) {
1937	int_mux_cfg1 = int_mux_cfg0 + 4;	1941	snd_soc_component_update_bits(component, mix_reg, mask, val);
1938	int_mux_cfg0_val = snd_soc_component_read(component, int_mux_cfg0);	1942	/* main clock needs to be enabled for mix to be useful: */
1939	int_mux_cfg1_val = snd_soc_component_read(component, int_mux_cfg1);	1943	if (rx->main_clk_users[j] > 0) {
1940		1944	snd_soc_component_update_bits(component, reg,
1941	if (snd_soc_component_read(component, dsm_reg) & 0x01) {	1945	CDC_RX_PATH_CLK_EN_MASK,
1942	if (int_mux_cfg0_val \|\| (int_mux_cfg1_val & 0xF0))	1946	CDC_RX_PATH_CLK_ENABLE);
1943	snd_soc_component_update_bits(component, reg, 0x20, 0x20);
1944	if (int_mux_cfg1_val & 0x0F) {
1945	snd_soc_component_update_bits(component, reg, 0x20, 0x20);
1946	snd_soc_component_update_bits(component, mix_reg, 0x20,
1947	0x20);
1948	}	1947	}
1949	}	1948	}
1950	}	1949	}
1951	break;
1952	default:
1953	break;
1954	}	1950	}
1955	return 0;	1951	return 0;
1956	}	1952	}
@@ -2434,8 +2430,7 @@ static void rx_macro_hd2_control(struct snd_soc_component *component, · 477 unmodified lines
2434	static int rx_macro_get_compander(struct snd_kcontrol *kcontrol,	2430	static int rx_macro_get_compander(struct snd_kcontrol *kcontrol,
2435	struct snd_ctl_elem_value *ucontrol)	2431	struct snd_ctl_elem_value *ucontrol)
2436	{	2432	{
2437	struct snd_soc_component *component =	2433	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
2438	snd_soc_kcontrol_component(kcontrol);
2439	int comp = ((struct soc_mixer_control *) kcontrol->private_value)->shift;	2434	int comp = ((struct soc_mixer_control *) kcontrol->private_value)->shift;
2440	struct rx_macro *rx = snd_soc_component_get_drvdata(component);	2435	struct rx_macro *rx = snd_soc_component_get_drvdata(component);
2441		2436
@@ -2446,7 +2441,7 @@ static int rx_macro_get_compander(struct snd_kcontrol *kcontrol, · 4 unmodified lines
2446	static int rx_macro_set_compander(struct snd_kcontrol *kcontrol,	2441	static int rx_macro_set_compander(struct snd_kcontrol *kcontrol,
2447	struct snd_ctl_elem_value *ucontrol)	2442	struct snd_ctl_elem_value *ucontrol)
2448	{	2443	{
2449	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	2444	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
2450	int comp = ((struct soc_mixer_control *) kcontrol->private_value)->shift;	2445	int comp = ((struct soc_mixer_control *) kcontrol->private_value)->shift;
2451	int value = ucontrol->value.integer.value[0];	2446	int value = ucontrol->value.integer.value[0];
2452	struct rx_macro *rx = snd_soc_component_get_drvdata(component);	2447	struct rx_macro *rx = snd_soc_component_get_drvdata(component);
@@ -2459,7 +2454,7 @@ static int rx_macro_set_compander(struct snd_kcontrol *kcontrol, · 6 unmodified lines
2459	static int rx_macro_mux_get(struct snd_kcontrol *kcontrol,	2454	static int rx_macro_mux_get(struct snd_kcontrol *kcontrol,
2460	struct snd_ctl_elem_value *ucontrol)	2455	struct snd_ctl_elem_value *ucontrol)
2461	{	2456	{
2462	struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_widget(kcontrol);	2457	struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_to_widget(kcontrol);
2463	struct snd_soc_component *component = snd_soc_dapm_to_component(widget->dapm);	2458	struct snd_soc_component *component = snd_soc_dapm_to_component(widget->dapm);
2464	struct rx_macro *rx = snd_soc_component_get_drvdata(component);	2459	struct rx_macro *rx = snd_soc_component_get_drvdata(component);
2465		2460
@@ -2471,7 +2466,7 @@ static int rx_macro_mux_get(struct snd_kcontrol *kcontrol, · 5 unmodified lines
2471	static int rx_macro_mux_put(struct snd_kcontrol *kcontrol,	2466	static int rx_macro_mux_put(struct snd_kcontrol *kcontrol,
2472	struct snd_ctl_elem_value *ucontrol)	2467	struct snd_ctl_elem_value *ucontrol)
2473	{	2468	{
2474	struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_widget(kcontrol);	2469	struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_to_widget(kcontrol);
2475	struct snd_soc_component *component = snd_soc_dapm_to_component(widget->dapm);	2470	struct snd_soc_component *component = snd_soc_dapm_to_component(widget->dapm);
2476	struct soc_enum e = (struct soc_enum )kcontrol->private_value;	2471	struct soc_enum e = (struct soc_enum )kcontrol->private_value;
2477	struct snd_soc_dapm_update *update = NULL;	2472	struct snd_soc_dapm_update *update = NULL;
@@ -2548,7 +2543,7 @@ static const struct snd_kcontrol_new rx_macro_rx5_mux = · 70 unmodified lines
2548	static int rx_macro_get_ear_mode(struct snd_kcontrol *kcontrol,	2543	static int rx_macro_get_ear_mode(struct snd_kcontrol *kcontrol,
2549	struct snd_ctl_elem_value *ucontrol)	2544	struct snd_ctl_elem_value *ucontrol)
2550	{	2545	{
2551	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	2546	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
2552	struct rx_macro *rx = snd_soc_component_get_drvdata(component);	2547	struct rx_macro *rx = snd_soc_component_get_drvdata(component);
2553		2548
2554	ucontrol->value.integer.value[0] = rx->is_ear_mode_on;	2549	ucontrol->value.integer.value[0] = rx->is_ear_mode_on;
@@ -2558,7 +2553,7 @@ static int rx_macro_get_ear_mode(struct snd_kcontrol *kcontrol, · 3 unmodified lines
2558	static int rx_macro_put_ear_mode(struct snd_kcontrol *kcontrol,	2553	static int rx_macro_put_ear_mode(struct snd_kcontrol *kcontrol,
2559	struct snd_ctl_elem_value *ucontrol)	2554	struct snd_ctl_elem_value *ucontrol)
2560	{	2555	{
2561	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	2556	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
2562	struct rx_macro *rx = snd_soc_component_get_drvdata(component);	2557	struct rx_macro *rx = snd_soc_component_get_drvdata(component);
2563		2558
2564	rx->is_ear_mode_on = (!ucontrol->value.integer.value[0] ? false : true);	2559	rx->is_ear_mode_on = (!ucontrol->value.integer.value[0] ? false : true);
@@ -2568,7 +2563,7 @@ static int rx_macro_put_ear_mode(struct snd_kcontrol *kcontrol, · 3 unmodified lines
2568	static int rx_macro_get_hph_hd2_mode(struct snd_kcontrol *kcontrol,	2563	static int rx_macro_get_hph_hd2_mode(struct snd_kcontrol *kcontrol,
2569	struct snd_ctl_elem_value *ucontrol)	2564	struct snd_ctl_elem_value *ucontrol)
2570	{	2565	{
2571	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	2566	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
2572	struct rx_macro *rx = snd_soc_component_get_drvdata(component);	2567	struct rx_macro *rx = snd_soc_component_get_drvdata(component);
2573		2568
2574	ucontrol->value.integer.value[0] = rx->hph_hd2_mode;	2569	ucontrol->value.integer.value[0] = rx->hph_hd2_mode;
@@ -2578,7 +2573,7 @@ static int rx_macro_get_hph_hd2_mode(struct snd_kcontrol *kcontrol, · 3 unmodified lines
2578	static int rx_macro_put_hph_hd2_mode(struct snd_kcontrol *kcontrol,	2573	static int rx_macro_put_hph_hd2_mode(struct snd_kcontrol *kcontrol,
2579	struct snd_ctl_elem_value *ucontrol)	2574	struct snd_ctl_elem_value *ucontrol)
2580	{	2575	{
2581	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	2576	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
2582	struct rx_macro *rx = snd_soc_component_get_drvdata(component);	2577	struct rx_macro *rx = snd_soc_component_get_drvdata(component);
2583		2578
2584	rx->hph_hd2_mode = ucontrol->value.integer.value[0];	2579	rx->hph_hd2_mode = ucontrol->value.integer.value[0];
@@ -2588,7 +2583,7 @@ static int rx_macro_put_hph_hd2_mode(struct snd_kcontrol *kcontrol, · 3 unmodified lines
2588	static int rx_macro_get_hph_pwr_mode(struct snd_kcontrol *kcontrol,	2583	static int rx_macro_get_hph_pwr_mode(struct snd_kcontrol *kcontrol,
2589	struct snd_ctl_elem_value *ucontrol)	2584	struct snd_ctl_elem_value *ucontrol)
2590	{	2585	{
2591	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	2586	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
2592	struct rx_macro *rx = snd_soc_component_get_drvdata(component);	2587	struct rx_macro *rx = snd_soc_component_get_drvdata(component);
2593		2588
2594	ucontrol->value.enumerated.item[0] = rx->hph_pwr_mode;	2589	ucontrol->value.enumerated.item[0] = rx->hph_pwr_mode;
@@ -2598,7 +2593,7 @@ static int rx_macro_get_hph_pwr_mode(struct snd_kcontrol *kcontrol, · 3 unmodified lines
2598	static int rx_macro_put_hph_pwr_mode(struct snd_kcontrol *kcontrol,	2593	static int rx_macro_put_hph_pwr_mode(struct snd_kcontrol *kcontrol,
2599	struct snd_ctl_elem_value *ucontrol)	2594	struct snd_ctl_elem_value *ucontrol)
2600	{	2595	{
2601	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	2596	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
2602	struct rx_macro *rx = snd_soc_component_get_drvdata(component);	2597	struct rx_macro *rx = snd_soc_component_get_drvdata(component);
2603		2598
2604	rx->hph_pwr_mode = ucontrol->value.enumerated.item[0];	2599	rx->hph_pwr_mode = ucontrol->value.enumerated.item[0];
@@ -2608,7 +2603,7 @@ static int rx_macro_put_hph_pwr_mode(struct snd_kcontrol *kcontrol, · 3 unmodified lines
2608	static int rx_macro_soft_clip_enable_get(struct snd_kcontrol *kcontrol,	2603	static int rx_macro_soft_clip_enable_get(struct snd_kcontrol *kcontrol,
2609	struct snd_ctl_elem_value *ucontrol)	2604	struct snd_ctl_elem_value *ucontrol)
2610	{	2605	{
2611	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	2606	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
2612	struct rx_macro *rx = snd_soc_component_get_drvdata(component);	2607	struct rx_macro *rx = snd_soc_component_get_drvdata(component);
2613		2608
2614	ucontrol->value.integer.value[0] = rx->is_softclip_on;	2609	ucontrol->value.integer.value[0] = rx->is_softclip_on;
@@ -2619,7 +2614,7 @@ static int rx_macro_soft_clip_enable_get(struct snd_kcontrol *kcontrol, · 4 unmodified lines
2619	static int rx_macro_soft_clip_enable_put(struct snd_kcontrol *kcontrol,	2614	static int rx_macro_soft_clip_enable_put(struct snd_kcontrol *kcontrol,
2620	struct snd_ctl_elem_value *ucontrol)	2615	struct snd_ctl_elem_value *ucontrol)
2621	{	2616	{
2622	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	2617	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
2623	struct rx_macro *rx = snd_soc_component_get_drvdata(component);	2618	struct rx_macro *rx = snd_soc_component_get_drvdata(component);
2624		2619
2625	rx->is_softclip_on = ucontrol->value.integer.value[0];	2620	rx->is_softclip_on = ucontrol->value.integer.value[0];
@@ -2630,7 +2625,7 @@ static int rx_macro_soft_clip_enable_put(struct snd_kcontrol *kcontrol, · 4 unmodified lines
2630	static int rx_macro_aux_hpf_mode_get(struct snd_kcontrol *kcontrol,	2625	static int rx_macro_aux_hpf_mode_get(struct snd_kcontrol *kcontrol,
2631	struct snd_ctl_elem_value *ucontrol)	2626	struct snd_ctl_elem_value *ucontrol)
2632	{	2627	{
2633	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	2628	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
2634	struct rx_macro *rx = snd_soc_component_get_drvdata(component);	2629	struct rx_macro *rx = snd_soc_component_get_drvdata(component);
2635		2630
2636	ucontrol->value.integer.value[0] = rx->is_aux_hpf_on;	2631	ucontrol->value.integer.value[0] = rx->is_aux_hpf_on;
@@ -2641,7 +2636,7 @@ static int rx_macro_aux_hpf_mode_get(struct snd_kcontrol *kcontrol, · 4 unmodified lines
2641	static int rx_macro_aux_hpf_mode_put(struct snd_kcontrol *kcontrol,	2636	static int rx_macro_aux_hpf_mode_put(struct snd_kcontrol *kcontrol,
2642	struct snd_ctl_elem_value *ucontrol)	2637	struct snd_ctl_elem_value *ucontrol)
2643	{	2638	{
2644	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	2639	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
2645	struct rx_macro *rx = snd_soc_component_get_drvdata(component);	2640	struct rx_macro *rx = snd_soc_component_get_drvdata(component);
2646		2641
2647	rx->is_aux_hpf_on = ucontrol->value.integer.value[0];	2642	rx->is_aux_hpf_on = ucontrol->value.integer.value[0];
@@ -2930,8 +2925,7 @@ static int rx_macro_put_iir_band_audio_mixer( · 282 unmodified lines
2930	struct snd_kcontrol *kcontrol,	2925	struct snd_kcontrol *kcontrol,
2931	struct snd_ctl_elem_value *ucontrol)	2926	struct snd_ctl_elem_value *ucontrol)
2932	{	2927	{
2933	struct snd_soc_component *component =	2928	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
2934	snd_soc_kcontrol_component(kcontrol);
2935	struct wcd_iir_filter_ctl *ctl =	2929	struct wcd_iir_filter_ctl *ctl =
2936	(struct wcd_iir_filter_ctl *)kcontrol->private_value;	2930	(struct wcd_iir_filter_ctl *)kcontrol->private_value;
2937	struct soc_bytes_ext *params = &ctl->bytes_ext;	2931	struct soc_bytes_ext *params = &ctl->bytes_ext;
@@ -2959,8 +2953,7 @@ static int rx_macro_put_iir_band_audio_mixer( · 21 unmodified lines
2959	static int rx_macro_get_iir_band_audio_mixer(struct snd_kcontrol *kcontrol,	2953	static int rx_macro_get_iir_band_audio_mixer(struct snd_kcontrol *kcontrol,
2960	struct snd_ctl_elem_value *ucontrol)	2954	struct snd_ctl_elem_value *ucontrol)
2961	{	2955	{
2962	struct snd_soc_component *component =	2956	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
2963	snd_soc_kcontrol_component(kcontrol);
2964	struct wcd_iir_filter_ctl *ctl =	2957	struct wcd_iir_filter_ctl *ctl =
2965	(struct wcd_iir_filter_ctl *)kcontrol->private_value;	2958	(struct wcd_iir_filter_ctl *)kcontrol->private_value;
2966	struct soc_bytes_ext *params = &ctl->bytes_ext;	2959	struct soc_bytes_ext *params = &ctl->bytes_ext;
@@ -3612,7 +3605,7 @@ static const struct snd_soc_dapm_route rx_audio_map[] = { · 645 unmodified lines
3612		3605
3613	static int rx_macro_component_probe(struct snd_soc_component *component)	3606	static int rx_macro_component_probe(struct snd_soc_component *component)
3614	{	3607	{
3615	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	3608	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
3616	struct rx_macro *rx = snd_soc_component_get_drvdata(component);	3609	struct rx_macro *rx = snd_soc_component_get_drvdata(component);
3617	const struct snd_soc_dapm_widget *widgets;	3610	const struct snd_soc_dapm_widget *widgets;
3618	const struct snd_kcontrol_new *controls;	3611	const struct snd_kcontrol_new *controls;
@@ -3954,6 +3947,9 @@ static const struct of_device_id rx_macro_dt_match[] = { · 335 unmodified lines
3954	.compatible = "qcom,sc7280-lpass-rx-macro",	3947	.compatible = "qcom,sc7280-lpass-rx-macro",
3955	.data = (void *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK,	3948	.data = (void *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK,
3956		3949
		3950	}, {
		3951	.compatible = "qcom,sm6115-lpass-rx-macro",
		3952	.data = (void *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK,
3957	}, {	3953	}, {
3958	.compatible = "qcom,sm8250-lpass-rx-macro",	3954	.compatible = "qcom,sm8250-lpass-rx-macro",
3959	.data = (void *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK,	3955	.data = (void *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK,

sound/soc/codecs/lpass-tx-macro.c+10−9

 static int tx_macro_put_dec_enum(struct snd_kcontrol *kcontrol,
 				 struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_widget(kcontrol);
+	struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_to_widget(kcontrol);
 	struct snd_soc_component *component = snd_soc_dapm_to_component(widget->dapm);
 	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
 	struct tx_macro *tx = snd_soc_component_get_drvdata(component);
 static int tx_macro_tx_mixer_get(struct snd_kcontrol *kcontrol,
 				 struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_widget(kcontrol);
+	struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_to_widget(kcontrol);
 	struct snd_soc_component *component = snd_soc_dapm_to_component(widget->dapm);
 	struct soc_mixer_control *mc = (struct soc_mixer_control *)kcontrol->private_value;
 	u32 dai_id = widget->shift;
 static int tx_macro_tx_mixer_put(struct snd_kcontrol *kcontrol,
 				 struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_widget(kcontrol);
+	struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_to_widget(kcontrol);
 	struct snd_soc_component *component = snd_soc_dapm_to_component(widget->dapm);
 	struct snd_soc_dapm_update *update = NULL;
 	struct soc_mixer_control *mc = (struct soc_mixer_control *)kcontrol->private_value;
 static int tx_macro_dec_mode_get(struct snd_kcontrol *kcontrol,
 				 struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct tx_macro *tx = snd_soc_component_get_drvdata(component);
 	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
 	int path = e->shift_l;
 static int tx_macro_dec_mode_put(struct snd_kcontrol *kcontrol,
 				 struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	int value = ucontrol->value.integer.value[0];
 	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
 	int path = e->shift_l;
 static int tx_macro_get_bcs(struct snd_kcontrol *kcontrol,
 			    struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct tx_macro *tx = snd_soc_component_get_drvdata(component);
 	ucontrol->value.integer.value[0] = tx->bcs_enable;
 static int tx_macro_set_bcs(struct snd_kcontrol *kcontrol,
 			    struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	int value = ucontrol->value.integer.value[0];
 	struct tx_macro *tx = snd_soc_component_get_drvdata(component);
 static int tx_macro_component_extend(struct snd_soc_component *comp)
 {
-	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(comp);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(comp);
 	struct tx_macro *tx = snd_soc_component_get_drvdata(comp);
 	int ret;
 };
 static const struct tx_macro_data lpass_ver_10_sm6115 = {
-	.flags			= LPASS_MACRO_FLAG_HAS_NPL_CLOCK,
+	.flags			= LPASS_MACRO_FLAG_HAS_NPL_CLOCK |
+				  LPASS_MACRO_FLAG_RESET_SWR,
 	.ver			= LPASS_VER_10_0_0,
 	.extra_widgets		= tx_macro_dapm_widgets_v9_2,
 	.extra_widgets_num	= ARRAY_SIZE(tx_macro_dapm_widgets_v9_2),

sound/soc/codecs/lpass-va-macro.c+69−35

@@ -1,6 +1,7 @@
1	// SPDX-License-Identifier: GPL-2.0-only	1	// SPDX-License-Identifier: GPL-2.0-only
2	// Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.	2	// Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.
3		3
		4	#include <linux/bitfield.h>
4	#include <linux/clk.h>	5	#include <linux/clk.h>
5	#include <linux/clk-provider.h>	6	#include <linux/clk-provider.h>
6	#include <linux/init.h>	7	#include <linux/init.h>
@@ -64,8 +65,15 @@ · 57 unmodified lines
64	#define CDC_VA_TOP_CSR_I2S_CLK (0x00A8)	65	#define CDC_VA_TOP_CSR_I2S_CLK (0x00A8)
65	#define CDC_VA_TOP_CSR_I2S_RESET (0x00AC)	66	#define CDC_VA_TOP_CSR_I2S_RESET (0x00AC)
66	#define CDC_VA_TOP_CSR_CORE_ID_0 (0x00C0)	67	#define CDC_VA_TOP_CSR_CORE_ID_0 (0x00C0)
		68	#define CORE_ID_0_REV_MAJ GENMASK(7, 0)
67	#define CDC_VA_TOP_CSR_CORE_ID_1 (0x00C4)	69	#define CDC_VA_TOP_CSR_CORE_ID_1 (0x00C4)
		70	#define CORE_ID_1_HAS_WSAMACRO BIT(0)
		71	#define CORE_ID_1_HAS_RXMACRO BIT(1)
		72	#define CORE_ID_1_HAS_TXMACRO BIT(2)
		73	#define CORE_ID_1_HAS_VAMACRO BIT(3)
68	#define CDC_VA_TOP_CSR_CORE_ID_2 (0x00C8)	74	#define CDC_VA_TOP_CSR_CORE_ID_2 (0x00C8)
		75	#define CORE_ID_2_REV_MIN GENMASK(7, 4)
		76	#define CORE_ID_2_REV_STEP GENMASK(3, 0)
69	#define CDC_VA_TOP_CSR_CORE_ID_3 (0x00CC)	77	#define CDC_VA_TOP_CSR_CORE_ID_3 (0x00CC)
70	#define CDC_VA_TOP_CSR_SWR_MIC_CTL0 (0x00D0)	78	#define CDC_VA_TOP_CSR_SWR_MIC_CTL0 (0x00D0)
71	#define CDC_VA_TOP_CSR_SWR_MIC_CTL1 (0x00D4)	79	#define CDC_VA_TOP_CSR_SWR_MIC_CTL1 (0x00D4)
@@ -516,8 +524,7 @@ static int va_macro_mclk_event(struct snd_soc_dapm_widget *w, · 444 unmodified lines
516	static int va_macro_put_dec_enum(struct snd_kcontrol *kcontrol,	524	static int va_macro_put_dec_enum(struct snd_kcontrol *kcontrol,
517	struct snd_ctl_elem_value *ucontrol)	525	struct snd_ctl_elem_value *ucontrol)
518	{	526	{
519	struct snd_soc_dapm_widget *widget =	527	struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_to_widget(kcontrol);
520	snd_soc_dapm_kcontrol_widget(kcontrol);
521	struct snd_soc_component *component =	528	struct snd_soc_component *component =
522	snd_soc_dapm_to_component(widget->dapm);	529	snd_soc_dapm_to_component(widget->dapm);
523	struct soc_enum e = (struct soc_enum )kcontrol->private_value;	530	struct soc_enum e = (struct soc_enum )kcontrol->private_value;
@@ -556,8 +563,7 @@ static int va_macro_put_dec_enum(struct snd_kcontrol *kcontrol, · 32 unmodified lines
556	static int va_macro_tx_mixer_get(struct snd_kcontrol *kcontrol,	563	static int va_macro_tx_mixer_get(struct snd_kcontrol *kcontrol,
557	struct snd_ctl_elem_value *ucontrol)	564	struct snd_ctl_elem_value *ucontrol)
558	{	565	{
559	struct snd_soc_dapm_widget *widget =	566	struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_to_widget(kcontrol);
560	snd_soc_dapm_kcontrol_widget(kcontrol);
561	struct snd_soc_component *component =	567	struct snd_soc_component *component =
562	snd_soc_dapm_to_component(widget->dapm);	568	snd_soc_dapm_to_component(widget->dapm);
563	struct soc_mixer_control *mc =	569	struct soc_mixer_control *mc =
@@ -577,8 +583,7 @@ static int va_macro_tx_mixer_get(struct snd_kcontrol *kcontrol, · 13 unmodified lines
577	static int va_macro_tx_mixer_put(struct snd_kcontrol *kcontrol,	583	static int va_macro_tx_mixer_put(struct snd_kcontrol *kcontrol,
578	struct snd_ctl_elem_value *ucontrol)	584	struct snd_ctl_elem_value *ucontrol)
579	{	585	{
580	struct snd_soc_dapm_widget *widget =	586	struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_to_widget(kcontrol);
581	snd_soc_dapm_kcontrol_widget(kcontrol);
582	struct snd_soc_component *component =	587	struct snd_soc_component *component =
583	snd_soc_dapm_to_component(widget->dapm);	588	snd_soc_dapm_to_component(widget->dapm);
584	struct snd_soc_dapm_update *update = NULL;	589	struct snd_soc_dapm_update *update = NULL;
@@ -819,7 +824,7 @@ static int va_macro_enable_dec(struct snd_soc_dapm_widget *w, · 234 unmodified lines
819	static int va_macro_dec_mode_get(struct snd_kcontrol *kcontrol,	824	static int va_macro_dec_mode_get(struct snd_kcontrol *kcontrol,
820	struct snd_ctl_elem_value *ucontrol)	825	struct snd_ctl_elem_value *ucontrol)
821	{	826	{
822	struct snd_soc_component *comp = snd_soc_kcontrol_component(kcontrol);	827	struct snd_soc_component *comp = snd_kcontrol_chip(kcontrol);
823	struct va_macro *va = snd_soc_component_get_drvdata(comp);	828	struct va_macro *va = snd_soc_component_get_drvdata(comp);
824	struct soc_enum e = (struct soc_enum )kcontrol->private_value;	829	struct soc_enum e = (struct soc_enum )kcontrol->private_value;
825	int path = e->shift_l;	830	int path = e->shift_l;
@@ -832,7 +837,7 @@ static int va_macro_dec_mode_get(struct snd_kcontrol *kcontrol, · 6 unmodified lines
832	static int va_macro_dec_mode_put(struct snd_kcontrol *kcontrol,	837	static int va_macro_dec_mode_put(struct snd_kcontrol *kcontrol,
833	struct snd_ctl_elem_value *ucontrol)	838	struct snd_ctl_elem_value *ucontrol)
834	{	839	{
835	struct snd_soc_component *comp = snd_soc_kcontrol_component(kcontrol);	840	struct snd_soc_component *comp = snd_kcontrol_chip(kcontrol);
836	int value = ucontrol->value.enumerated.item[0];	841	int value = ucontrol->value.enumerated.item[0];
837	struct soc_enum e = (struct soc_enum )kcontrol->private_value;	842	struct soc_enum e = (struct soc_enum )kcontrol->private_value;
838	int path = e->shift_l;	843	int path = e->shift_l;
@@ -1462,39 +1467,63 @@ undefined_rate: · 623 unmodified lines
1462	return dmic_sample_rate;	1467	return dmic_sample_rate;
1463	}	1468	}
1464		1469
1465	static void va_macro_set_lpass_codec_version(struct va_macro *va)	1470	static int va_macro_set_lpass_codec_version(struct va_macro *va)
1466	{	1471	{
1467	int core_id_0 = 0, core_id_1 = 0, core_id_2 = 0;
1468	int version = LPASS_CODEC_VERSION_UNKNOWN;	1472	int version = LPASS_CODEC_VERSION_UNKNOWN;
		1473	u32 maj, min, step;
		1474	u32 val;
1469		1475
1470	regmap_read(va->regmap, CDC_VA_TOP_CSR_CORE_ID_0, &core_id_0);	1476	regmap_read(va->regmap, CDC_VA_TOP_CSR_CORE_ID_0, &val);
1471	regmap_read(va->regmap, CDC_VA_TOP_CSR_CORE_ID_1, &core_id_1);	1477	maj = FIELD_GET(CORE_ID_0_REV_MAJ, val);
1472	regmap_read(va->regmap, CDC_VA_TOP_CSR_CORE_ID_2, &core_id_2);
1473		1478
1474	if ((core_id_0 == 0x01) && (core_id_1 == 0x0F))	1479	regmap_read(va->regmap, CDC_VA_TOP_CSR_CORE_ID_1, &val);
1475	version = LPASS_CODEC_VERSION_2_0;	1480	if (!FIELD_GET(CORE_ID_1_HAS_VAMACRO, val)) {
1476	if ((core_id_0 == 0x02) && (core_id_1 == 0x0F) && core_id_2 == 0x01)	1481	dev_err(va->dev, "This is not a VA macro instance\n");
		1482	return -ENODEV;
		1483	}
		1484
		1485	regmap_read(va->regmap, CDC_VA_TOP_CSR_CORE_ID_2, &val);
		1486	min = FIELD_GET(CORE_ID_2_REV_MIN, val);
		1487	step = FIELD_GET(CORE_ID_2_REV_STEP, val);
		1488
		1489	if (maj == 1) {
1477	version = LPASS_CODEC_VERSION_2_0;	1490	version = LPASS_CODEC_VERSION_2_0;
1478	if ((core_id_0 == 0x02) && (core_id_1 == 0x0E))	1491	} else if (maj == 2) {
1479	version = LPASS_CODEC_VERSION_2_1;	1492	switch (min) {
1480	if ((core_id_0 == 0x02) && (core_id_1 == 0x0F) && (core_id_2 == 0x50 \|\| core_id_2 == 0x51))	1493	case 0:
1481	version = LPASS_CODEC_VERSION_2_5;	1494	version = LPASS_CODEC_VERSION_2_0;
1482	if ((core_id_0 == 0x02) && (core_id_1 == 0x0F) && (core_id_2 == 0x60 \|\| core_id_2 == 0x61))	1495	break;
1483	version = LPASS_CODEC_VERSION_2_6;	1496	case 5:
1484	if ((core_id_0 == 0x02) && (core_id_1 == 0x0F) && (core_id_2 == 0x70 \|\| core_id_2 == 0x71))	1497	version = LPASS_CODEC_VERSION_2_5;
1485	version = LPASS_CODEC_VERSION_2_7;	1498	break;
1486	if ((core_id_0 == 0x02) && (core_id_1 == 0x0F) && (core_id_2 == 0x80 \|\| core_id_2 == 0x81))	1499	case 6:
1487	version = LPASS_CODEC_VERSION_2_8;	1500	version = LPASS_CODEC_VERSION_2_6;
1488	if ((core_id_0 == 0x02) && (core_id_1 == 0x0F) && (core_id_2 == 0x90 \|\| core_id_2 == 0x91))	1501	break;
1489	version = LPASS_CODEC_VERSION_2_9;	1502	case 7:
1490		1503	version = LPASS_CODEC_VERSION_2_7;
1491	if (version == LPASS_CODEC_VERSION_UNKNOWN)	1504	break;
1492	dev_warn(va->dev, "Unknown Codec version, ID: %02x / %02x / %02x\n",	1505	case 8:
1493	core_id_0, core_id_1, core_id_2);	1506	version = LPASS_CODEC_VERSION_2_8;
		1507	break;
		1508	case 9:
		1509	version = LPASS_CODEC_VERSION_2_9;
		1510	break;
		1511	default:
		1512	break;
		1513	}
		1514	}
		1515
		1516	if (version == LPASS_CODEC_VERSION_UNKNOWN) {
		1517	dev_err(va->dev, "VA Macro v%u.%u.%u is not supported\n",
		1518	maj, min, step);
		1519	return -EOPNOTSUPP;
		1520	}
1494		1521
1495	lpass_macro_set_codec_version(version);	1522	lpass_macro_set_codec_version(version);
1496		1523
1497	dev_dbg(va->dev, "LPASS Codec Version %s\n", lpass_macro_get_codec_version_string(version));	1524	dev_dbg(va->dev, "LPASS Codec Version %s\n", lpass_macro_get_codec_version_string(version));
		1525
		1526	return 0;
1498	}	1527	}
1499		1528
1500	static int va_macro_probe(struct platform_device *pdev)	1529	static int va_macro_probe(struct platform_device *pdev)
@@ -1594,10 +1623,14 @@ static int va_macro_probe(struct platform_device *pdev) · 93 unmodified lines
1594	* old version of codecs do not have a reliable way to determine the	1623	* old version of codecs do not have a reliable way to determine the
1595	* version from registers, get them from soc specific data	1624	* version from registers, get them from soc specific data
1596	*/	1625	*/
1597	if (data->version)	1626	if (data->version) {
1598	lpass_macro_set_codec_version(data->version);	1627	lpass_macro_set_codec_version(data->version);
1599	else /* read version from register */	1628	} else {
1600	va_macro_set_lpass_codec_version(va);	1629	/* read version from register */
		1630	ret = va_macro_set_lpass_codec_version(va);
		1631	if (ret)
		1632	goto err_clkout;
		1633	}
1601		1634
1602	if (va->has_swr_master) {	1635	if (va->has_swr_master) {
1603	/* Set default CLK div to 1 */	1636	/* Set default CLK div to 1 */
@@ -1723,6 +1756,7 @@ static const struct dev_pm_ops va_macro_pm_ops = { · 119 unmodified lines
1723		1756
1724	static const struct of_device_id va_macro_dt_match[] = {	1757	static const struct of_device_id va_macro_dt_match[] = {
1725	{ .compatible = "qcom,sc7280-lpass-va-macro", .data = &sm8250_va_data },	1758	{ .compatible = "qcom,sc7280-lpass-va-macro", .data = &sm8250_va_data },
		1759	{ .compatible = "qcom,sm6115-lpass-va-macro", .data = &sm8450_va_data },
1726	{ .compatible = "qcom,sm8250-lpass-va-macro", .data = &sm8250_va_data },	1760	{ .compatible = "qcom,sm8250-lpass-va-macro", .data = &sm8250_va_data },
1727	{ .compatible = "qcom,sm8450-lpass-va-macro", .data = &sm8450_va_data },	1761	{ .compatible = "qcom,sm8450-lpass-va-macro", .data = &sm8450_va_data },
1728	{ .compatible = "qcom,sm8550-lpass-va-macro", .data = &sm8550_va_data },	1762	{ .compatible = "qcom,sm8550-lpass-va-macro", .data = &sm8550_va_data },

sound/soc/codecs/lpass-wsa-macro.c+30−139

 enum {
 	WSA_MACRO_RX0 = 0,
 	WSA_MACRO_RX1,
-	WSA_MACRO_RX_MIX,
+	WSA_MACRO_RX_MIX0,
-	WSA_MACRO_RX_MIX0 = WSA_MACRO_RX_MIX,
 	WSA_MACRO_RX_MIX1,
 	WSA_MACRO_RX_MAX,
 };
 	for_each_set_bit(port, &wsa->active_ch_mask[dai->id], WSA_MACRO_RX_MAX) {
 		int_1_mix1_inp = port;
-		if ((int_1_mix1_inp < WSA_MACRO_RX0) || (int_1_mix1_inp > WSA_MACRO_RX_MIX1)) {
-			dev_err(component->dev,	"%s: Invalid RX port, Dai ID is %d\n",
-				__func__, dai->id);
-			return -EINVAL;
-		}
 		int_mux_cfg0 = CDC_WSA_RX_INP_MUX_RX_INT0_CFG0;
 		/*
 	for_each_set_bit(port, &wsa->active_ch_mask[dai->id], WSA_MACRO_RX_MAX) {
 		int_2_inp = port;
-		if ((int_2_inp < WSA_MACRO_RX0) || (int_2_inp > WSA_MACRO_RX_MIX1)) {
-			dev_err(component->dev,	"%s: Invalid RX port, Dai ID is %d\n",
-				__func__, dai->id);
-			return -EINVAL;
-		}
 		int_mux_cfg1 = CDC_WSA_RX_INP_MUX_RX_INT0_CFG1;
 		for (j = 0; j < NUM_INTERPOLATORS; j++) {
 	return 0;
 }
-static int wsa_macro_enable_mix_path(struct snd_soc_dapm_widget *w,
-				     struct snd_kcontrol *kcontrol, int event)
-{
-	struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
-	u16 path_reg, gain_reg;
-	int val;
-	switch (w->shift) {
-	case WSA_MACRO_RX_MIX0:
-		path_reg = CDC_WSA_RX0_RX_PATH_MIX_CTL;
-		gain_reg = CDC_WSA_RX0_RX_VOL_MIX_CTL;
-		break;
-	case WSA_MACRO_RX_MIX1:
-		path_reg = CDC_WSA_RX1_RX_PATH_MIX_CTL;
-		gain_reg = CDC_WSA_RX1_RX_VOL_MIX_CTL;
-		break;
-	default:
-		return 0;
-	}
-	switch (event) {
-	case SND_SOC_DAPM_POST_PMU:
-		val = snd_soc_component_read(component, gain_reg);
-		snd_soc_component_write(component, gain_reg, val);
-		break;
-	case SND_SOC_DAPM_POST_PMD:
-		snd_soc_component_update_bits(component, path_reg,
-					      CDC_WSA_RX_PATH_MIX_CLK_EN_MASK,
-					      CDC_WSA_RX_PATH_MIX_CLK_DISABLE);
-		break;
-	}
-	return 0;
-}
 static void wsa_macro_hd2_control(struct snd_soc_component *component,
 				  u16 reg, int event)
 {
 	return 0;
 }
-static bool wsa_macro_adie_lb(struct snd_soc_component *component,
-			      int interp_idx)
-{
-	struct wsa_macro *wsa = snd_soc_component_get_drvdata(component);
-	u16 int_mux_cfg0,  int_mux_cfg1;
-	u8 int_n_inp0, int_n_inp1, int_n_inp2;
-	int_mux_cfg0 = CDC_WSA_RX_INP_MUX_RX_INT0_CFG0 + interp_idx * 8;
-	int_mux_cfg1 = int_mux_cfg0 + 4;
-	int_n_inp0 = snd_soc_component_read_field(component, int_mux_cfg0,
-						  wsa->reg_layout->rx_intx_1_mix_inp0_sel_mask);
-	if (int_n_inp0 == INTn_1_INP_SEL_DEC0 ||
-		int_n_inp0 == INTn_1_INP_SEL_DEC1)
-		return true;
-	int_n_inp1 = snd_soc_component_read_field(component, int_mux_cfg0,
-						  wsa->reg_layout->rx_intx_1_mix_inp1_sel_mask);
-	if (int_n_inp1 == INTn_1_INP_SEL_DEC0 ||
-		int_n_inp1 == INTn_1_INP_SEL_DEC1)
-		return true;
-	int_n_inp2 = snd_soc_component_read_field(component, int_mux_cfg1,
-						  wsa->reg_layout->rx_intx_1_mix_inp2_sel_mask);
-	if (int_n_inp2 == INTn_1_INP_SEL_DEC0 ||
-		int_n_inp2 == INTn_1_INP_SEL_DEC1)
-		return true;
-	return false;
-}
-static int wsa_macro_enable_main_path(struct snd_soc_dapm_widget *w,
-				      struct snd_kcontrol *kcontrol,
-				      int event)
-{
-	struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
-	u16 reg;
-	reg = CDC_WSA_RX0_RX_PATH_CTL + WSA_MACRO_RX_PATH_OFFSET * w->shift;
-	switch (event) {
-	case SND_SOC_DAPM_PRE_PMU:
-		if (wsa_macro_adie_lb(component, w->shift)) {
-			snd_soc_component_update_bits(component, reg,
-					     CDC_WSA_RX_PATH_CLK_EN_MASK,
-					     CDC_WSA_RX_PATH_CLK_ENABLE);
-		}
-		break;
-	default:
-		break;
-	}
-	return 0;
-}
 static int wsa_macro_interp_get_primary_reg(u16 reg, u16 *ind)
 {
 	u16 prim_int_reg = 0;
 	struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
 	u16 gain_reg;
 	u16 reg;
-	int val;
 	struct wsa_macro *wsa = snd_soc_component_get_drvdata(component);
 	if (w->shift == WSA_MACRO_COMP1) {
 					CDC_WSA_RX_PGA_HALF_DB_MASK,
 					CDC_WSA_RX_PGA_HALF_DB_ENABLE);
 		}
-		val = snd_soc_component_read(component, gain_reg);
-		snd_soc_component_write(component, gain_reg, val);
 		wsa_macro_config_ear_spkr_gain(component, wsa,
 						event, gain_reg);
 		break;
 			       struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	int ec_tx = ((struct soc_mixer_control *) kcontrol->private_value)->shift;
 	struct wsa_macro *wsa = snd_soc_component_get_drvdata(component);
 static int wsa_macro_set_ec_hq(struct snd_kcontrol *kcontrol,
 			       struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	int ec_tx = ((struct soc_mixer_control *) kcontrol->private_value)->shift;
 	int value = ucontrol->value.integer.value[0];
 	struct wsa_macro *wsa = snd_soc_component_get_drvdata(component);
 				   struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	int comp = ((struct soc_mixer_control *) kcontrol->private_value)->shift;
 	struct wsa_macro *wsa = snd_soc_component_get_drvdata(component);
 static int wsa_macro_set_compander(struct snd_kcontrol *kcontrol,
 				   struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	int comp = ((struct soc_mixer_control *) kcontrol->private_value)->shift;
 	int value = ucontrol->value.integer.value[0];
 	struct wsa_macro *wsa = snd_soc_component_get_drvdata(component);
 static int wsa_macro_ear_spkr_pa_gain_get(struct snd_kcontrol *kcontrol,
 					  struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct wsa_macro *wsa = snd_soc_component_get_drvdata(component);
 	ucontrol->value.integer.value[0] = wsa->ear_spkr_gain;
 static int wsa_macro_ear_spkr_pa_gain_put(struct snd_kcontrol *kcontrol,
 					  struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct wsa_macro *wsa = snd_soc_component_get_drvdata(component);
 	wsa->ear_spkr_gain =  ucontrol->value.integer.value[0];
 static int wsa_macro_rx_mux_get(struct snd_kcontrol *kcontrol,
 				struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_dapm_widget *widget =
+	struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_to_widget(kcontrol);
-		snd_soc_dapm_kcontrol_widget(kcontrol);
 	struct snd_soc_component *component =
 				snd_soc_dapm_to_component(widget->dapm);
 	struct wsa_macro *wsa = snd_soc_component_get_drvdata(component);
 static int wsa_macro_rx_mux_put(struct snd_kcontrol *kcontrol,
 				struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_dapm_widget *widget =
+	struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_to_widget(kcontrol);
-		snd_soc_dapm_kcontrol_widget(kcontrol);
 	struct snd_soc_component *component =
 				snd_soc_dapm_to_component(widget->dapm);
 	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
 static int wsa_macro_soft_clip_enable_get(struct snd_kcontrol *kcontrol,
 					  struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct wsa_macro *wsa = snd_soc_component_get_drvdata(component);
 	int path = ((struct soc_mixer_control *)kcontrol->private_value)->shift;
 static int wsa_macro_soft_clip_enable_put(struct snd_kcontrol *kcontrol,
 					  struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct wsa_macro *wsa = snd_soc_component_get_drvdata(component);
 	int path = ((struct soc_mixer_control *) kcontrol->private_value)->shift;
 			  -84, 40, digital_gain),
 	SOC_SINGLE_S8_TLV("WSA_RX1 Digital Volume", CDC_WSA_RX1_RX_VOL_CTL,
 			  -84, 40, digital_gain),
+	SOC_SINGLE_S8_TLV("WSA_RX0_MIX Digital Volume", CDC_WSA_RX0_RX_VOL_MIX_CTL,
+			  -84, 40, digital_gain),
+	SOC_SINGLE_S8_TLV("WSA_RX1_MIX Digital Volume", CDC_WSA_RX1_RX_VOL_MIX_CTL,
+			  -84, 40, digital_gain),
 	SOC_SINGLE("WSA_RX0 Digital Mute", CDC_WSA_RX0_RX_PATH_CTL, 4, 1, 0),
 	SOC_SINGLE("WSA_RX1 Digital Mute", CDC_WSA_RX1_RX_PATH_CTL, 4, 1, 0),
 static int wsa_macro_vi_feed_mixer_get(struct snd_kcontrol *kcontrol,
 				       struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_widget(kcontrol);
+	struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_to_widget(kcontrol);
 	struct snd_soc_component *component = snd_soc_dapm_to_component(widget->dapm);
 	struct soc_mixer_control *mixer = (struct soc_mixer_control *)kcontrol->private_value;
 	struct wsa_macro *wsa = snd_soc_component_get_drvdata(component);
 static int wsa_macro_vi_feed_mixer_put(struct snd_kcontrol *kcontrol,
 				       struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_widget(kcontrol);
+	struct snd_soc_dapm_widget *widget = snd_soc_dapm_kcontrol_to_widget(kcontrol);
 	struct snd_soc_component *component = snd_soc_dapm_to_component(widget->dapm);
 	struct soc_mixer_control *mixer = (struct soc_mixer_control *)kcontrol->private_value;
 	struct wsa_macro *wsa = snd_soc_component_get_drvdata(component);
 	SND_SOC_DAPM_MIXER("WSA RX_MIX0", SND_SOC_NOPM, 0, 0, NULL, 0),
 	SND_SOC_DAPM_MIXER("WSA RX_MIX1", SND_SOC_NOPM, 0, 0, NULL, 0),
-	SND_SOC_DAPM_MIXER_E("WSA_RX INT0 MIX", SND_SOC_NOPM, 0, 0, NULL, 0,
+	SND_SOC_DAPM_MIXER("WSA_RX INT0 MIX", SND_SOC_NOPM, 0, 0, NULL, 0),
-			     wsa_macro_enable_main_path, SND_SOC_DAPM_PRE_PMU),
+	SND_SOC_DAPM_MIXER("WSA_RX INT1 MIX", SND_SOC_NOPM, 0, 0, NULL, 0),
-	SND_SOC_DAPM_MIXER_E("WSA_RX INT1 MIX", SND_SOC_NOPM, 1, 0, NULL, 0,
-			     wsa_macro_enable_main_path, SND_SOC_DAPM_PRE_PMU),
 	SND_SOC_DAPM_MIXER("WSA_RX INT0 SEC MIX", SND_SOC_NOPM, 0, 0, NULL, 0),
 	SND_SOC_DAPM_MIXER("WSA_RX INT1 SEC MIX", SND_SOC_NOPM, 0, 0, NULL, 0),
 	SND_SOC_DAPM_MUX("WSA_RX0 INP0", SND_SOC_NOPM, 0, 0, &rx0_prim_inp0_mux_v2_1),
 	SND_SOC_DAPM_MUX("WSA_RX0 INP1", SND_SOC_NOPM, 0, 0, &rx0_prim_inp1_mux_v2_1),
 	SND_SOC_DAPM_MUX("WSA_RX0 INP2", SND_SOC_NOPM, 0, 0, &rx0_prim_inp2_mux_v2_1),
-	SND_SOC_DAPM_MUX_E("WSA_RX0 MIX INP", SND_SOC_NOPM, WSA_MACRO_RX_MIX0,
+	SND_SOC_DAPM_MUX("WSA_RX0 MIX INP", SND_SOC_NOPM, 0, 0, &rx0_mix_mux_v2_1),
-			   0, &rx0_mix_mux_v2_1, wsa_macro_enable_mix_path,
-			   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
 	SND_SOC_DAPM_MUX("WSA_RX1 INP0", SND_SOC_NOPM, 0, 0, &rx1_prim_inp0_mux_v2_1),
 	SND_SOC_DAPM_MUX("WSA_RX1 INP1", SND_SOC_NOPM, 0, 0, &rx1_prim_inp1_mux_v2_1),
 	SND_SOC_DAPM_MUX("WSA_RX1 INP2", SND_SOC_NOPM, 0, 0, &rx1_prim_inp2_mux_v2_1),
-	SND_SOC_DAPM_MUX_E("WSA_RX1 MIX INP", SND_SOC_NOPM, WSA_MACRO_RX_MIX1,
+	SND_SOC_DAPM_MUX("WSA_RX1 MIX INP", SND_SOC_NOPM, 0, 0, &rx1_mix_mux_v2_1),
-			   0, &rx1_mix_mux_v2_1, wsa_macro_enable_mix_path,
-			   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
 };
 static const struct snd_soc_dapm_widget wsa_macro_dapm_widgets_v2_5[] = {
 	SND_SOC_DAPM_MUX("WSA_RX0 INP0", SND_SOC_NOPM, 0, 0, &rx0_prim_inp0_mux_v2_5),
 	SND_SOC_DAPM_MUX("WSA_RX0 INP1", SND_SOC_NOPM, 0, 0, &rx0_prim_inp1_mux_v2_5),
 	SND_SOC_DAPM_MUX("WSA_RX0 INP2", SND_SOC_NOPM, 0, 0, &rx0_prim_inp2_mux_v2_5),
-	SND_SOC_DAPM_MUX_E("WSA_RX0 MIX INP", SND_SOC_NOPM, WSA_MACRO_RX_MIX0,
+	SND_SOC_DAPM_MUX("WSA_RX0 MIX INP", SND_SOC_NOPM, 0, 0, &rx0_mix_mux_v2_5),
-			   0, &rx0_mix_mux_v2_5, wsa_macro_enable_mix_path,
-			   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
 	SND_SOC_DAPM_MUX("WSA_RX1 INP0", SND_SOC_NOPM, 0, 0, &rx1_prim_inp0_mux_v2_5),
 	SND_SOC_DAPM_MUX("WSA_RX1 INP1", SND_SOC_NOPM, 0, 0, &rx1_prim_inp1_mux_v2_5),
 	SND_SOC_DAPM_MUX("WSA_RX1 INP2", SND_SOC_NOPM, 0, 0, &rx1_prim_inp2_mux_v2_5),
-	SND_SOC_DAPM_MUX_E("WSA_RX1 MIX INP", SND_SOC_NOPM, WSA_MACRO_RX_MIX1,
+	SND_SOC_DAPM_MUX("WSA_RX1 MIX INP", SND_SOC_NOPM, 0, 0, &rx1_mix_mux_v2_5),
-			   0, &rx1_mix_mux_v2_5, wsa_macro_enable_mix_path,
-			   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
 };
 static const struct snd_soc_dapm_route wsa_audio_map[] = {
 	{"WSA RX_MIX0", NULL, "WSA RX_MIX0 MUX"},
 	{"WSA RX_MIX1", NULL, "WSA RX_MIX1 MUX"},
-	{"WSA RX0", NULL, "WSA_RX0_CLK"},
+	{"WSA_RX INT0 MIX", NULL, "WSA_RX0_CLK"},
-	{"WSA RX1", NULL, "WSA_RX1_CLK"},
+	{"WSA_RX INT1 MIX", NULL, "WSA_RX1_CLK"},
-	{"WSA RX_MIX0", NULL, "WSA_RX_MIX0_CLK"},
-	{"WSA RX_MIX1", NULL, "WSA_RX_MIX1_CLK"},
 	{"WSA_RX0 INP0", "RX0", "WSA RX0"},
 	{"WSA_RX0 INP0", "RX1", "WSA RX1"},
 	{"WSA_RX0 MIX INP", "RX1", "WSA RX1"},
 	{"WSA_RX0 MIX INP", "RX_MIX0", "WSA RX_MIX0"},
 	{"WSA_RX0 MIX INP", "RX_MIX1", "WSA RX_MIX1"},
+	{"WSA_RX0 MIX INP", NULL, "WSA_RX0_CLK"},
+	{"WSA_RX0 MIX INP", NULL, "WSA_RX_MIX0_CLK"},
 	{"WSA_RX INT0 SEC MIX", NULL, "WSA_RX0 MIX INP"},
 	{"WSA_RX INT0 SEC MIX", NULL, "WSA_RX INT0 MIX"},
 	{"WSA_RX1 MIX INP", "RX1", "WSA RX1"},
 	{"WSA_RX1 MIX INP", "RX_MIX0", "WSA RX_MIX0"},
 	{"WSA_RX1 MIX INP", "RX_MIX1", "WSA RX_MIX1"},
+	{"WSA_RX1 MIX INP", NULL, "WSA_RX1_CLK"},
+	{"WSA_RX1 MIX INP", NULL, "WSA_RX_MIX1_CLK"},
 	{"WSA_RX INT1 SEC MIX", NULL, "WSA_RX1 MIX INP"},
 	{"WSA_RX INT1 SEC MIX", NULL, "WSA_RX INT1 MIX"},
 static int wsa_macro_component_probe(struct snd_soc_component *comp)
 {
-	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(comp);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(comp);
 	struct wsa_macro *wsa = snd_soc_component_get_drvdata(comp);
 	const struct snd_soc_dapm_widget *widgets;
 	unsigned int num_widgets;

sound/soc/codecs/madera.c+16−32

 int madera_out1_demux_put(struct snd_kcontrol *kcontrol,
 			  struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol);
-		snd_soc_dapm_kcontrol_component(kcontrol);
+	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol);
-	struct snd_soc_dapm_context *dapm =
-		snd_soc_dapm_kcontrol_dapm(kcontrol);
 	struct madera_priv *priv = snd_soc_component_get_drvdata(component);
 	struct madera *madera = priv->madera;
 	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
 int madera_out1_demux_get(struct snd_kcontrol *kcontrol,
 			  struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol);
-		snd_soc_dapm_kcontrol_component(kcontrol);
 	unsigned int val;
 	val = snd_soc_component_read(component, MADERA_OUTPUT_ENABLES_1);
 static int madera_inmux_put(struct snd_kcontrol *kcontrol,
 			    struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol);
-		snd_soc_dapm_kcontrol_component(kcontrol);
+	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol);
-	struct snd_soc_dapm_context *dapm =
-		snd_soc_dapm_kcontrol_dapm(kcontrol);
 	struct madera_priv *priv = snd_soc_component_get_drvdata(component);
 	struct madera *madera = priv->madera;
 	struct regmap *regmap = madera->regmap;
 static int madera_adsp_rate_get(struct snd_kcontrol *kcontrol,
 				struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-		snd_soc_kcontrol_component(kcontrol);
 	struct madera_priv *priv = snd_soc_component_get_drvdata(component);
 	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
 	unsigned int cached_rate;
 static int madera_adsp_rate_put(struct snd_kcontrol *kcontrol,
 				struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-		snd_soc_kcontrol_component(kcontrol);
 	struct madera_priv *priv = snd_soc_component_get_drvdata(component);
 	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
 	const int adsp_num = e->shift_l;
 int madera_rate_put(struct snd_kcontrol *kcontrol,
 		    struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-		snd_soc_kcontrol_component(kcontrol);
 	struct madera_priv *priv = snd_soc_component_get_drvdata(component);
 	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
 	unsigned int item = ucontrol->value.enumerated.item[0];
 			const struct snd_soc_dapm_route *routes,
 			int n_mono_routes, int n_real)
 {
-	struct snd_soc_dapm_context *dapm =
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
-		snd_soc_component_get_dapm(component);
 	struct madera_priv *priv = snd_soc_component_get_drvdata(component);
 	struct madera *madera = priv->madera;
 	const struct madera_codec_pdata *pdata = &madera->pdata.codec;
 int madera_dfc_put(struct snd_kcontrol *kcontrol,
 		   struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-		snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
-	struct snd_soc_dapm_context *dapm =
-		snd_soc_component_get_dapm(component);
 	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
 	unsigned int reg = e->reg;
 	unsigned int val;
 {
 	struct soc_mixer_control *mc =
 		(struct soc_mixer_control *)kcontrol->private_value;
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-		snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
-	struct snd_soc_dapm_context *dapm =
-		snd_soc_component_get_dapm(component);
 	unsigned int val, mask;
 	int ret;
 				 int clk_id, unsigned int freq, int dir)
 {
 	struct snd_soc_component *component = dai->component;
-	struct snd_soc_dapm_context *dapm =
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
-		snd_soc_component_get_dapm(component);
 	struct madera_priv *priv = snd_soc_component_get_drvdata(component);
 	struct madera_dai_priv *dai_priv = &priv->dai[dai->id - 1];
 	struct snd_soc_dapm_route routes[2];
 int madera_eq_coeff_put(struct snd_kcontrol *kcontrol,
 			struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-		snd_soc_kcontrol_component(kcontrol);
 	struct madera_priv *priv = snd_soc_component_get_drvdata(component);
 	struct madera *madera = priv->madera;
 	struct soc_bytes *params = (void *)kcontrol->private_value;
 int madera_lhpf_coeff_put(struct snd_kcontrol *kcontrol,
 			  struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-		snd_soc_kcontrol_component(kcontrol);
 	struct madera_priv *priv = snd_soc_component_get_drvdata(component);
 	struct madera *madera = priv->madera;
 	__be16 *data = (__be16 *)ucontrol->value.bytes.data;

sound/soc/codecs/max9759.c+4−4

sound/soc/codecs/max9768.c+2−2

@@ -40,7 +40,7 @@ static const struct reg_default max9768_default_regs[] = { · 39 unmodified lines
40	static int max9768_get_gpio(struct snd_kcontrol *kcontrol,	40	static int max9768_get_gpio(struct snd_kcontrol *kcontrol,
41	struct snd_ctl_elem_value *ucontrol)	41	struct snd_ctl_elem_value *ucontrol)
42	{	42	{
43	struct snd_soc_component *c = snd_soc_kcontrol_component(kcontrol);	43	struct snd_soc_component *c = snd_kcontrol_chip(kcontrol);
44	struct max9768 *max9768 = snd_soc_component_get_drvdata(c);	44	struct max9768 *max9768 = snd_soc_component_get_drvdata(c);
45	int val = gpiod_get_value_cansleep(max9768->mute);	45	int val = gpiod_get_value_cansleep(max9768->mute);
46		46
@@ -52,7 +52,7 @@ static int max9768_get_gpio(struct snd_kcontrol *kcontrol, · 5 unmodified lines
52	static int max9768_set_gpio(struct snd_kcontrol *kcontrol,	52	static int max9768_set_gpio(struct snd_kcontrol *kcontrol,
53	struct snd_ctl_elem_value *ucontrol)	53	struct snd_ctl_elem_value *ucontrol)
54	{	54	{
55	struct snd_soc_component *c = snd_soc_kcontrol_component(kcontrol);	55	struct snd_soc_component *c = snd_kcontrol_chip(kcontrol);
56	struct max9768 *max9768 = snd_soc_component_get_drvdata(c);	56	struct max9768 *max9768 = snd_soc_component_get_drvdata(c);
57	bool val = !ucontrol->value.integer.value[0];	57	bool val = !ucontrol->value.integer.value[0];
58	int ret;	58	int ret;

sound/soc/codecs/max98088.c+9−9

 static int max98088_mic1pre_set(struct snd_kcontrol *kcontrol,
                                struct snd_ctl_elem_value *ucontrol)
 {
-       struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+       struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
        struct max98088_priv *max98088 = snd_soc_component_get_drvdata(component);
        unsigned int sel = ucontrol->value.integer.value[0];
 static int max98088_mic1pre_get(struct snd_kcontrol *kcontrol,
                                struct snd_ctl_elem_value *ucontrol)
 {
-       struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+       struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
        struct max98088_priv *max98088 = snd_soc_component_get_drvdata(component);
        ucontrol->value.integer.value[0] = max98088->mic1pre;
 static int max98088_mic2pre_set(struct snd_kcontrol *kcontrol,
                                struct snd_ctl_elem_value *ucontrol)
 {
-       struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+       struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
        struct max98088_priv *max98088 = snd_soc_component_get_drvdata(component);
        unsigned int sel = ucontrol->value.integer.value[0];
 static int max98088_mic2pre_get(struct snd_kcontrol *kcontrol,
                                struct snd_ctl_elem_value *ucontrol)
 {
-       struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+       struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
        struct max98088_priv *max98088 = snd_soc_component_get_drvdata(component);
        ucontrol->value.integer.value[0] = max98088->mic2pre;
                                   enum snd_soc_bias_level level)
 {
 	struct max98088_priv *max98088 = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	int ret;
 	switch (level) {
 		 * enable it.
 		 */
 		if (!IS_ERR(max98088->mclk)) {
-			if (snd_soc_component_get_bias_level(component) ==
+			if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_ON) {
-			    SND_SOC_BIAS_ON) {
 				clk_disable_unprepare(max98088->mclk);
 			} else {
 				ret = clk_prepare_enable(max98088->mclk);
 		break;
 	case SND_SOC_BIAS_STANDBY:
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF)
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF)
 			regcache_sync(max98088->regmap);
 		snd_soc_component_update_bits(component, M98088_REG_4C_PWR_EN_IN,
 static int max98088_put_eq_enum(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_value *ucontrol)
 {
-       struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+       struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
        struct max98088_priv *max98088 = snd_soc_component_get_drvdata(component);
        struct max98088_pdata *pdata = max98088->pdata;
        int channel = max98088_get_channel(component, kcontrol->id.name);
 static int max98088_get_eq_enum(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_value *ucontrol)
 {
-       struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+       struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
        struct max98088_priv *max98088 = snd_soc_component_get_drvdata(component);
        int channel = max98088_get_channel(component, kcontrol->id.name);
        struct max98088_cdata *cdata;

sound/soc/codecs/max98090.c+44−10

 static int max98090_get_enab_tlv(struct snd_kcontrol *kcontrol,
 				struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct max98090_priv *max98090 = snd_soc_component_get_drvdata(component);
 	struct soc_mixer_control *mc =
 		(struct soc_mixer_control *)kcontrol->private_value;
 static int max98090_put_enab_tlv(struct snd_kcontrol *kcontrol,
 				struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct max98090_priv *max98090 = snd_soc_component_get_drvdata(component);
 	struct soc_mixer_control *mc =
 		(struct soc_mixer_control *)kcontrol->private_value;
 static const struct snd_kcontrol_new max98090_dmic_mux =
 	SOC_DAPM_ENUM("DMIC Mux", dmic_mux_enum);
+static const char * const dmic_mX_mux_text[] = { "Enable", "Disable" };
+static SOC_ENUM_SINGLE_VIRT_DECL(dmic_m1_enum, dmic_mX_mux_text);
+static const struct snd_kcontrol_new max98090_dmic_m1_mux =
+	SOC_DAPM_ENUM("DMIC M1 Mux", dmic_m1_enum);
+static SOC_ENUM_SINGLE_VIRT_DECL(dmic_m2_enum, dmic_mX_mux_text);
+static const struct snd_kcontrol_new max98090_dmic_m2_mux =
+	SOC_DAPM_ENUM("DMIC M2 Mux", dmic_m2_enum);
 /* LINEA mixer switch */
 static const struct snd_kcontrol_new max98090_linea_mixer_controls[] = {
 	SOC_DAPM_SINGLE("IN1 Switch", M98090_REG_LINE_INPUT_CONFIG,
 	SND_SOC_DAPM_MUX("DMIC Mux", SND_SOC_NOPM, 0, 0, &max98090_dmic_mux),
+	SND_SOC_DAPM_MUX("DMIC M1 Mux", SND_SOC_NOPM, 0, 0,
+		&max98090_dmic_m1_mux),
 	SND_SOC_DAPM_PGA_E("MIC1 Input", M98090_REG_MIC1_INPUT_LEVEL,
 		M98090_MIC_PA1EN_SHIFT, 0, NULL, 0, max98090_micinput_event,
 		SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
 	SND_SOC_DAPM_AIF_OUT("AIFOUTL", "HiFi Capture", 0,
 		SND_SOC_NOPM, 0, 0),
-	SND_SOC_DAPM_AIF_OUT("AIFOUTR", "HiFi Capture", 1,
+	SND_SOC_DAPM_AIF_OUT("AIFOUTR", "HiFi Capture", 0,
 		SND_SOC_NOPM, 0, 0),
 	SND_SOC_DAPM_MUX("LBENL Mux", SND_SOC_NOPM,
 			 SND_SOC_DAPM_POST_PMU),
 	SND_SOC_DAPM_SUPPLY("DMIC34_HPF", M98090_REG_FILTER_CONFIG,
 		M98090_FLT_DMIC34HPF_SHIFT, 0, NULL, 0),
+	SND_SOC_DAPM_MUX("DMIC M2 Mux", SND_SOC_NOPM, 0, 0,
+		&max98090_dmic_m2_mux),
+	SND_SOC_DAPM_AIF_OUT("AIFOUT2L", "HiFi Capture", 0,
+		SND_SOC_NOPM, 0, 0),
+	SND_SOC_DAPM_AIF_OUT("AIFOUT2R", "HiFi Capture", 0,
+		SND_SOC_NOPM, 0, 0),
 };
 static const struct snd_soc_dapm_route max98090_dapm_routes[] = {
 	{"ADCL", NULL, "SHDN"},
 	{"ADCR", NULL, "SHDN"},
+	{"DMIC M1 Mux", "Enable", "DMICL"},
+	{"DMIC M1 Mux", "Enable", "DMICR"},
 	{"DMIC Mux", "ADC", "ADCL"},
 	{"DMIC Mux", "ADC", "ADCR"},
-	{"DMIC Mux", "DMIC", "DMICL"},
+	{"DMIC Mux", "DMIC", "DMIC M1 Mux"},
-	{"DMIC Mux", "DMIC", "DMICR"},
 	{"LBENL Mux", "Normal", "DMIC Mux"},
 	{"LBENL Mux", "Loopback", "LTENL Mux"},
 	{"DMIC4", NULL, "DMIC4_ENA"},
 	{"DMIC3", NULL, "DMIC34_HPF"},
 	{"DMIC4", NULL, "DMIC34_HPF"},
+	{"DMIC M2 Mux", "Enable", "DMIC3"},
+	{"DMIC M2 Mux", "Enable", "DMIC4"},
+	{"AIFOUT2L", NULL, "DMIC M2 Mux"},
+	{"AIFOUT2R", NULL, "DMIC M2 Mux"},
+	{"AIFOUT2L", NULL, "SHDN"},
+	{"AIFOUT2R", NULL, "SHDN"},
+	{"AIFOUT2L", NULL, "SDOEN"},
+	{"AIFOUT2R", NULL, "SDOEN"},
 };
 static int max98090_add_widgets(struct snd_soc_component *component)
 {
 	struct max98090_priv *max98090 = snd_soc_component_get_drvdata(component);
-	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	snd_soc_add_component_controls(component, max98090_snd_controls,
 		ARRAY_SIZE(max98090_snd_controls));
 				   enum snd_soc_bias_level level)
 {
 	struct max98090_priv *max98090 = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	int ret;
 	switch (level) {
 		if (IS_ERR(max98090->mclk))
 			break;
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_ON) {
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_ON) {
 			clk_disable_unprepare(max98090->mclk);
 		} else {
 			ret = clk_prepare_enable(max98090->mclk);
 		break;
 	case SND_SOC_BIAS_STANDBY:
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) {
 			ret = regcache_sync(max98090->regmap);
 			if (ret != 0) {
 				dev_err(component->dev,
 	.capture = {
 		.stream_name = "HiFi Capture",
 		.channels_min = 1,
-		.channels_max = 2,
+		.channels_max = 4,
 		.rates = MAX98090_RATES,
 		.formats = MAX98090_FORMATS,
 	},
-	 .ops = &max98090_dai_ops,
+	.ops = &max98090_dai_ops,
 };
 static int max98090_probe(struct snd_soc_component *component)

sound/soc/codecs/max98095.c+15−12

 static int max98095_mic1pre_set(struct snd_kcontrol *kcontrol,
 				struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct max98095_priv *max98095 = snd_soc_component_get_drvdata(component);
 	unsigned int sel = ucontrol->value.integer.value[0];
 static int max98095_mic1pre_get(struct snd_kcontrol *kcontrol,
 				struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct max98095_priv *max98095 = snd_soc_component_get_drvdata(component);
 	ucontrol->value.integer.value[0] = max98095->mic1pre;
 static int max98095_mic2pre_set(struct snd_kcontrol *kcontrol,
 				struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct max98095_priv *max98095 = snd_soc_component_get_drvdata(component);
 	unsigned int sel = ucontrol->value.integer.value[0];
 static int max98095_mic2pre_get(struct snd_kcontrol *kcontrol,
 				struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct max98095_priv *max98095 = snd_soc_component_get_drvdata(component);
 	ucontrol->value.integer.value[0] = max98095->mic2pre;
 				   enum snd_soc_bias_level level)
 {
 	struct max98095_priv *max98095 = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	int ret;
 	switch (level) {
 		if (IS_ERR(max98095->mclk))
 			break;
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_ON) {
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_ON) {
 			clk_disable_unprepare(max98095->mclk);
 		} else {
 			ret = clk_prepare_enable(max98095->mclk);
 		break;
 	case SND_SOC_BIAS_STANDBY:
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) {
 			ret = regcache_sync(max98095->regmap);
 			if (ret != 0) {
 static int max98095_put_eq_enum(struct snd_kcontrol *kcontrol,
 				 struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct max98095_priv *max98095 = snd_soc_component_get_drvdata(component);
 	struct max98095_pdata *pdata = max98095->pdata;
 	int channel = max98095_get_eq_channel(kcontrol->id.name);
 static int max98095_get_eq_enum(struct snd_kcontrol *kcontrol,
 				 struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct max98095_priv *max98095 = snd_soc_component_get_drvdata(component);
 	int channel = max98095_get_eq_channel(kcontrol->id.name);
 	struct max98095_cdata *cdata;
 static int max98095_put_bq_enum(struct snd_kcontrol *kcontrol,
 				 struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct max98095_priv *max98095 = snd_soc_component_get_drvdata(component);
 	struct max98095_pdata *pdata = max98095->pdata;
 	int channel = max98095_get_bq_channel(component, kcontrol->id.name);
 static int max98095_get_bq_enum(struct snd_kcontrol *kcontrol,
 				 struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct max98095_priv *max98095 = snd_soc_component_get_drvdata(component);
 	int channel = max98095_get_bq_channel(component, kcontrol->id.name);
 	struct max98095_cdata *cdata;
 static int max98095_suspend(struct snd_soc_component *component)
 {
 	struct max98095_priv *max98095 = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	if (max98095->headphone_jack || max98095->mic_jack)
 		max98095_jack_detect_disable(component);
-	snd_soc_component_force_bias_level(component, SND_SOC_BIAS_OFF);
+	snd_soc_dapm_force_bias_level(dapm, SND_SOC_BIAS_OFF);
 	return 0;
 }
 {
 	struct max98095_priv *max98095 = snd_soc_component_get_drvdata(component);
 	struct i2c_client *client = to_i2c_client(component->dev);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
-	snd_soc_component_force_bias_level(component, SND_SOC_BIAS_STANDBY);
+	snd_soc_dapm_force_bias_level(dapm, SND_SOC_BIAS_STANDBY);
 	if (max98095->headphone_jack || max98095->mic_jack) {
 		max98095_jack_detect_enable(component);

sound/soc/codecs/max98373.c+2−1

 				 struct snd_ctl_elem_value *ucontrol)
 {
 	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	struct soc_mixer_control *mc =
 		(struct soc_mixer_control *)kcontrol->private_value;
 	struct max98373_priv *max98373 = snd_soc_component_get_drvdata(component);
 	int i;
-	if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
+	if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) {
 		/*
 		 * Register values will be cached before suspend. The cached value
 		 * will be a valid value and userspace will happy with that.

sound/soc/codecs/max98390.c+8−14

 static int max98390_ref_rdc_put(struct snd_kcontrol *kcontrol,
 		struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-		snd_soc_kcontrol_component(kcontrol);
 	struct max98390_priv *max98390 =
 		snd_soc_component_get_drvdata(component);
 static int max98390_ref_rdc_get(struct snd_kcontrol *kcontrol,
 		struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-		snd_soc_kcontrol_component(kcontrol);
 	struct max98390_priv *max98390 =
 		snd_soc_component_get_drvdata(component);
 static int max98390_ambient_temp_put(struct snd_kcontrol *kcontrol,
 		struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-		snd_soc_kcontrol_component(kcontrol);
 	struct max98390_priv *max98390 =
 		snd_soc_component_get_drvdata(component);
 static int max98390_ambient_temp_get(struct snd_kcontrol *kcontrol,
 		struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-		snd_soc_kcontrol_component(kcontrol);
 	struct max98390_priv *max98390 =
 		snd_soc_component_get_drvdata(component);
 static int max98390_adaptive_rdc_put(struct snd_kcontrol *kcontrol,
 		struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-		snd_soc_kcontrol_component(kcontrol);
 	dev_warn(component->dev, "Put adaptive rdc not supported\n");
 		struct snd_ctl_elem_value *ucontrol)
 {
 	int rdc, rdc0;
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-		snd_soc_kcontrol_component(kcontrol);
 	struct max98390_priv *max98390 =
 		snd_soc_component_get_drvdata(component);
 static int max98390_dsm_calib_put(struct snd_kcontrol *kcontrol,
 		struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct max98390_priv *max98390 = snd_soc_component_get_drvdata(component);
-	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	unsigned int rdc, rdc_cal_result, rdc_integer, rdc_factor, temp, val;
 	snd_soc_dapm_mutex_lock(dapm);

sound/soc/codecs/max98396.c+5−6

 static int max98396_mux_get(struct snd_kcontrol *kcontrol,
 			    struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol);
-		snd_soc_dapm_kcontrol_component(kcontrol);
 	struct max98396_priv *max98396 = snd_soc_component_get_drvdata(component);
 	int reg, val;
 static int max98396_mux_put(struct snd_kcontrol *kcontrol,
 			    struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol);
-		snd_soc_dapm_kcontrol_component(kcontrol);
+	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol);
-	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kcontrol);
 	struct max98396_priv *max98396 = snd_soc_component_get_drvdata(component);
 	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
 	unsigned int *item = ucontrol->value.enumerated.item;
 				  struct snd_ctl_elem_value *ucontrol)
 {
 	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	struct soc_mixer_control *mc =
 		(struct soc_mixer_control *)kcontrol->private_value;
 	struct max98396_priv *max98396 = snd_soc_component_get_drvdata(component);
 	int reg = mc->reg;
 	/* ADC value is not available if the device is powered down */
-	if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF)
+	if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF)
 		goto exit;
 	if (max98396->device_id == CODEC_TYPE_MAX98397) {

sound/soc/codecs/max9850.c+2−1

 				  enum snd_soc_bias_level level)
 {
 	struct max9850_priv *max9850 = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	int ret;
 	switch (level) {
 	case SND_SOC_BIAS_PREPARE:
 		break;
 	case SND_SOC_BIAS_STANDBY:
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) {
 			ret = regcache_sync(max9850->regmap);
 			if (ret) {
 				dev_err(component->dev,

sound/soc/codecs/max9867.c+10−5

 static int max9867_filter_get(struct snd_kcontrol *kcontrol,
 			      struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct max9867_priv *max9867 = snd_soc_component_get_drvdata(component);
 	unsigned int reg;
 	int ret;
 static int max9867_filter_set(struct snd_kcontrol *kcontrol,
 			      struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct max9867_priv *max9867 = snd_soc_component_get_drvdata(component);
 	unsigned int reg, mode = ucontrol->value.enumerated.item[0];
 	int ret;
 #ifdef CONFIG_PM
 static int max9867_suspend(struct snd_soc_component *component)
 {
-	snd_soc_component_force_bias_level(component, SND_SOC_BIAS_OFF);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
+	snd_soc_dapm_force_bias_level(dapm, SND_SOC_BIAS_OFF);
 	return 0;
 }
 static int max9867_resume(struct snd_soc_component *component)
 {
-	snd_soc_component_force_bias_level(component, SND_SOC_BIAS_STANDBY);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
+	snd_soc_dapm_force_bias_level(dapm, SND_SOC_BIAS_STANDBY);
 	return 0;
 }
 {
 	int err;
 	struct max9867_priv *max9867 = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	switch (level) {
 	case SND_SOC_BIAS_ON:
 			return err;
 		break;
 	case SND_SOC_BIAS_STANDBY:
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) {
 			err = regcache_sync(max9867->regmap);
 			if (err)
 				return err;

sound/soc/codecs/max98925.c+1−1

@@ -97,7 +97,7 @@ static const struct snd_kcontrol_new max98925_dai_sel_mux = · 96 unmodified lines
97	static int max98925_dac_event(struct snd_soc_dapm_widget *w,	97	static int max98925_dac_event(struct snd_soc_dapm_widget *w,
98	struct snd_kcontrol *kcontrol, int event)	98	struct snd_kcontrol *kcontrol, int event)
99	{	99	{
100	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	100	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
101	struct max98925_priv *max98925 = snd_soc_component_get_drvdata(component);	101	struct max98925_priv *max98925 = snd_soc_component_get_drvdata(component);
102		102
103	switch (event) {	103	switch (event) {

sound/soc/codecs/ml26124.c+2−1

 		enum snd_soc_bias_level level)
 {
 	struct ml26124_priv *priv = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	switch (level) {
 	case SND_SOC_BIAS_ON:
 		break;
 	case SND_SOC_BIAS_STANDBY:
 		/* VMID ON */
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) {
 			snd_soc_component_update_bits(component, ML26124_PW_REF_PW_MNG,
 					    ML26124_VMID, ML26124_VMID);
 			msleep(500);

sound/soc/codecs/msm8916-wcd-digital.c+2−4

 					struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-			snd_soc_kcontrol_component(kcontrol);
 	struct wcd_iir_filter_ctl *ctl =
 			(struct wcd_iir_filter_ctl *)kcontrol->private_value;
 	struct soc_bytes_ext *params = &ctl->bytes_ext;
 					struct snd_kcontrol *kcontrol,
 					struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-			snd_soc_kcontrol_component(kcontrol);
 	struct wcd_iir_filter_ctl *ctl =
 			(struct wcd_iir_filter_ctl *)kcontrol->private_value;
 	struct soc_bytes_ext *params = &ctl->bytes_ext;

sound/soc/codecs/mt6357.c+1−1

@@ -597,7 +597,7 @@ static int mt_mic_type_event(struct snd_soc_dapm_widget *w, · 596 unmodified lines
597	{	597	{
598	struct snd_soc_component *cmpnt = snd_soc_dapm_to_component(w->dapm);	598	struct snd_soc_component *cmpnt = snd_soc_dapm_to_component(w->dapm);
599	struct mt6357_priv *priv = snd_soc_component_get_drvdata(cmpnt);	599	struct mt6357_priv *priv = snd_soc_component_get_drvdata(cmpnt);
600	unsigned int mic_type = dapm_kcontrol_get_value(w->kcontrols[0]);	600	unsigned int mic_type = snd_soc_dapm_kcontrol_get_value(w->kcontrols[0]);
601		601
602	switch (event) {	602	switch (event) {
603	case SND_SOC_DAPM_PRE_PMU:	603	case SND_SOC_DAPM_PRE_PMU:

sound/soc/codecs/mt6358.c+12−13

 static int mt6358_put_volsw(struct snd_kcontrol *kcontrol,
 			    struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-			snd_soc_kcontrol_component(kcontrol);
 	struct mt6358_priv *priv = snd_soc_component_get_drvdata(component);
 	struct soc_mixer_control *mc =
 			(struct soc_mixer_control *)kcontrol->private_value;
 static int mt6358_get_wov(struct snd_kcontrol *kcontrol,
 			  struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *c = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *c = snd_kcontrol_chip(kcontrol);
 	struct mt6358_priv *priv = snd_soc_component_get_drvdata(c);
 	ucontrol->value.integer.value[0] = priv->wov_enabled;
 static int mt6358_put_wov(struct snd_kcontrol *kcontrol,
 			  struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *c = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *c = snd_kcontrol_chip(kcontrol);
 	struct mt6358_priv *priv = snd_soc_component_get_drvdata(c);
 	int enabled = ucontrol->value.integer.value[0];
 static int mt6358_dmic_mode_get(struct snd_kcontrol *kcontrol,
 				struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *c = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *c = snd_kcontrol_chip(kcontrol);
 	struct mt6358_priv *priv = snd_soc_component_get_drvdata(c);
 	ucontrol->value.integer.value[0] = priv->dmic_one_wire_mode;
 static int mt6358_dmic_mode_set(struct snd_kcontrol *kcontrol,
 				struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *c = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *c = snd_kcontrol_chip(kcontrol);
 	struct mt6358_priv *priv = snd_soc_component_get_drvdata(c);
 	int enabled = ucontrol->value.integer.value[0];
 {
 	struct snd_soc_component *cmpnt = snd_soc_dapm_to_component(w->dapm);
 	struct mt6358_priv *priv = snd_soc_component_get_drvdata(cmpnt);
-	unsigned int mux = dapm_kcontrol_get_value(w->kcontrols[0]);
+	unsigned int mux = snd_soc_dapm_kcontrol_get_value(w->kcontrols[0]);
 	int device = DEVICE_HP;
 	dev_info(priv->dev, "%s(), event 0x%x, dev_counter[DEV_HP] %d, mux %u\n",
 	dev_info(priv->dev, "%s(), event 0x%x, mux %u\n",
 		 __func__,
 		 event,
-		 dapm_kcontrol_get_value(w->kcontrols[0]));
+		 snd_soc_dapm_kcontrol_get_value(w->kcontrols[0]));
 	switch (event) {
 	case SND_SOC_DAPM_PRE_PMU:
 {
 	struct snd_soc_component *cmpnt = snd_soc_dapm_to_component(w->dapm);
 	struct mt6358_priv *priv = snd_soc_component_get_drvdata(cmpnt);
-	unsigned int mux = dapm_kcontrol_get_value(w->kcontrols[0]);
+	unsigned int mux = snd_soc_dapm_kcontrol_get_value(w->kcontrols[0]);
 	dev_dbg(priv->dev, "%s(), event 0x%x, mux %u\n",
 		__func__, event, mux);
 {
 	struct snd_soc_component *cmpnt = snd_soc_dapm_to_component(w->dapm);
 	struct mt6358_priv *priv = snd_soc_component_get_drvdata(cmpnt);
-	unsigned int mux = dapm_kcontrol_get_value(w->kcontrols[0]);
+	unsigned int mux = snd_soc_dapm_kcontrol_get_value(w->kcontrols[0]);
 	dev_dbg(priv->dev, "%s(), event = 0x%x, mux %u\n",
 		__func__, event, mux);
 {
 	struct snd_soc_component *cmpnt = snd_soc_dapm_to_component(w->dapm);
 	struct mt6358_priv *priv = snd_soc_component_get_drvdata(cmpnt);
-	unsigned int mux = dapm_kcontrol_get_value(w->kcontrols[0]);
+	unsigned int mux = snd_soc_dapm_kcontrol_get_value(w->kcontrols[0]);
 	dev_dbg(priv->dev, "%s(), event = 0x%x, mux %u\n",
 		__func__, event, mux);
 {
 	struct snd_soc_component *cmpnt = snd_soc_dapm_to_component(w->dapm);
 	struct mt6358_priv *priv = snd_soc_component_get_drvdata(cmpnt);
-	unsigned int mux = dapm_kcontrol_get_value(w->kcontrols[0]);
+	unsigned int mux = snd_soc_dapm_kcontrol_get_value(w->kcontrols[0]);
 	dev_dbg(priv->dev, "%s(), event = 0x%x, mux %u\n",
 		__func__, event, mux);
 {
 	struct snd_soc_component *cmpnt = snd_soc_dapm_to_component(w->dapm);
 	struct mt6358_priv *priv = snd_soc_component_get_drvdata(cmpnt);
-	unsigned int mux = dapm_kcontrol_get_value(w->kcontrols[0]);
+	unsigned int mux = snd_soc_dapm_kcontrol_get_value(w->kcontrols[0]);
 	dev_dbg(priv->dev, "%s(), event = 0x%x, mux %u\n",
 		__func__, event, mux);

sound/soc/codecs/mt6359.c+8−10

 static int mt6359_put_volsw(struct snd_kcontrol *kcontrol,
 			    struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-			snd_soc_kcontrol_component(kcontrol);
 	struct mt6359_priv *priv = snd_soc_component_get_drvdata(component);
 	struct soc_mixer_control *mc =
 			(struct soc_mixer_control *)kcontrol->private_value;
 static int mt6359_get_playback_volsw(struct snd_kcontrol *kcontrol,
 				     struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-			snd_soc_kcontrol_component(kcontrol);
 	struct mt6359_priv *priv = snd_soc_component_get_drvdata(component);
 	struct soc_mixer_control *mc =
 			(struct soc_mixer_control *)kcontrol->private_value;
 {
 	struct snd_soc_component *cmpnt = snd_soc_dapm_to_component(w->dapm);
 	struct mt6359_priv *priv = snd_soc_component_get_drvdata(cmpnt);
-	unsigned int mux = dapm_kcontrol_get_value(w->kcontrols[0]);
+	unsigned int mux = snd_soc_dapm_kcontrol_get_value(w->kcontrols[0]);
 	int device = DEVICE_HP;
 	dev_dbg(priv->dev, "%s(), event 0x%x, dev_counter[DEV_HP] %d, mux %u\n",
 	struct mt6359_priv *priv = snd_soc_component_get_drvdata(cmpnt);
 	dev_dbg(priv->dev, "%s(), event 0x%x, mux %u\n",
-		__func__, event, dapm_kcontrol_get_value(w->kcontrols[0]));
+		__func__, event, snd_soc_dapm_kcontrol_get_value(w->kcontrols[0]));
 	switch (event) {
 	case SND_SOC_DAPM_PRE_PMU:
 {
 	struct snd_soc_component *cmpnt = snd_soc_dapm_to_component(w->dapm);
 	struct mt6359_priv *priv = snd_soc_component_get_drvdata(cmpnt);
-	unsigned int mux = dapm_kcontrol_get_value(w->kcontrols[0]);
+	unsigned int mux = snd_soc_dapm_kcontrol_get_value(w->kcontrols[0]);
 	dev_dbg(priv->dev, "%s(), event 0x%x, mux %u\n",
 		__func__, event, mux);
 {
 	struct snd_soc_component *cmpnt = snd_soc_dapm_to_component(w->dapm);
 	struct mt6359_priv *priv = snd_soc_component_get_drvdata(cmpnt);
-	unsigned int mux = dapm_kcontrol_get_value(w->kcontrols[0]);
+	unsigned int mux = snd_soc_dapm_kcontrol_get_value(w->kcontrols[0]);
 	dev_dbg(priv->dev, "%s(), mux %d\n", __func__, mux);
 	priv->mux_select[MUX_PGA_L] = mux >> RG_AUDPREAMPLINPUTSEL_SFT;
 {
 	struct snd_soc_component *cmpnt = snd_soc_dapm_to_component(w->dapm);
 	struct mt6359_priv *priv = snd_soc_component_get_drvdata(cmpnt);
-	unsigned int mux = dapm_kcontrol_get_value(w->kcontrols[0]);
+	unsigned int mux = snd_soc_dapm_kcontrol_get_value(w->kcontrols[0]);
 	dev_dbg(priv->dev, "%s(), mux %d\n", __func__, mux);
 	priv->mux_select[MUX_PGA_R] = mux >> RG_AUDPREAMPRINPUTSEL_SFT;
 {
 	struct snd_soc_component *cmpnt = snd_soc_dapm_to_component(w->dapm);
 	struct mt6359_priv *priv = snd_soc_component_get_drvdata(cmpnt);
-	unsigned int mux = dapm_kcontrol_get_value(w->kcontrols[0]);
+	unsigned int mux = snd_soc_dapm_kcontrol_get_value(w->kcontrols[0]);
 	dev_dbg(priv->dev, "%s(), mux %d\n", __func__, mux);
 	priv->mux_select[MUX_PGA_3] = mux >> RG_AUDPREAMP3INPUTSEL_SFT;

sound/soc/codecs/mt6660.c+1−2

@@ -187,8 +187,7 @@ static const struct snd_soc_dapm_route mt6660_component_dapm_routes[] = { · 186 unmodified lines
187	static int mt6660_component_get_volsw(struct snd_kcontrol *kcontrol,	187	static int mt6660_component_get_volsw(struct snd_kcontrol *kcontrol,
188	struct snd_ctl_elem_value *ucontrol)	188	struct snd_ctl_elem_value *ucontrol)
189	{	189	{
190	struct snd_soc_component *component =	190	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
191	snd_soc_kcontrol_component(kcontrol);
192	struct mt6660_chip chip = (struct mt6660_chip )	191	struct mt6660_chip chip = (struct mt6660_chip )
193	snd_soc_component_get_drvdata(component);	192	snd_soc_component_get_drvdata(component);
194		193

sound/soc/codecs/nau8325.c+2−3

 				*n1_sel = i;
 				*mult_sel = j;
 				ratio_sel = ratio;
-					goto proc_done;
+				goto proc_done;
 			}
 		}
 	}
 	return 0;
 }
-static int nau8325_i2c_probe(struct i2c_client *i2c,
+static int nau8325_i2c_probe(struct i2c_client *i2c)
-			     const struct i2c_device_id *id)
 {
 	struct device *dev = &i2c->dev;
 	struct nau8325 *nau8325 = dev_get_platdata(dev);

sound/soc/codecs/nau8810.c+4−3

 static int nau8810_eq_get(struct snd_kcontrol *kcontrol,
 	struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct nau8810 *nau8810 = snd_soc_component_get_drvdata(component);
 	struct soc_bytes_ext *params = (void *)kcontrol->private_value;
 	int i, reg, reg_val;
 static int nau8810_eq_put(struct snd_kcontrol *kcontrol,
 	struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct nau8810 *nau8810 = snd_soc_component_get_drvdata(component);
 	struct soc_bytes_ext *params = (void *)kcontrol->private_value;
 	void *data;
 static int nau8810_set_bias_level(struct snd_soc_component *component,
 	enum snd_soc_bias_level level)
 {
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	struct nau8810 *nau8810 = snd_soc_component_get_drvdata(component);
 	struct regmap *map = nau8810->regmap;
 			NAU8810_IOBUF_EN | NAU8810_ABIAS_EN,
 			NAU8810_IOBUF_EN | NAU8810_ABIAS_EN);
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) {
 			regcache_sync(map);
 			regmap_update_bits(map, NAU8810_REG_POWER1,
 				NAU8810_REFIMP_MASK, NAU8810_REFIMP_3K);

sound/soc/codecs/nau8821.c+11−17

 {
 	struct snd_soc_dapm_context *dapm = nau8821->dapm;
 	struct regmap *regmap = nau8821->regmap;
-	struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
 	/* Detach 2kOhm Resistors from MICBIAS to MICGND */
 	regmap_update_bits(regmap, NAU8821_R74_MIC_BIAS,
 	/* HPL/HPR short to ground */
 	regmap_update_bits(regmap, NAU8821_R0D_JACK_DET_CTRL,
 		NAU8821_SPKR_DWN1R | NAU8821_SPKR_DWN1L, 0);
-	snd_soc_component_disable_pin(component, "MICBIAS");
+	snd_soc_dapm_disable_pin(dapm, "MICBIAS");
 	snd_soc_dapm_sync(dapm);
 	/* Disable & mask both insertion & ejection IRQs */
 		NAU8821_JACK_DET_DB_BYPASS, NAU8821_JACK_DET_DB_BYPASS);
 	/* Close clock for jack type detection at manual mode */
-	if (dapm->bias_level < SND_SOC_BIAS_PREPARE)
+	if (snd_soc_dapm_get_bias_level(dapm) < SND_SOC_BIAS_PREPARE)
 		nau8821_configure_sysclk(nau8821, NAU8821_CLK_DIS, 0);
 	/* Recover to normal channel input */
 	struct nau8821 *nau8821 =
 		container_of(work, struct nau8821, jdet_work.work);
 	struct snd_soc_dapm_context *dapm = nau8821->dapm;
-	struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
 	struct regmap *regmap = nau8821->regmap;
 	int jack_status_reg, mic_detected, event = 0, event_mask = 0;
 				NAU8821_IRQ_KEY_RELEASE_DIS |
 				NAU8821_IRQ_KEY_PRESS_DIS, 0);
 		} else {
-			snd_soc_component_disable_pin(component, "MICBIAS");
+			snd_soc_dapm_disable_pin(dapm, "MICBIAS");
-			snd_soc_dapm_sync(nau8821->dapm);
+			snd_soc_dapm_sync(dapm);
 		}
 	} else {
 		dev_dbg(nau8821->dev, "Headphone connected\n");
 		event |= SND_JACK_HEADPHONE;
-		snd_soc_component_disable_pin(component, "MICBIAS");
+		snd_soc_dapm_disable_pin(dapm, "MICBIAS");
 		snd_soc_dapm_sync(dapm);
 	}
 	nau8821_irq_status_clear(regmap, NAU8821_JACK_INSERT_DETECTED);
 	/* Enable internal VCO needed for interruptions */
-	if (nau8821->dapm->bias_level < SND_SOC_BIAS_PREPARE)
+	if (snd_soc_dapm_get_bias_level(nau8821->dapm) < SND_SOC_BIAS_PREPARE)
 		nau8821_configure_sysclk(nau8821, NAU8821_CLK_INTERNAL, 0);
 	/* Chip needs one FSCLK cycle in order to generate interruptions,
 {
 	struct nau8821 *nau8821 = (struct nau8821 *)data;
 	struct regmap *regmap = nau8821->regmap;
-	struct snd_soc_component *component;
 	int active_irq, event = 0, event_mask = 0;
 	if (regmap_read(regmap, NAU8821_R10_IRQ_STATUS, &active_irq)) {
 			NAU8821_MICDET_MASK, NAU8821_MICDET_EN);
 		if (nau8821_is_jack_inserted(regmap)) {
 			/* Detect microphone and jack type */
-			component = snd_soc_dapm_to_component(nau8821->dapm);
+			snd_soc_dapm_force_enable_pin(nau8821->dapm, "MICBIAS");
-			snd_soc_component_force_enable_pin(component, "MICBIAS");
 			snd_soc_dapm_sync(nau8821->dapm);
 			schedule_delayed_work(&nau8821->jdet_work, msecs_to_jiffies(20));
 			/* Turn off insertion interruption at manual mode */
 static int nau8821_component_probe(struct snd_soc_component *component)
 {
 	struct nau8821 *nau8821 = snd_soc_component_get_drvdata(component);
-	struct snd_soc_dapm_context *dapm =
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
-		snd_soc_component_get_dapm(component);
 	nau8821->dapm = dapm;
 	case SND_SOC_BIAS_STANDBY:
 		/* Setup codec configuration after resume */
-		if (snd_soc_component_get_bias_level(component) ==
+		if (snd_soc_dapm_get_bias_level(nau8821->dapm) == SND_SOC_BIAS_OFF)
-			SND_SOC_BIAS_OFF)
 			nau8821_resume_setup(nau8821);
 		break;
 	if (nau8821->irq)
 		disable_irq(nau8821->irq);
-	snd_soc_component_force_bias_level(component, SND_SOC_BIAS_OFF);
+	snd_soc_dapm_force_bias_level(nau8821->dapm, SND_SOC_BIAS_OFF);
 	/* Power down codec power; don't support button wakeup */
-	snd_soc_component_disable_pin(component, "MICBIAS");
+	snd_soc_dapm_disable_pin(nau8821->dapm, "MICBIAS");
 	snd_soc_dapm_sync(nau8821->dapm);
 	regcache_cache_only(nau8821->regmap, true);
 	regcache_mark_dirty(nau8821->regmap);

sound/soc/codecs/nau8822.c+10−10

 static int nau8822_eq_get(struct snd_kcontrol *kcontrol,
 	struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-			snd_soc_kcontrol_component(kcontrol);
 	struct soc_bytes_ext *params = (void *)kcontrol->private_value;
 	int i, reg;
 	u16 reg_val, *val;
 static int nau8822_eq_put(struct snd_kcontrol *kcontrol,
 	struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-			snd_soc_kcontrol_component(kcontrol);
 	struct soc_bytes_ext *params = (void *)kcontrol->private_value;
 	void *data;
 	u16 *val, value;
 				 enum snd_soc_bias_level level)
 {
 	struct nau8822 *nau8822 = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	switch (level) {
 	case SND_SOC_BIAS_ON:
 	case SND_SOC_BIAS_PREPARE:
 		if (nau8822->mclk &&
-			snd_soc_component_get_bias_level(component) != SND_SOC_BIAS_ON) {
+			snd_soc_dapm_get_bias_level(dapm) != SND_SOC_BIAS_ON) {
 			int ret = clk_prepare_enable(nau8822->mclk);
 			if (ret) {
 	case SND_SOC_BIAS_STANDBY:
 		if (nau8822->mclk &&
-			snd_soc_component_get_bias_level(component) != SND_SOC_BIAS_OFF)
+			snd_soc_dapm_get_bias_level(dapm) != SND_SOC_BIAS_OFF)
 			clk_disable_unprepare(nau8822->mclk);
 		snd_soc_component_update_bits(component,
 			NAU8822_IOBUF_EN | NAU8822_ABIAS_EN,
 			NAU8822_IOBUF_EN | NAU8822_ABIAS_EN);
-		if (snd_soc_component_get_bias_level(component) ==
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) {
-			SND_SOC_BIAS_OFF) {
 			snd_soc_component_update_bits(component,
 				NAU8822_REG_POWER_MANAGEMENT_1,
 				NAU8822_REFIMP_MASK, NAU8822_REFIMP_3K);
 static int nau8822_suspend(struct snd_soc_component *component)
 {
 	struct nau8822 *nau8822 = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
-	snd_soc_component_force_bias_level(component, SND_SOC_BIAS_OFF);
+	snd_soc_dapm_force_bias_level(dapm, SND_SOC_BIAS_OFF);
 	regcache_mark_dirty(nau8822->regmap);
 static int nau8822_resume(struct snd_soc_component *component)
 {
 	struct nau8822 *nau8822 = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	regcache_sync(nau8822->regmap);
-	snd_soc_component_force_bias_level(component, SND_SOC_BIAS_STANDBY);
+	snd_soc_dapm_force_bias_level(dapm, SND_SOC_BIAS_STANDBY);
 	return 0;
 }

sound/soc/codecs/nau8824.c+5−5

@@ -876,7 +876,7 @@ static void nau8824_eject_jack(struct nau8824 *nau8824) · 875 unmodified lines
876	NAU8824_JD_SLEEP_MODE, NAU8824_JD_SLEEP_MODE);	876	NAU8824_JD_SLEEP_MODE, NAU8824_JD_SLEEP_MODE);
877		877
878	/* Close clock for jack type detection at manual mode */	878	/* Close clock for jack type detection at manual mode */
879	if (dapm->bias_level < SND_SOC_BIAS_PREPARE)	879	if (snd_soc_dapm_get_bias_level(dapm) < SND_SOC_BIAS_PREPARE)
880	nau8824_config_sysclk(nau8824, NAU8824_CLK_DIS, 0);	880	nau8824_config_sysclk(nau8824, NAU8824_CLK_DIS, 0);
881	}	881	}
882		882
@@ -931,7 +931,7 @@ static void nau8824_setup_auto_irq(struct nau8824 *nau8824) · 48 unmodified lines
931	regmap_update_bits(regmap, NAU8824_REG_INTERRUPT_SETTING,	931	regmap_update_bits(regmap, NAU8824_REG_INTERRUPT_SETTING,
932	NAU8824_IRQ_EJECT_DIS, 0);	932	NAU8824_IRQ_EJECT_DIS, 0);
933	/* Enable internal VCO needed for interruptions */	933	/* Enable internal VCO needed for interruptions */
934	if (nau8824->dapm->bias_level < SND_SOC_BIAS_PREPARE)	934	if (snd_soc_dapm_get_bias_level(nau8824->dapm) < SND_SOC_BIAS_PREPARE)
935	nau8824_config_sysclk(nau8824, NAU8824_CLK_INTERNAL, 0);	935	nau8824_config_sysclk(nau8824, NAU8824_CLK_INTERNAL, 0);
936	regmap_update_bits(regmap, NAU8824_REG_ENA_CTRL,	936	regmap_update_bits(regmap, NAU8824_REG_ENA_CTRL,
937	NAU8824_JD_SLEEP_MODE, 0);	937	NAU8824_JD_SLEEP_MODE, 0);
@@ -1498,7 +1498,7 @@ static int nau8824_set_bias_level(struct snd_soc_component *component, · 560 unmodified lines
1498	break;	1498	break;
1499		1499
1500	case SND_SOC_BIAS_STANDBY:	1500	case SND_SOC_BIAS_STANDBY:
1501	if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {	1501	if (snd_soc_dapm_get_bias_level(nau8824->dapm) == SND_SOC_BIAS_OFF) {
1502	/* Setup codec configuration after resume */	1502	/* Setup codec configuration after resume */
1503	nau8824_resume_setup(nau8824);	1503	nau8824_resume_setup(nau8824);
1504	}	1504	}
@@ -1519,7 +1519,7 @@ static int nau8824_set_bias_level(struct snd_soc_component *component, · 14 unmodified lines
1519	static int nau8824_component_probe(struct snd_soc_component *component)	1519	static int nau8824_component_probe(struct snd_soc_component *component)
1520	{	1520	{
1521	struct nau8824 *nau8824 = snd_soc_component_get_drvdata(component);	1521	struct nau8824 *nau8824 = snd_soc_component_get_drvdata(component);
1522	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	1522	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
1523		1523
1524	nau8824->dapm = dapm;	1524	nau8824->dapm = dapm;
1525		1525
@@ -1532,7 +1532,7 @@ static int __maybe_unused nau8824_suspend(struct snd_soc_component *component) · 6 unmodified lines
1532		1532
1533	if (nau8824->irq) {	1533	if (nau8824->irq) {
1534	disable_irq(nau8824->irq);	1534	disable_irq(nau8824->irq);
1535	snd_soc_component_force_bias_level(component, SND_SOC_BIAS_OFF);	1535	snd_soc_dapm_force_bias_level(nau8824->dapm, SND_SOC_BIAS_OFF);
1536	}	1536	}
1537	regcache_cache_only(nau8824->regmap, true);	1537	regcache_cache_only(nau8824->regmap, true);
1538	regcache_mark_dirty(nau8824->regmap);	1538	regcache_mark_dirty(nau8824->regmap);

sound/soc/codecs/nau8825.c+3−3

@@ -2226,7 +2226,7 @@ static const struct regmap_config nau8825_regmap_config = { · 2225 unmodified lines
2226	static int nau8825_component_probe(struct snd_soc_component *component)	2226	static int nau8825_component_probe(struct snd_soc_component *component)
2227	{	2227	{
2228	struct nau8825 *nau8825 = snd_soc_component_get_drvdata(component);	2228	struct nau8825 *nau8825 = snd_soc_component_get_drvdata(component);
2229	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	2229	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
2230		2230
2231	nau8825->dapm = dapm;	2231	nau8825->dapm = dapm;
2232		2232
@@ -2630,7 +2630,7 @@ static int nau8825_set_bias_level(struct snd_soc_component *component, · 397 unmodified lines
2630	break;	2630	break;
2631		2631
2632	case SND_SOC_BIAS_STANDBY:	2632	case SND_SOC_BIAS_STANDBY:
2633	if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {	2633	if (snd_soc_dapm_get_bias_level(nau8825->dapm) == SND_SOC_BIAS_OFF) {
2634	if (nau8825->mclk_freq) {	2634	if (nau8825->mclk_freq) {
2635	ret = clk_prepare_enable(nau8825->mclk);	2635	ret = clk_prepare_enable(nau8825->mclk);
2636	if (ret) {	2636	if (ret) {
@@ -2673,7 +2673,7 @@ static int __maybe_unused nau8825_suspend(struct snd_soc_component *component) · 36 unmodified lines
2673	struct nau8825 *nau8825 = snd_soc_component_get_drvdata(component);	2673	struct nau8825 *nau8825 = snd_soc_component_get_drvdata(component);
2674		2674
2675	disable_irq(nau8825->irq);	2675	disable_irq(nau8825->irq);
2676	snd_soc_component_force_bias_level(component, SND_SOC_BIAS_OFF);	2676	snd_soc_dapm_force_bias_level(nau8825->dapm, SND_SOC_BIAS_OFF);
2677	/* Power down codec power; don't suppoet button wakeup */	2677	/* Power down codec power; don't suppoet button wakeup */
2678	snd_soc_dapm_disable_pin(nau8825->dapm, "SAR");	2678	snd_soc_dapm_disable_pin(nau8825->dapm, "SAR");
2679	snd_soc_dapm_disable_pin(nau8825->dapm, "MICBIAS");	2679	snd_soc_dapm_disable_pin(nau8825->dapm, "MICBIAS");

sound/soc/codecs/ntp8835.c+2−2

@@ -92,7 +92,7 @@ static int ntp8835_mute_info(struct snd_kcontrol *kcontrol, · 91 unmodified lines
92	static int ntp8835_mute_get(struct snd_kcontrol *kcontrol,	92	static int ntp8835_mute_get(struct snd_kcontrol *kcontrol,
93	struct snd_ctl_elem_value *ucontrol)	93	struct snd_ctl_elem_value *ucontrol)
94	{	94	{
95	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	95	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
96	unsigned int val;	96	unsigned int val;
97		97
98	val = snd_soc_component_read(component, NTP8835_SOFT_MUTE);	98	val = snd_soc_component_read(component, NTP8835_SOFT_MUTE);
@@ -104,7 +104,7 @@ static int ntp8835_mute_get(struct snd_kcontrol *kcontrol, · 5 unmodified lines
104	static int ntp8835_mute_put(struct snd_kcontrol *kcontrol,	104	static int ntp8835_mute_put(struct snd_kcontrol *kcontrol,
105	struct snd_ctl_elem_value *ucontrol)	105	struct snd_ctl_elem_value *ucontrol)
106	{	106	{
107	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	107	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
108	unsigned int val;	108	unsigned int val;
109		109
110	val = ucontrol->value.integer.value[0] ? 0 : 7;	110	val = ucontrol->value.integer.value[0] ? 0 : 7;

sound/soc/codecs/pcm1681.c+2−2

@@ -108,7 +108,7 @@ static int pcm1681_set_deemph(struct snd_soc_component *component) · 107 unmodified lines
108	static int pcm1681_get_deemph(struct snd_kcontrol *kcontrol,	108	static int pcm1681_get_deemph(struct snd_kcontrol *kcontrol,
109	struct snd_ctl_elem_value *ucontrol)	109	struct snd_ctl_elem_value *ucontrol)
110	{	110	{
111	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	111	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
112	struct pcm1681_private *priv = snd_soc_component_get_drvdata(component);	112	struct pcm1681_private *priv = snd_soc_component_get_drvdata(component);
113		113
114	ucontrol->value.integer.value[0] = priv->deemph;	114	ucontrol->value.integer.value[0] = priv->deemph;
@@ -119,7 +119,7 @@ static int pcm1681_get_deemph(struct snd_kcontrol *kcontrol, · 4 unmodified lines
119	static int pcm1681_put_deemph(struct snd_kcontrol *kcontrol,	119	static int pcm1681_put_deemph(struct snd_kcontrol *kcontrol,
120	struct snd_ctl_elem_value *ucontrol)	120	struct snd_ctl_elem_value *ucontrol)
121	{	121	{
122	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	122	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
123	struct pcm1681_private *priv = snd_soc_component_get_drvdata(component);	123	struct pcm1681_private *priv = snd_soc_component_get_drvdata(component);
124		124
125	priv->deemph = ucontrol->value.integer.value[0];	125	priv->deemph = ucontrol->value.integer.value[0];

sound/soc/codecs/pcm186x.c+4−2

 static int pcm186x_set_bias_level(struct snd_soc_component *component,
 				  enum snd_soc_bias_level level)
 {
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	dev_dbg(component->dev, "## %s: %d -> %d\n", __func__,
-		snd_soc_component_get_bias_level(component), level);
+		snd_soc_dapm_get_bias_level(dapm), level);
 	switch (level) {
 	case SND_SOC_BIAS_ON:
 	case SND_SOC_BIAS_PREPARE:
 		break;
 	case SND_SOC_BIAS_STANDBY:
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF)
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF)
 			pcm186x_power_on(component);
 		break;
 	case SND_SOC_BIAS_OFF:

sound/soc/codecs/pcm512x.c+14−11

 static int pcm512x_overclock_pll_get(struct snd_kcontrol *kcontrol,
 				     struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct pcm512x_priv *pcm512x = snd_soc_component_get_drvdata(component);
 	ucontrol->value.integer.value[0] = pcm512x->overclock_pll;
 static int pcm512x_overclock_pll_put(struct snd_kcontrol *kcontrol,
 				     struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
+	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol);
 	struct pcm512x_priv *pcm512x = snd_soc_component_get_drvdata(component);
-	switch (snd_soc_component_get_bias_level(component)) {
+	switch (snd_soc_dapm_get_bias_level(dapm)) {
 	case SND_SOC_BIAS_OFF:
 	case SND_SOC_BIAS_STANDBY:
 		break;
 static int pcm512x_overclock_dsp_get(struct snd_kcontrol *kcontrol,
 				     struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct pcm512x_priv *pcm512x = snd_soc_component_get_drvdata(component);
 	ucontrol->value.integer.value[0] = pcm512x->overclock_dsp;
 static int pcm512x_overclock_dsp_put(struct snd_kcontrol *kcontrol,
 				     struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
+	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol);
 	struct pcm512x_priv *pcm512x = snd_soc_component_get_drvdata(component);
-	switch (snd_soc_component_get_bias_level(component)) {
+	switch (snd_soc_dapm_get_bias_level(dapm)) {
 	case SND_SOC_BIAS_OFF:
 	case SND_SOC_BIAS_STANDBY:
 		break;
 static int pcm512x_overclock_dac_get(struct snd_kcontrol *kcontrol,
 				     struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct pcm512x_priv *pcm512x = snd_soc_component_get_drvdata(component);
 	ucontrol->value.integer.value[0] = pcm512x->overclock_dac;
 static int pcm512x_overclock_dac_put(struct snd_kcontrol *kcontrol,
 				     struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
+	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol);
 	struct pcm512x_priv *pcm512x = snd_soc_component_get_drvdata(component);
-	switch (snd_soc_component_get_bias_level(component)) {
+	switch (snd_soc_dapm_get_bias_level(dapm)) {
 	case SND_SOC_BIAS_OFF:
 	case SND_SOC_BIAS_STANDBY:
 		break;
 static int pcm512x_digital_playback_switch_get(struct snd_kcontrol *kcontrol,
 					       struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct pcm512x_priv *pcm512x = snd_soc_component_get_drvdata(component);
 	mutex_lock(&pcm512x->mutex);
 static int pcm512x_digital_playback_switch_put(struct snd_kcontrol *kcontrol,
 					       struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct pcm512x_priv *pcm512x = snd_soc_component_get_drvdata(component);
 	int ret, changed = 0;

sound/soc/codecs/pcm6240.c+3−6

 	struct snd_kcontrol *kcontrol,
 	struct snd_ctl_elem_info *uinfo)
 {
-	struct snd_soc_component *codec
+	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
-		= snd_soc_kcontrol_component(kcontrol);
 	struct pcmdevice_priv *pcm_dev =
 		snd_soc_component_get_drvdata(codec);
 	struct snd_kcontrol *kcontrol,
 	struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *codec
+	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
-		= snd_soc_kcontrol_component(kcontrol);
 	struct pcmdevice_priv *pcm_dev =
 		snd_soc_component_get_drvdata(codec);
 	struct snd_kcontrol *kcontrol,
 	struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *codec
+	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
-		= snd_soc_kcontrol_component(kcontrol);
 	struct pcmdevice_priv *pcm_dev =
 		snd_soc_component_get_drvdata(codec);
 	int nr_profile = ucontrol->value.integer.value[0];

sound/soc/codecs/peb2466.c+3−3

sound/soc/codecs/pm4125-sdw.c+7−57

@@ -20,12 +20,12 @@ · 19 unmodified lines
20	#include <sound/soc.h>	20	#include <sound/soc.h>
21	#include "pm4125.h"	21	#include "pm4125.h"
22		22
23	static struct pm4125_sdw_ch_info pm4125_sdw_rx_ch_info[] = {	23	static struct wcd_sdw_ch_info pm4125_sdw_rx_ch_info[] = {
24	WCD_SDW_CH(PM4125_HPH_L, PM4125_HPH_PORT, BIT(0)),	24	WCD_SDW_CH(PM4125_HPH_L, PM4125_HPH_PORT, BIT(0)),
25	WCD_SDW_CH(PM4125_HPH_R, PM4125_HPH_PORT, BIT(1)),	25	WCD_SDW_CH(PM4125_HPH_R, PM4125_HPH_PORT, BIT(1)),
26	};	26	};
27		27
28	static struct pm4125_sdw_ch_info pm4125_sdw_tx_ch_info[] = {	28	static struct wcd_sdw_ch_info pm4125_sdw_tx_ch_info[] = {
29	WCD_SDW_CH(PM4125_ADC1, PM4125_ADC_1_2_DMIC1L_BCS_PORT, BIT(0)),	29	WCD_SDW_CH(PM4125_ADC1, PM4125_ADC_1_2_DMIC1L_BCS_PORT, BIT(0)),
30	WCD_SDW_CH(PM4125_ADC2, PM4125_ADC_1_2_DMIC1L_BCS_PORT, BIT(1)),	30	WCD_SDW_CH(PM4125_ADC2, PM4125_ADC_1_2_DMIC1L_BCS_PORT, BIT(1)),
31	};	31	};
@@ -46,12 +46,6 @@ static struct sdw_dpn_prop pm4125_dpn_prop[PM4125_MAX_SWR_PORTS] = { · 14 unmodified lines
46	}	46	}
47	};	47	};
48		48
49	struct device pm4125_sdw_device_get(struct device_node np)
50	{
51	return bus_find_device_by_of_node(&sdw_bus_type, np);
52	}
53	EXPORT_SYMBOL_GPL(pm4125_sdw_device_get);
54
55	int pm4125_sdw_hw_params(struct pm4125_sdw_priv priv, struct snd_pcm_substream substream,	49	int pm4125_sdw_hw_params(struct pm4125_sdw_priv priv, struct snd_pcm_substream substream,
56	struct snd_pcm_hw_params params, struct snd_soc_dai dai)	50	struct snd_pcm_hw_params params, struct snd_soc_dai dai)
57	{	51	{
@@ -83,19 +77,6 @@ int pm4125_sdw_hw_params(struct pm4125_sdw_priv *priv, struct snd_pcm_substream · 25 unmodified lines
83	}	77	}
84	EXPORT_SYMBOL_GPL(pm4125_sdw_hw_params);	78	EXPORT_SYMBOL_GPL(pm4125_sdw_hw_params);
85		79
86	static int pm4125_update_status(struct sdw_slave *slave, enum sdw_slave_status status)
87	{
88	struct pm4125_sdw_priv *priv = dev_get_drvdata(&slave->dev);
89
90	if (priv->regmap && status == SDW_SLAVE_ATTACHED) {
91	/* Write out any cached changes that happened between probe and attach */
92	regcache_cache_only(priv->regmap, false);
93	return regcache_sync(priv->regmap);
94	}
95
96	return 0;
97	}
98
99	/*	80	/*
100	* Handle Soundwire out-of-band interrupt event by triggering the first irq of the slave_irq	81	* Handle Soundwire out-of-band interrupt event by triggering the first irq of the slave_irq
101	* irq domain, which then will be handled by the regmap_irq threaded irq.	82	* irq domain, which then will be handled by the regmap_irq threaded irq.
@@ -104,18 +85,9 @@ static int pm4125_update_status(struct sdw_slave *slave, enum sdw_slave_status s · 2 unmodified lines
104	static int pm4125_interrupt_callback(struct sdw_slave slave, struct sdw_slave_intr_status status)	85	static int pm4125_interrupt_callback(struct sdw_slave slave, struct sdw_slave_intr_status status)
105	{	86	{
106	struct pm4125_sdw_priv *priv = dev_get_drvdata(&slave->dev);	87	struct pm4125_sdw_priv *priv = dev_get_drvdata(&slave->dev);
107	struct irq_domain *slave_irq = priv->slave_irq;
108	u32 sts1, sts2, sts3;
109
110	do {
111	handle_nested_irq(irq_find_mapping(slave_irq, 0));
112	regmap_read(priv->regmap, PM4125_DIG_SWR_INTR_STATUS_0, &sts1);
113	regmap_read(priv->regmap, PM4125_DIG_SWR_INTR_STATUS_1, &sts2);
114	regmap_read(priv->regmap, PM4125_DIG_SWR_INTR_STATUS_2, &sts3);
115		88
116	} while (sts1 \|\| sts2 \|\| sts3);	89	return wcd_interrupt_callback(slave, priv->slave_irq, PM4125_DIG_SWR_INTR_STATUS_0,
117		90	PM4125_DIG_SWR_INTR_STATUS_1, PM4125_DIG_SWR_INTR_STATUS_2);
118	return IRQ_HANDLED;
119	}	91	}
120		92
121	static const struct reg_default pm4125_defaults[] = {	93	static const struct reg_default pm4125_defaults[] = {
@@ -369,32 +341,10 @@ static const struct regmap_config pm4125_regmap_config = { · 247 unmodified lines
369	};	341	};
370		342
371	static const struct sdw_slave_ops pm4125_slave_ops = {	343	static const struct sdw_slave_ops pm4125_slave_ops = {
372	.update_status = pm4125_update_status,	344	.update_status = wcd_update_status,
373	.interrupt_callback = pm4125_interrupt_callback,	345	.interrupt_callback = pm4125_interrupt_callback,
374	};	346	};
375		347
376	static int pm4125_sdw_component_bind(struct device dev, struct device master, void *data)
377	{
378	pm_runtime_set_autosuspend_delay(dev, 3000);
379	pm_runtime_use_autosuspend(dev);
380	pm_runtime_set_active(dev);
381	pm_runtime_enable(dev);
382
383	return 0;
384	}
385
386	static void pm4125_sdw_component_unbind(struct device dev, struct device master, void *data)
387	{
388	pm_runtime_disable(dev);
389	pm_runtime_set_suspended(dev);
390	pm_runtime_dont_use_autosuspend(dev);
391	}
392
393	static const struct component_ops pm4125_sdw_component_ops = {
394	.bind = pm4125_sdw_component_bind,
395	.unbind = pm4125_sdw_component_unbind,
396	};
397
398	static int pm4125_probe(struct sdw_slave pdev, const struct sdw_device_id id)	348	static int pm4125_probe(struct sdw_slave pdev, const struct sdw_device_id id)
399	{	349	{
400	struct device *dev = &pdev->dev;	350	struct device *dev = &pdev->dev;
@@ -476,7 +426,7 @@ static int pm4125_probe(struct sdw_slave pdev, const struct sdw_device_id id) · 75 unmodified lines
476	priv->ch_info[i].master_ch_mask = PM4125_SWRM_CH_MASK(master_ch_mask[i]);	426	priv->ch_info[i].master_ch_mask = PM4125_SWRM_CH_MASK(master_ch_mask[i]);
477	}	427	}
478		428
479	ret = component_add(dev, &pm4125_sdw_component_ops);	429	ret = component_add(dev, &wcd_sdw_component_ops);
480	if (ret)	430	if (ret)
481	return ret;	431	return ret;
482		432
@@ -490,7 +440,7 @@ static int pm4125_remove(struct sdw_slave *pdev) · 7 unmodified lines
490	{	440	{
491	struct device *dev = &pdev->dev;	441	struct device *dev = &pdev->dev;
492		442
493	component_del(dev, &pm4125_sdw_component_ops);	443	component_del(dev, &wcd_sdw_component_ops);
494		444
495	return 0;	445	return 0;
496	}	446	}

sound/soc/codecs/pm4125.c+53−72

 	struct wcd_mbhc *wcd_mbhc;
 	struct wcd_mbhc_config mbhc_cfg;
 	struct wcd_mbhc_intr intr_ids;
+	struct wcd_common common;
 	struct irq_domain *virq;
-	const struct regmap_irq_chip *pm4125_regmap_irq_chip;
+	const struct regmap_irq_chip *chip_desc;
 	struct regmap_irq_chip_data *irq_chip;
 	struct snd_soc_jack *jack;
 	unsigned long status_mask;
 	s32 micb_ref[PM4125_MAX_MICBIAS];
 	s32 pullup_ref[PM4125_MAX_MICBIAS];
-	u32 micb1_mv;
-	u32 micb2_mv;
-	u32 micb3_mv;
 	int hphr_pdm_wd_int;
 	int hphl_pdm_wd_int;
 	PM4125_DIG_SWR_INTR_LEVEL_0,
 };
-static struct regmap_irq_chip pm4125_regmap_irq_chip = {
+static const struct regmap_irq_chip pm4125_regmap_irq_chip = {
 	.name = "pm4125",
 	.irqs = pm4125_irqs,
 	.num_irqs = ARRAY_SIZE(pm4125_irqs),
 	return 0;
 }
-static int pm4125_get_micb_vout_ctl_val(struct device *dev, u32 micb_mv)
-{
-	if (micb_mv < 1600 || micb_mv > 2850) {
-		dev_err(dev, "%s: unsupported micbias voltage (%u mV)\n", __func__, micb_mv);
-		return -EINVAL;
-	}
-	return (micb_mv - 1600) / 50;
-}
 static int pm4125_codec_enable_adc(struct snd_soc_dapm_widget *w,
 				   struct snd_kcontrol *kcontrol, int event)
 {
 						      0x00);
 		pm4125_global_mbias_disable(component);
 		break;
-	};
+	}
 	return 0;
 }
 		dev_err(component->dev, "%s: Invalid micbias number: %d\n",
 			__func__, micb_num);
 		return -EINVAL;
-	};
+	}
 	switch (req) {
 	case MICB_PULLUP_ENABLE:
 			pm4125_global_mbias_disable(component);
 		}
 		break;
-	};
+	}
 	return 0;
 }
 static int pm4125_connect_port(struct pm4125_sdw_priv *sdw_priv, u8 port_idx, u8 ch_id, bool enable)
 {
 	struct sdw_port_config *port_config = &sdw_priv->port_config[port_idx - 1];
-	const struct pm4125_sdw_ch_info *ch_info = &sdw_priv->ch_info[ch_id];
+	const struct wcd_sdw_ch_info *ch_info = &sdw_priv->ch_info[ch_id];
 	struct sdw_slave *sdev = sdw_priv->sdev;
 	u8 port_num = ch_info->port_num;
 	u8 ch_mask = ch_info->ch_mask;
 static int pm4125_get_compander(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct pm4125_priv *pm4125 = snd_soc_component_get_drvdata(component);
 	struct soc_mixer_control *mc;
 	bool hphr;
 static int pm4125_set_compander(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct pm4125_priv *pm4125 = snd_soc_component_get_drvdata(component);
 	struct pm4125_sdw_priv *sdw_priv = pm4125->sdw_priv[AIF1_PB];
 	int value = ucontrol->value.integer.value[0];
 static int pm4125_get_swr_port(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
 	struct soc_mixer_control *mixer = (struct soc_mixer_control *)kcontrol->private_value;
-	struct snd_soc_component *comp = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *comp = snd_kcontrol_chip(kcontrol);
 	struct pm4125_priv *pm4125 = snd_soc_component_get_drvdata(comp);
 	struct pm4125_sdw_priv *sdw_priv;
 	int dai_id = mixer->shift;
 static int pm4125_set_swr_port(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
 	struct soc_mixer_control *mixer = (struct soc_mixer_control *)kcontrol->private_value;
-	struct snd_soc_component *comp = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *comp = snd_kcontrol_chip(kcontrol);
 	struct pm4125_priv *pm4125 = snd_soc_component_get_drvdata(comp);
 	struct pm4125_sdw_priv *sdw_priv;
 	int dai_id = mixer->shift;
 static int pm4125_set_micbias_data(struct device *dev, struct pm4125_priv *pm4125)
 {
-	int vout_ctl;
-	/* Set micbias voltage */
-	vout_ctl = pm4125_get_micb_vout_ctl_val(dev, pm4125->micb1_mv);
-	if (vout_ctl < 0)
-		return -EINVAL;
 	regmap_update_bits(pm4125->regmap, PM4125_ANA_MICBIAS_LDO_1_SETTING,
-			   PM4125_ANA_MICBIAS_MICB_OUT_VAL_MASK, vout_ctl << 3);
+			   PM4125_ANA_MICBIAS_MICB_OUT_VAL_MASK, pm4125->common.micb_vout[0]);
 	return 0;
 }
 		return -EINVAL;
 	}
-	pm4125_regmap_irq_chip.irq_drv_data = pm4125;
 	return devm_regmap_add_irq_chip(dev, pm4125->regmap, irq_create_mapping(pm4125->virq, 0),
-					IRQF_ONESHOT, 0, &pm4125_regmap_irq_chip,
+					IRQF_ONESHOT, 0, pm4125->chip_desc,
 					&pm4125->irq_chip);
 }
 	.endianness = 1,
 };
-static void pm4125_dt_parse_micbias_info(struct device *dev, struct pm4125_priv *priv)
-{
-	struct device_node *np = dev->of_node;
-	u32 prop_val = 0;
-	int ret;
-	ret = of_property_read_u32(np, "qcom,micbias1-microvolt", &prop_val);
-	if (!ret)
-		priv->micb1_mv = prop_val / 1000;
-	else
-		dev_warn(dev, "Micbias1 DT property not found\n");
-	ret = of_property_read_u32(np, "qcom,micbias2-microvolt", &prop_val);
-	if (!ret)
-		priv->micb2_mv = prop_val / 1000;
-	else
-		dev_warn(dev, "Micbias2 DT property not found\n");
-	ret = of_property_read_u32(np, "qcom,micbias3-microvolt", &prop_val);
-	if (!ret)
-		priv->micb3_mv = prop_val / 1000;
-	else
-		dev_warn(dev, "Micbias3 DT property not found\n");
-}
 static int pm4125_codec_hw_params(struct snd_pcm_substream *substream,
 				  struct snd_pcm_hw_params *params,
 				  struct snd_soc_dai *dai)
 	struct device_link *devlink;
 	int ret;
+	/* Initialize device pointers to NULL for safe cleanup */
+	pm4125->rxdev = NULL;
+	pm4125->txdev = NULL;
 	/* Give the soundwire subdevices some more time to settle */
 	usleep_range(15000, 15010);
 		return ret;
 	}
-	pm4125->rxdev = pm4125_sdw_device_get(pm4125->rxnode);
+	pm4125->rxdev = of_sdw_find_device_by_node(pm4125->rxnode);
 	if (!pm4125->rxdev) {
 		dev_err(dev, "could not find rxslave with matching of node\n");
 		ret = -EINVAL;
 	pm4125->sdw_priv[AIF1_PB] = dev_get_drvdata(pm4125->rxdev);
 	pm4125->sdw_priv[AIF1_PB]->pm4125 = pm4125;
-	pm4125->txdev = pm4125_sdw_device_get(pm4125->txnode);
+	pm4125->txdev = of_sdw_find_device_by_node(pm4125->txnode);
 	if (!pm4125->txdev) {
 		dev_err(dev, "could not find txslave with matching of node\n");
 		ret = -EINVAL;
-		goto error_unbind_all;
+		goto error_put_rx;
 	}
 	pm4125->sdw_priv[AIF1_CAP] = dev_get_drvdata(pm4125->txdev);
 	if (!pm4125->tx_sdw_dev) {
 		dev_err(dev, "could not get txslave with matching of dev\n");
 		ret = -EINVAL;
-		goto error_unbind_all;
+		goto error_put_tx;
 	}
 	/*
 	if (!devlink) {
 		dev_err(dev, "Could not devlink TX and RX\n");
 		ret = -EINVAL;
-		goto error_unbind_all;
+		goto error_put_tx;
 	}
 	devlink = device_link_add(dev, pm4125->txdev,
 		goto link_remove_dev_tx;
 	}
-	pm4125->regmap = dev_get_regmap(&pm4125->tx_sdw_dev->dev, NULL);
+	pm4125->regmap = pm4125->sdw_priv[AIF1_CAP]->regmap;
 	if (!pm4125->regmap) {
 		dev_err(dev, "could not get TX device regmap\n");
 		ret = -EINVAL;
 	pm4125->sdw_priv[AIF1_PB]->slave_irq = pm4125->virq;
 	pm4125->sdw_priv[AIF1_CAP]->slave_irq = pm4125->virq;
-	ret = pm4125_set_micbias_data(dev, pm4125);
+	pm4125_set_micbias_data(dev, pm4125);
-	if (ret < 0) {
-		dev_err(dev, "Bad micbias pdata\n");
-		goto link_remove_dev_rx;
-	}
 	ret = snd_soc_register_component(dev, &soc_codec_dev_pm4125,
 					 pm4125_dais, ARRAY_SIZE(pm4125_dais));
 	device_link_remove(dev, pm4125->txdev);
 link_remove_rx_tx:
 	device_link_remove(pm4125->rxdev, pm4125->txdev);
+error_put_tx:
+	put_device(pm4125->txdev);
+error_put_rx:
+	put_device(pm4125->rxdev);
 error_unbind_all:
 	component_unbind_all(dev, pm4125);
 	return ret;
 	struct pm4125_priv *pm4125 = dev_get_drvdata(dev);
 	snd_soc_unregister_component(dev);
+	devm_regmap_del_irq_chip(dev, irq_find_mapping(pm4125->virq, 0),
+				 pm4125->irq_chip);
 	device_link_remove(dev, pm4125->txdev);
 	device_link_remove(dev, pm4125->rxdev);
 	device_link_remove(pm4125->rxdev, pm4125->txdev);
+	/* Release device references acquired in bind */
+	if (pm4125->txdev)
+		put_device(pm4125->txdev);
+	if (pm4125->rxdev)
+		put_device(pm4125->rxdev);
 	component_unbind_all(dev, pm4125);
 }
 {
 	struct component_match *match = NULL;
 	struct device *dev = &pdev->dev;
+	struct regmap_irq_chip *chip_desc;
 	struct pm4125_priv *pm4125;
 	struct wcd_mbhc_config *cfg;
 	int ret;
 	dev_set_drvdata(dev, pm4125);
+	chip_desc = devm_kmemdup(dev, &pm4125_regmap_irq_chip,
+				 sizeof(pm4125_regmap_irq_chip),
+				 GFP_KERNEL);
+	if (!chip_desc)
+		return -ENOMEM;
+	chip_desc->irq_drv_data = pm4125;
+	pm4125->chip_desc = chip_desc;
 	ret = devm_regulator_bulk_get_enable(dev, ARRAY_SIZE(pm4125_power_supplies),
 					     pm4125_power_supplies);
 	if (ret)
 	pm4125_reset(pm4125);
-	pm4125_dt_parse_micbias_info(dev, pm4125);
+	pm4125->common.dev = dev;
+	pm4125->common.max_bias = 3;
+	ret = wcd_dt_parse_micbias_info(&pm4125->common);
+	if (ret)
+		return dev_err_probe(dev, ret, "Failed to get micbias\n");
 	atomic_set(&pm4125->gloal_mbias_cnt, 0);
 	cfg = &pm4125->mbhc_cfg;
 	cfg->anc_micbias = MIC_BIAS_2;
 	cfg->v_hs_max = WCD_MBHC_HS_V_MAX;
 	cfg->num_btn = PM4125_MBHC_MAX_BUTTONS;
-	cfg->micb_mv = pm4125->micb2_mv;
+	cfg->micb_mv = pm4125->common.micb_mv[1];
 	cfg->linein_th = 5000;
 	cfg->hs_thr = 1700;
 	cfg->hph_thr = 50;

sound/soc/codecs/pm4125.h+2−16

 #include <linux/soundwire/sdw.h>
 #include <linux/soundwire/sdw_type.h>
+#include "wcd-common.h"
 #define PM4125_ANA_BASE_ADDR			0x3000
 #define PM4125_DIG_BASE_ADDR			0x3400
 	PM4125_MAX_SWR_PORTS = PM4125_COMP_PORT,
 };
-struct pm4125_sdw_ch_info {
-	int port_num;
-	unsigned int ch_mask;
-	unsigned int master_ch_mask;
-};
-#define WCD_SDW_CH(id, pn, cmask)		\
-	[id] = {				\
-		.port_num = pn,			\
-		.ch_mask = cmask,		\
-		.master_ch_mask = cmask,	\
-	}
 struct pm4125_priv;
 struct pm4125_sdw_priv {
 	struct sdw_slave *sdev;
 	struct sdw_stream_config sconfig;
 	struct sdw_stream_runtime *sruntime;
 	struct sdw_port_config port_config[PM4125_MAX_SWR_PORTS];
-	struct pm4125_sdw_ch_info *ch_info;
+	struct wcd_sdw_ch_info *ch_info;
 	bool port_enable[PM4125_MAX_SWR_CH_IDS];
 	unsigned int master_channel_map[SDW_MAX_PORTS];
 	int active_ports;
 int pm4125_sdw_hw_params(struct pm4125_sdw_priv *pm4125, struct snd_pcm_substream *substream,
 			 struct snd_pcm_hw_params *params, struct snd_soc_dai *dai);
-struct device *pm4125_sdw_device_get(struct device_node *np);
 #else
 static inline int pm4125_sdw_free(struct pm4125_sdw_priv *pm4125,
 				  struct snd_pcm_substream *substream, struct snd_soc_dai *dai)

sound/soc/codecs/rk3308_codec.c+2−1

 				       enum snd_soc_bias_level level)
 {
 	struct rk3308_codec_priv *rk3308 = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	switch (level) {
 	case SND_SOC_BIAS_ON:
 	case SND_SOC_BIAS_PREPARE:
 		break;
 	case SND_SOC_BIAS_STANDBY:
-		if (snd_soc_component_get_bias_level(component) != SND_SOC_BIAS_OFF)
+		if (snd_soc_dapm_get_bias_level(dapm) != SND_SOC_BIAS_OFF)
 			break;
 		/* Sequence from TRM Section 8.6.3 "Power Up" */

sound/soc/codecs/rt1011.c+15−21

 static int rt1011_recv_spk_mode_get(struct snd_kcontrol *kcontrol,
 		struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-		snd_soc_kcontrol_component(kcontrol);
 	struct rt1011_priv *rt1011 =
 		snd_soc_component_get_drvdata(component);
 static int rt1011_recv_spk_mode_put(struct snd_kcontrol *kcontrol,
 		struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-		snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol);
 	struct rt1011_priv *rt1011 =
 		snd_soc_component_get_drvdata(component);
 	if (ucontrol->value.integer.value[0] == rt1011->recv_spk_mode)
 		return 0;
-	if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
+	if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) {
 		rt1011->recv_spk_mode = ucontrol->value.integer.value[0];
 		if (rt1011->recv_spk_mode) {
 static int rt1011_bq_drc_coeff_get(struct snd_kcontrol *kcontrol,
 					struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-		snd_soc_kcontrol_component(kcontrol);
 	struct rt1011_priv *rt1011 =
 		snd_soc_component_get_drvdata(component);
 	struct rt1011_bq_drc_params *bq_drc_info;
 static int rt1011_bq_drc_coeff_put(struct snd_kcontrol *kcontrol,
 					struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-		snd_soc_kcontrol_component(kcontrol);
 	struct rt1011_priv *rt1011 =
 		snd_soc_component_get_drvdata(component);
 	struct rt1011_bq_drc_params *bq_drc_info;
 		struct snd_ctl_elem_value *ucontrol)
 {
 	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	struct rt1011_priv *rt1011 = snd_soc_component_get_drvdata(component);
 	rt1011->cali_done = 0;
-	if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF &&
+	if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF &&
 		ucontrol->value.integer.value[0])
 		rt1011_calibrate(rt1011, 1);
 		struct snd_ctl_elem_value *ucontrol)
 {
 	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	struct rt1011_priv *rt1011 = snd_soc_component_get_drvdata(component);
 	struct device *dev;
 	unsigned int r0_integer, r0_factor, format;
 		return -EINVAL;
 	dev = regmap_get_device(rt1011->regmap);
-	if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
+	if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) {
 		rt1011->r0_reg = ucontrol->value.integer.value[0];
 		format = 2147483648U; /* 2^24 * 128 */
 static int rt1011_i2s_ref_put(struct snd_kcontrol *kcontrol,
 		struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-		snd_soc_kcontrol_component(kcontrol);
 	struct rt1011_priv *rt1011 =
 		snd_soc_component_get_drvdata(component);
 static int rt1011_i2s_ref_get(struct snd_kcontrol *kcontrol,
 		struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-		snd_soc_kcontrol_component(kcontrol);
 	struct rt1011_priv *rt1011 =
 		snd_soc_component_get_drvdata(component);
 static int rt1011_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
 {
 	struct snd_soc_component *component = dai->component;
-	struct snd_soc_dapm_context *dapm =
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
-		snd_soc_component_get_dapm(component);
 	unsigned int reg_val = 0, reg_bclk_inv = 0;
 	int ret = 0;
 	unsigned int tx_mask, unsigned int rx_mask, int slots, int slot_width)
 {
 	struct snd_soc_component *component = dai->component;
-	struct snd_soc_dapm_context *dapm =
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
-		snd_soc_component_get_dapm(component);
 	unsigned int val = 0, tdm_en = 0, rx_slotnum, tx_slotnum;
 	int ret = 0, first_bit, last_bit;
 	unsigned int dc_offset;
 	unsigned int r0_integer, r0_factor, format;
 	struct device *dev = regmap_get_device(rt1011->regmap);
-	struct snd_soc_dapm_context *dapm =
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(rt1011->component);
-		snd_soc_component_get_dapm(rt1011->component);
 	int ret = 0;
 	snd_soc_dapm_mutex_lock(dapm);

sound/soc/codecs/rt1015.c+7−10

 static int rt1015_boost_mode_get(struct snd_kcontrol *kcontrol,
 		struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-		snd_soc_kcontrol_component(kcontrol);
 	struct rt1015_priv *rt1015 =
 		snd_soc_component_get_drvdata(component);
 static int rt1015_boost_mode_put(struct snd_kcontrol *kcontrol,
 		struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-		snd_soc_kcontrol_component(kcontrol);
 	struct rt1015_priv *rt1015 =
 		snd_soc_component_get_drvdata(component);
 	int boost_mode = ucontrol->value.integer.value[0];
 static int rt1015_bypass_boost_get(struct snd_kcontrol *kcontrol,
 		struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-		snd_soc_kcontrol_component(kcontrol);
 	struct rt1015_priv *rt1015 =
 		snd_soc_component_get_drvdata(component);
 static void rt1015_calibrate(struct rt1015_priv *rt1015)
 {
 	struct snd_soc_component *component = rt1015->component;
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	struct regmap *regmap = rt1015->regmap;
-	snd_soc_dapm_mutex_lock(&component->dapm);
+	snd_soc_dapm_mutex_lock(dapm);
 	regcache_cache_bypass(regmap, true);
 	regmap_write(regmap, RT1015_CLK_DET, 0x0000);
 	regcache_cache_bypass(regmap, false);
 	regcache_mark_dirty(regmap);
 	regcache_sync(regmap);
-	snd_soc_dapm_mutex_unlock(&component->dapm);
+	snd_soc_dapm_mutex_unlock(dapm);
 }
 static int rt1015_bypass_boost_put(struct snd_kcontrol *kcontrol,
 		struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-		snd_soc_kcontrol_component(kcontrol);
 	struct rt1015_priv *rt1015 =
 		snd_soc_component_get_drvdata(component);

sound/soc/codecs/rt1318.c+2−2

@@ -505,7 +505,7 @@ static int rt1318_dac_event(struct snd_soc_dapm_widget *w, · 504 unmodified lines
505	static int rt1318_dvol_put(struct snd_kcontrol *kcontrol,	505	static int rt1318_dvol_put(struct snd_kcontrol *kcontrol,
506	struct snd_ctl_elem_value *ucontrol)	506	struct snd_ctl_elem_value *ucontrol)
507	{	507	{
508	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	508	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
509	struct rt1318_priv *rt1318 = snd_soc_component_get_drvdata(component);	509	struct rt1318_priv *rt1318 = snd_soc_component_get_drvdata(component);
510		510
511	rt1318->rt1318_dvol = ucontrol->value.integer.value[0];	511	rt1318->rt1318_dvol = ucontrol->value.integer.value[0];
@@ -528,7 +528,7 @@ static int rt1318_dvol_put(struct snd_kcontrol *kcontrol, · 16 unmodified lines
528	static int rt1318_dvol_get(struct snd_kcontrol *kcontrol,	528	static int rt1318_dvol_get(struct snd_kcontrol *kcontrol,
529	struct snd_ctl_elem_value *ucontrol)	529	struct snd_ctl_elem_value *ucontrol)
530	{	530	{
531	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	531	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
532	struct rt1318_priv *rt1318 = snd_soc_component_get_drvdata(component);	532	struct rt1318_priv *rt1318 = snd_soc_component_get_drvdata(component);
533		533
534	ucontrol->value.integer.value[0] = rt1318->rt1318_dvol;	534	ucontrol->value.integer.value[0] = rt1318->rt1318_dvol;

sound/soc/codecs/rt274.c+3−2

 static int rt274_set_bias_level(struct snd_soc_component *component,
 				 enum snd_soc_bias_level level)
 {
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	switch (level) {
 	case SND_SOC_BIAS_PREPARE:
-		if (SND_SOC_BIAS_STANDBY ==
+		if (SND_SOC_BIAS_STANDBY == snd_soc_dapm_get_bias_level(dapm)) {
-			snd_soc_component_get_bias_level(component)) {
 			snd_soc_component_write(component,
 				RT274_SET_AUDIO_POWER, AC_PWRST_D0);
 		}

sound/soc/codecs/rt286.c+5−3

 	if (!rt286->component)
 		return -EINVAL;
-	dapm = snd_soc_component_get_dapm(rt286->component);
+	dapm = snd_soc_component_to_dapm(rt286->component);
 	if (rt286->pdata.cbj_en) {
 		regmap_read(rt286->regmap, RT286_GET_HP_SENSE, &buf);
 static int rt286_mic_detect(struct snd_soc_component *component,
 			    struct snd_soc_jack *jack, void *data)
 {
-	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	struct rt286_priv *rt286 = snd_soc_component_get_drvdata(component);
 	rt286->jack = jack;
 static int rt286_set_bias_level(struct snd_soc_component *component,
 				 enum snd_soc_bias_level level)
 {
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	switch (level) {
 	case SND_SOC_BIAS_PREPARE:
-		if (SND_SOC_BIAS_STANDBY == snd_soc_component_get_bias_level(component)) {
+		if (SND_SOC_BIAS_STANDBY == snd_soc_dapm_get_bias_level(dapm)) {
 			snd_soc_component_write(component,
 				RT286_SET_AUDIO_POWER, AC_PWRST_D0);
 			snd_soc_component_update_bits(component,

sound/soc/codecs/rt298.c+5−4

 	if (!rt298->component)
 		return -EINVAL;
-	dapm = snd_soc_component_get_dapm(rt298->component);
+	dapm = snd_soc_component_to_dapm(rt298->component);
 	if (rt298->pdata.cbj_en) {
 		regmap_read(rt298->regmap, RT298_GET_HP_SENSE, &buf);
 static int rt298_mic_detect(struct snd_soc_component *component,
 			    struct snd_soc_jack *jack, void *data)
 {
-	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	struct rt298_priv *rt298 = snd_soc_component_get_drvdata(component);
 	rt298->jack = jack;
 static int rt298_set_bias_level(struct snd_soc_component *component,
 				 enum snd_soc_bias_level level)
 {
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	switch (level) {
 	case SND_SOC_BIAS_PREPARE:
-		if (SND_SOC_BIAS_STANDBY ==
+		if (SND_SOC_BIAS_STANDBY == snd_soc_dapm_get_bias_level(dapm)) {
-			snd_soc_component_get_bias_level(component)) {
 			snd_soc_component_write(component,
 				RT298_SET_AUDIO_POWER, AC_PWRST_D0);
 			snd_soc_component_update_bits(component, 0x0d, 0x200, 0x200);

sound/soc/codecs/rt5514.c+5−3

 		struct snd_ctl_elem_value *ucontrol)
 {
 	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	struct rt5514_priv *rt5514 = snd_soc_component_get_drvdata(component);
 	const struct firmware *fw = NULL;
 	u8 buf[8];
 	if (ucontrol->value.integer.value[0] == rt5514->dsp_enabled)
 		return 0;
-	if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
+	if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) {
 		rt5514->dsp_enabled = ucontrol->value.integer.value[0];
 		if (rt5514->dsp_enabled) {
 			enum snd_soc_bias_level level)
 {
 	struct rt5514_priv *rt5514 = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	int ret;
 	switch (level) {
 	case SND_SOC_BIAS_PREPARE:
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_ON) {
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_ON) {
 			clk_disable_unprepare(rt5514->mclk);
 		} else {
 			ret = clk_prepare_enable(rt5514->mclk);
 		break;
 	case SND_SOC_BIAS_STANDBY:
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) {
 			/*
 			 * If the DSP is enabled in start of recording, the DSP
 			 * should be disabled, and sync back to normal recording

sound/soc/codecs/rt5616.c+3−2

 				 enum snd_soc_bias_level level)
 {
 	struct rt5616_priv *rt5616 = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	int ret;
 	switch (level) {
 		 * away from ON. Disable the clock in that case, otherwise
 		 * enable it.
 		 */
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_ON) {
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_ON) {
 			clk_disable_unprepare(rt5616->mclk);
 		} else {
 			ret = clk_prepare_enable(rt5616->mclk);
 		break;
 	case SND_SOC_BIAS_STANDBY:
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) {
 			snd_soc_component_update_bits(component, RT5616_PWR_ANLG1,
 					    RT5616_PWR_VREF1 | RT5616_PWR_MB |
 					    RT5616_PWR_BG | RT5616_PWR_VREF2,

sound/soc/codecs/rt5631.c+6−4

 static int rt5631_dmic_get(struct snd_kcontrol *kcontrol,
 		struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct rt5631_priv *rt5631 = snd_soc_component_get_drvdata(component);
 	ucontrol->value.integer.value[0] = rt5631->dmic_used_flag;
 static int rt5631_dmic_put(struct snd_kcontrol *kcontrol,
 		struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct rt5631_priv *rt5631 = snd_soc_component_get_drvdata(component);
 	rt5631->dmic_used_flag = ucontrol->value.integer.value[0];
 			enum snd_soc_bias_level level)
 {
 	struct rt5631_priv *rt5631 = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	switch (level) {
 	case SND_SOC_BIAS_ON:
 		break;
 	case SND_SOC_BIAS_STANDBY:
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) {
 			snd_soc_component_update_bits(component, RT5631_PWR_MANAG_ADD3,
 				RT5631_PWR_VREF | RT5631_PWR_MAIN_BIAS,
 				RT5631_PWR_VREF | RT5631_PWR_MAIN_BIAS);
 static int rt5631_probe(struct snd_soc_component *component)
 {
 	struct rt5631_priv *rt5631 = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	unsigned int val;
 	val = rt5631_read_index(component, RT5631_ADDA_MIXER_INTL_REG3);
 			RT5631_DMIC_R_CH_LATCH_RISING);
 	}
-	snd_soc_component_init_bias_level(component, SND_SOC_BIAS_STANDBY);
+	snd_soc_dapm_init_bias_level(dapm, SND_SOC_BIAS_STANDBY);
 	return 0;
 }

sound/soc/codecs/rt5640.c+10−9

 			enum snd_soc_bias_level level)
 {
 	struct rt5640_priv *rt5640 = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	int ret;
 	switch (level) {
 		 * away from ON. Disable the clock in that case, otherwise
 		 * enable it.
 		 */
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_ON) {
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_ON) {
 			clk_disable_unprepare(rt5640->mclk);
 		} else {
 			ret = clk_prepare_enable(rt5640->mclk);
 		break;
 	case SND_SOC_BIAS_STANDBY:
-		if (SND_SOC_BIAS_OFF == snd_soc_component_get_bias_level(component)) {
+		if (SND_SOC_BIAS_OFF == snd_soc_dapm_get_bias_level(dapm)) {
 			snd_soc_component_update_bits(component, RT5640_PWR_ANLG1,
 				RT5640_PWR_VREF1 | RT5640_PWR_MB |
 				RT5640_PWR_BG | RT5640_PWR_VREF2,
 void rt5640_enable_micbias1_for_ovcd(struct snd_soc_component *component)
 {
-	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	struct rt5640_priv *rt5640 = snd_soc_component_get_drvdata(component);
 	snd_soc_dapm_mutex_lock(dapm);
 void rt5640_disable_micbias1_for_ovcd(struct snd_soc_component *component)
 {
-	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	struct rt5640_priv *rt5640 = snd_soc_component_get_drvdata(component);
 	snd_soc_dapm_mutex_lock(dapm);
 	struct snd_soc_component *component, struct snd_soc_jack *jack)
 {
 	struct rt5640_priv *rt5640 = snd_soc_component_get_drvdata(component);
-	struct snd_soc_dapm_context *dapm =
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
-		snd_soc_component_get_dapm(component);
 	int ret;
 	/* Select JD1 for Mic */
 static int rt5640_probe(struct snd_soc_component *component)
 {
-	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	struct rt5640_priv *rt5640 = snd_soc_component_get_drvdata(component);
 	u32 dmic1_data_pin = 0;
 	u32 dmic2_data_pin = 0;
 	rt5640->component = component;
-	snd_soc_component_force_bias_level(component, SND_SOC_BIAS_OFF);
+	snd_soc_dapm_force_bias_level(dapm, SND_SOC_BIAS_OFF);
 	snd_soc_component_update_bits(component, RT5640_GCTL1, 0x0301, 0x0301);
 	snd_soc_component_update_bits(component, RT5640_MICBIAS, 0x0030, 0x0030);
 static int rt5640_suspend(struct snd_soc_component *component)
 {
 	struct rt5640_priv *rt5640 = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	if (rt5640->jack) {
 		/* disable jack interrupts during system suspend */
 		cancel_delayed_work_sync(&rt5640->bp_work);
 	}
-	snd_soc_component_force_bias_level(component, SND_SOC_BIAS_OFF);
+	snd_soc_dapm_force_bias_level(dapm, SND_SOC_BIAS_OFF);
 	rt5640_reset(component);
 	regcache_cache_only(rt5640->regmap, true);
 	regcache_mark_dirty(rt5640->regmap);

sound/soc/codecs/rt5645.c+8−7

 			enum snd_soc_bias_level level)
 {
 	struct rt5645_priv *rt5645 = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	switch (level) {
 	case SND_SOC_BIAS_PREPARE:
-		if (SND_SOC_BIAS_STANDBY == snd_soc_component_get_bias_level(component)) {
+		if (SND_SOC_BIAS_STANDBY == snd_soc_dapm_get_bias_level(dapm)) {
 			snd_soc_component_update_bits(component, RT5645_PWR_ANLG1,
 				RT5645_PWR_VREF1 | RT5645_PWR_MB |
 				RT5645_PWR_BG | RT5645_PWR_VREF2,
 		snd_soc_component_update_bits(component, RT5645_PWR_ANLG1,
 			RT5645_PWR_FV1 | RT5645_PWR_FV2,
 			RT5645_PWR_FV1 | RT5645_PWR_FV2);
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) {
 			snd_soc_component_write(component, RT5645_DEPOP_M2, 0x1140);
 			msleep(40);
 			if (rt5645->en_button_func)
 static void rt5645_enable_push_button_irq(struct snd_soc_component *component,
 	bool enable)
 {
-	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	int ret;
 	if (enable) {
 static int rt5645_jack_detect(struct snd_soc_component *component, int jack_insert)
 {
-	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	struct rt5645_priv *rt5645 = snd_soc_component_get_drvdata(component);
 	unsigned int val;
 		snd_soc_dapm_force_enable_pin(dapm, "LDO2");
 		snd_soc_dapm_force_enable_pin(dapm, "Mic Det Power");
 		snd_soc_dapm_sync(dapm);
-		if (!snd_soc_card_is_instantiated(dapm->card)) {
+		if (!snd_soc_card_is_instantiated(component->card)) {
 			/* Power up necessary bits for JD if dapm is
 			   not ready yet */
 			regmap_update_bits(rt5645->regmap, RT5645_PWR_ANLG1,
 static int rt5645_probe(struct snd_soc_component *component)
 {
-	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	struct rt5645_priv *rt5645 = snd_soc_component_get_drvdata(component);
 	rt5645->component = component;
 		break;
 	}
-	snd_soc_component_force_bias_level(component, SND_SOC_BIAS_OFF);
+	snd_soc_dapm_force_bias_level(dapm, SND_SOC_BIAS_OFF);
 	/* for JD function */
 	if (rt5645->pdata.jd_mode) {

sound/soc/codecs/rt5651.c+8−5

 static int rt5651_set_bias_level(struct snd_soc_component *component,
 			enum snd_soc_bias_level level)
 {
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	switch (level) {
 	case SND_SOC_BIAS_PREPARE:
-		if (SND_SOC_BIAS_STANDBY == snd_soc_component_get_bias_level(component)) {
+		if (SND_SOC_BIAS_STANDBY == snd_soc_dapm_get_bias_level(dapm)) {
 			if (snd_soc_component_read(component, RT5651_PLL_MODE_1) & 0x9200)
 				snd_soc_component_update_bits(component, RT5651_D_MISC,
 						    0xc00, 0xc00);
 		}
 		break;
 	case SND_SOC_BIAS_STANDBY:
-		if (SND_SOC_BIAS_OFF == snd_soc_component_get_bias_level(component)) {
+		if (SND_SOC_BIAS_OFF == snd_soc_dapm_get_bias_level(dapm)) {
 			snd_soc_component_update_bits(component, RT5651_PWR_ANLG1,
 				RT5651_PWR_VREF1 | RT5651_PWR_MB |
 				RT5651_PWR_BG | RT5651_PWR_VREF2,
 static void rt5651_enable_micbias1_for_ovcd(struct snd_soc_component *component)
 {
-	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	snd_soc_dapm_mutex_lock(dapm);
 	snd_soc_dapm_force_enable_pin_unlocked(dapm, "LDO");
 static void rt5651_disable_micbias1_for_ovcd(struct snd_soc_component *component)
 {
-	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	snd_soc_dapm_mutex_lock(dapm);
 	snd_soc_dapm_disable_pin_unlocked(dapm, "Platform Clock");
 static int rt5651_probe(struct snd_soc_component *component)
 {
 	struct rt5651_priv *rt5651 = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	rt5651->component = component;
 	snd_soc_component_update_bits(component, RT5651_PWR_ANLG1,
 		RT5651_PWR_LDO_DVO_MASK, RT5651_PWR_LDO_DVO_1_2V);
-	snd_soc_component_force_bias_level(component, SND_SOC_BIAS_OFF);
+	snd_soc_dapm_force_bias_level(dapm, SND_SOC_BIAS_OFF);
 	rt5651_apply_properties(component);

sound/soc/codecs/rt5659.c+6−7

 static int rt5659_hp_vol_put(struct snd_kcontrol *kcontrol,
 		struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	int ret = snd_soc_put_volsw(kcontrol, ucontrol);
 	if (snd_soc_component_read(component, RT5659_STO_NG2_CTRL_1) & RT5659_NG2_EN) {
 static void rt5659_enable_push_button_irq(struct snd_soc_component *component,
 	bool enable)
 {
-	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	if (enable) {
 		snd_soc_component_write(component, RT5659_4BTN_IL_CMD_1, 0x000b);
 static int rt5659_headset_detect(struct snd_soc_component *component, int jack_insert)
 {
-	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	int val, i = 0, sleep_time[5] = {300, 150, 100, 50, 30};
 	int reg_63;
 static int rt5659_set_bias_level(struct snd_soc_component *component,
 			enum snd_soc_bias_level level)
 {
-	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	struct rt5659_priv *rt5659 = snd_soc_component_get_drvdata(component);
 	int ret;
 		break;
 	case SND_SOC_BIAS_STANDBY:
-		if (dapm->bias_level == SND_SOC_BIAS_OFF) {
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) {
 			ret = clk_prepare_enable(rt5659->mclk);
 			if (ret) {
 				dev_err(component->dev,
 static int rt5659_probe(struct snd_soc_component *component)
 {
-	struct snd_soc_dapm_context *dapm =
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
-		snd_soc_component_get_dapm(component);
 	struct rt5659_priv *rt5659 = snd_soc_component_get_drvdata(component);
 	rt5659->component = component;

sound/soc/codecs/rt5660.c+3−2

 			enum snd_soc_bias_level level)
 {
 	struct rt5660_priv *rt5660 = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	int ret;
 	switch (level) {
 		snd_soc_component_update_bits(component, RT5660_GEN_CTRL1,
 			RT5660_DIG_GATE_CTRL, RT5660_DIG_GATE_CTRL);
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_ON) {
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_ON) {
 			clk_disable_unprepare(rt5660->mclk);
 		} else {
 			ret = clk_prepare_enable(rt5660->mclk);
 		break;
 	case SND_SOC_BIAS_STANDBY:
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF) {
 			snd_soc_component_update_bits(component, RT5660_PWR_ANLG1,
 				RT5660_PWR_VREF1 | RT5660_PWR_MB |
 				RT5660_PWR_BG | RT5660_PWR_VREF2,

sound/soc/codecs/rt5663.c+5−5

@@ -1463,7 +1463,7 @@ static void rt5663_enable_push_button_irq(struct snd_soc_component *component, · 1462 unmodified lines
1463		1463
1464	static int rt5663_v2_jack_detect(struct snd_soc_component *component, int jack_insert)	1464	static int rt5663_v2_jack_detect(struct snd_soc_component *component, int jack_insert)
1465	{	1465	{
1466	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	1466	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
1467	struct rt5663_priv *rt5663 = snd_soc_component_get_drvdata(component);	1467	struct rt5663_priv *rt5663 = snd_soc_component_get_drvdata(component);
1468	int val, i = 0, sleep_time[5] = {300, 150, 100, 50, 30};	1468	int val, i = 0, sleep_time[5] = {300, 150, 100, 50, 30};
1469		1469
@@ -1859,7 +1859,7 @@ static irqreturn_t rt5663_irq(int irq, void *data) · 389 unmodified lines
1859	dev_dbg(regmap_get_device(rt5663->regmap), "%s IRQ queue work\n",	1859	dev_dbg(regmap_get_device(rt5663->regmap), "%s IRQ queue work\n",
1860	__func__);	1860	__func__);
1861		1861
1862	queue_delayed_work(system_wq, &rt5663->jack_detect_work,	1862	queue_delayed_work(system_dfl_wq, &rt5663->jack_detect_work,
1863	msecs_to_jiffies(250));	1863	msecs_to_jiffies(250));
1864		1864
1865	return IRQ_HANDLED;	1865	return IRQ_HANDLED;
@@ -1974,7 +1974,7 @@ static void rt5663_jack_detect_work(struct work_struct *work) · 108 unmodified lines
1974	cancel_delayed_work_sync(	1974	cancel_delayed_work_sync(
1975	&rt5663->jd_unplug_work);	1975	&rt5663->jd_unplug_work);
1976	} else {	1976	} else {
1977	queue_delayed_work(system_wq,	1977	queue_delayed_work(system_dfl_wq,
1978	&rt5663->jd_unplug_work,	1978	&rt5663->jd_unplug_work,
1979	msecs_to_jiffies(500));	1979	msecs_to_jiffies(500));
1980	}	1980	}
@@ -2024,7 +2024,7 @@ static void rt5663_jd_unplug_work(struct work_struct *work) · 43 unmodified lines
2024	SND_JACK_BTN_0 \| SND_JACK_BTN_1 \|	2024	SND_JACK_BTN_0 \| SND_JACK_BTN_1 \|
2025	SND_JACK_BTN_2 \| SND_JACK_BTN_3);	2025	SND_JACK_BTN_2 \| SND_JACK_BTN_3);
2026	} else {	2026	} else {
2027	queue_delayed_work(system_wq, &rt5663->jd_unplug_work,	2027	queue_delayed_work(system_dfl_wq, &rt5663->jd_unplug_work,
2028	msecs_to_jiffies(500));	2028	msecs_to_jiffies(500));
2029	}	2029	}
2030	}	2030	}
@@ -3140,7 +3140,7 @@ static int rt5663_set_bias_level(struct snd_soc_component *component, · 1109 unmodified lines
3140		3140
3141	static int rt5663_probe(struct snd_soc_component *component)	3141	static int rt5663_probe(struct snd_soc_component *component)
3142	{	3142	{
3143	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	3143	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
3144	struct rt5663_priv *rt5663 = snd_soc_component_get_drvdata(component);	3144	struct rt5663_priv *rt5663 = snd_soc_component_get_drvdata(component);
3145		3145
3146	rt5663->component = component;	3146	rt5663->component = component;

sound/soc/codecs/rt5665.c+3−3

sound/soc/codecs/rt5668.c+1−2

@@ -853,8 +853,7 @@ static int rt5668_headset_detect(struct snd_soc_component *component, · 852 unmodified lines
853	int jack_insert)	853	int jack_insert)
854	{	854	{
855	struct rt5668_priv *rt5668 = snd_soc_component_get_drvdata(component);	855	struct rt5668_priv *rt5668 = snd_soc_component_get_drvdata(component);
856	struct snd_soc_dapm_context *dapm =	856	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
857	snd_soc_component_get_dapm(component);
858	unsigned int val, count;	857	unsigned int val, count;
859		858
860	if (jack_insert) {	859	if (jack_insert) {

sound/soc/codecs/rt5670.c+24−19

@@ -431,7 +431,7 @@ static bool rt5670_readable_register(struct device *dev, unsigned int reg) · 430 unmodified lines
431	static int rt5670_headset_detect(struct snd_soc_component *component, int jack_insert)	431	static int rt5670_headset_detect(struct snd_soc_component *component, int jack_insert)
432	{	432	{
433	int val;	433	int val;
434	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	434	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
435	struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component);	435	struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component);
436		436
437	if (jack_insert) {	437	if (jack_insert) {
@@ -652,7 +652,7 @@ static void rt5670_update_ad_da_mixer_dac1_m_bits(struct rt5670_priv *rt5670) · 214 unmodified lines
652	static int rt5670_dac1_playback_switch_get(struct snd_kcontrol *kcontrol,	652	static int rt5670_dac1_playback_switch_get(struct snd_kcontrol *kcontrol,
653	struct snd_ctl_elem_value *ucontrol)	653	struct snd_ctl_elem_value *ucontrol)
654	{	654	{
655	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	655	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
656	struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component);	656	struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component);
657		657
658	ucontrol->value.integer.value[0] = rt5670->dac1_playback_switch_l;	658	ucontrol->value.integer.value[0] = rt5670->dac1_playback_switch_l;
@@ -664,7 +664,7 @@ static int rt5670_dac1_playback_switch_get(struct snd_kcontrol *kcontrol, · 5 unmodified lines
664	static int rt5670_dac1_playback_switch_put(struct snd_kcontrol *kcontrol,	664	static int rt5670_dac1_playback_switch_put(struct snd_kcontrol *kcontrol,
665	struct snd_ctl_elem_value *ucontrol)	665	struct snd_ctl_elem_value *ucontrol)
666	{	666	{
667	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	667	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
668	struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component);	668	struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component);
669		669
670	if (rt5670->dac1_playback_switch_l == ucontrol->value.integer.value[0] &&	670	if (rt5670->dac1_playback_switch_l == ucontrol->value.integer.value[0] &&
@@ -966,7 +966,7 @@ static int rt5670_put_dac1_mix_dac1_switch(struct snd_kcontrol *kcontrol, · 295 unmodified lines
966	struct snd_ctl_elem_value *ucontrol)	966	struct snd_ctl_elem_value *ucontrol)
967	{	967	{
968	struct soc_mixer_control mc = (struct soc_mixer_control )kcontrol->private_value;	968	struct soc_mixer_control mc = (struct soc_mixer_control )kcontrol->private_value;
969	struct snd_soc_component *component = snd_soc_dapm_kcontrol_component(kcontrol);	969	struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol);
970	struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component);	970	struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component);
971	int ret;	971	int ret;
972		972
@@ -1153,25 +1153,29 @@ static SOC_ENUM_SINGLE_DECL(rt5670_dac1r_enum, RT5670_AD_DA_MIXER, · 180 unmodified lines
1153	static const struct snd_kcontrol_new rt5670_dac1r_mux =	1153	static const struct snd_kcontrol_new rt5670_dac1r_mux =
1154	SOC_DAPM_ENUM("DAC1 R source", rt5670_dac1r_enum);	1154	SOC_DAPM_ENUM("DAC1 R source", rt5670_dac1r_enum);
1155		1155
1156	/DAC2 L/R source/ /* MX-1B [6:4] [2:0] */	1156	/* DAC2 L source/ / MX-1B [6:4] */
1157	/* TODO Use SOC_VALUE_ENUM_SINGLE_DECL */	1157	static const char *const rt5670_dac12_src[] = {
1158	static const char * const rt5670_dac12_src[] = {	1158	"IF1 DAC", "IF2 DAC", "TxDC DAC", "VAD_ADC"
1159	"IF1 DAC", "IF2 DAC", "IF3 DAC", "TxDC DAC",	1159	}; /* VAD_ADC or TxDP_ADC_R */
1160	"Bass", "VAD_ADC", "IF4 DAC"	1160
1161	};	1161	static const unsigned int rt5670_dac12_values[] = { 0, 1, 3, 5 };
1162		1162
1163	static SOC_ENUM_SINGLE_DECL(rt5670_dac2l_enum, RT5670_DAC_CTRL,	1163	static SOC_VALUE_ENUM_SINGLE_DECL(rt5670_dac2l_enum, RT5670_DAC_CTRL,
1164	RT5670_DAC2_L_SEL_SFT, rt5670_dac12_src);	1164	RT5670_DAC2_L_SEL_SFT, RT5670_DAC2_L_SEL_MASK,
		1165	rt5670_dac12_src, rt5670_dac12_values);
1165		1166
1166	static const struct snd_kcontrol_new rt5670_dac_l2_mux =	1167	static const struct snd_kcontrol_new rt5670_dac_l2_mux =
1167	SOC_DAPM_ENUM("DAC2 L source", rt5670_dac2l_enum);	1168	SOC_DAPM_ENUM("DAC2 L source", rt5670_dac2l_enum);
1168		1169
1169	static const char * const rt5670_dacr2_src[] = {	1170	/DAC2 R source/ /* MX-1B [2:0] */
1170	"IF1 DAC", "IF2 DAC", "IF3 DAC", "TxDC DAC", "TxDP ADC", "IF4 DAC"	1171	static const char *const rt5670_dacr2_src[] = { "IF1 DAC", "IF2 DAC",
1171	};	1172	"TxDC DAC", "TxDP ADC" };
		1173
		1174	static const unsigned int rt5670_dacr2_values[] = { 0, 1, 3, 4 };
1172		1175
1173	static SOC_ENUM_SINGLE_DECL(rt5670_dac2r_enum, RT5670_DAC_CTRL,	1176	static SOC_VALUE_ENUM_SINGLE_DECL(rt5670_dac2r_enum, RT5670_DAC_CTRL,
1174	RT5670_DAC2_R_SEL_SFT, rt5670_dacr2_src);	1177	RT5670_DAC2_R_SEL_SFT, RT5670_DAC2_R_SEL_MASK,
		1178	rt5670_dacr2_src, rt5670_dacr2_values);
1175		1179
1176	static const struct snd_kcontrol_new rt5670_dac_r2_mux =	1180	static const struct snd_kcontrol_new rt5670_dac_r2_mux =
1177	SOC_DAPM_ENUM("DAC2 R source", rt5670_dac2r_enum);	1181	SOC_DAPM_ENUM("DAC2 R source", rt5670_dac2r_enum);
@@ -2666,10 +2670,11 @@ static int rt5670_set_bias_level(struct snd_soc_component *component, · 1488 unmodified lines
2666	enum snd_soc_bias_level level)	2670	enum snd_soc_bias_level level)
2667	{	2671	{
2668	struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component);	2672	struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component);
		2673	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
2669		2674
2670	switch (level) {	2675	switch (level) {
2671	case SND_SOC_BIAS_PREPARE:	2676	case SND_SOC_BIAS_PREPARE:
2672	if (SND_SOC_BIAS_STANDBY == snd_soc_component_get_bias_level(component)) {	2677	if (SND_SOC_BIAS_STANDBY == snd_soc_dapm_get_bias_level(dapm)) {
2673	snd_soc_component_update_bits(component, RT5670_PWR_ANLG1,	2678	snd_soc_component_update_bits(component, RT5670_PWR_ANLG1,
2674	RT5670_PWR_VREF1 \| RT5670_PWR_MB \|	2679	RT5670_PWR_VREF1 \| RT5670_PWR_MB \|
2675	RT5670_PWR_BG \| RT5670_PWR_VREF2,	2680	RT5670_PWR_BG \| RT5670_PWR_VREF2,
@@ -2719,7 +2724,7 @@ static int rt5670_set_bias_level(struct snd_soc_component *component, · 43 unmodified lines
2719		2724
2720	static int rt5670_probe(struct snd_soc_component *component)	2725	static int rt5670_probe(struct snd_soc_component *component)
2721	{	2726	{
2722	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	2727	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
2723	struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component);	2728	struct rt5670_priv *rt5670 = snd_soc_component_get_drvdata(component);
2724		2729
2725	switch (snd_soc_component_read(component, RT5670_RESET) & RT5670_ID_MASK) {	2730	switch (snd_soc_component_read(component, RT5670_RESET) & RT5670_ID_MASK) {

sound/soc/codecs/rt5677.c+7−7

 static unsigned int rt5677_set_vad_source(struct rt5677_priv *rt5677)
 {
-	struct snd_soc_dapm_context *dapm =
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(rt5677->component);
-			snd_soc_component_get_dapm(rt5677->component);
 	/* Force dapm to sync before we enable the
 	 * DSP to prevent write corruption
 	 */
 	struct snd_kcontrol *kcontrol, int event)
 {
 	struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	struct rt5677_priv *rt5677 = snd_soc_component_get_drvdata(component);
 	switch (event) {
 	case SND_SOC_DAPM_POST_PMU:
-		if (snd_soc_component_get_bias_level(component) != SND_SOC_BIAS_ON &&
+		if (snd_soc_dapm_get_bias_level(dapm) != SND_SOC_BIAS_ON &&
 			!rt5677->is_vref_slow) {
 			mdelay(20);
 			regmap_update_bits(rt5677->regmap, RT5677_PWR_ANLG1,
 			enum snd_soc_bias_level level)
 {
 	struct rt5677_priv *rt5677 = snd_soc_component_get_drvdata(component);
-	enum snd_soc_bias_level prev_bias =
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
-		snd_soc_component_get_bias_level(component);
+	enum snd_soc_bias_level prev_bias = snd_soc_dapm_get_bias_level(dapm);
 	switch (level) {
 	case SND_SOC_BIAS_ON:
 static int rt5677_probe(struct snd_soc_component *component)
 {
-	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	struct rt5677_priv *rt5677 = snd_soc_component_get_drvdata(component);
 	int i;
 			ARRAY_SIZE(rt5677_dmic2_clk_1));
 	}
-	snd_soc_component_force_bias_level(component, SND_SOC_BIAS_OFF);
+	snd_soc_dapm_force_bias_level(dapm, SND_SOC_BIAS_OFF);
 	regmap_update_bits(rt5677->regmap, RT5677_DIG_MISC,
 			~RT5677_IRQ_DEBOUNCE_SEL_MASK, 0x0020);

sound/soc/codecs/rt5682.c+5−5

 static int rt5682_headset_detect(struct snd_soc_component *component, int jack_insert)
 {
 	struct rt5682_priv *rt5682 = snd_soc_component_get_drvdata(component);
-	struct snd_soc_dapm_context *dapm = &component->dapm;
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	unsigned int val, count;
 	if (jack_insert) {
 		}
 	}
-	dapm = snd_soc_component_get_dapm(rt5682->component);
+	dapm = snd_soc_component_to_dapm(rt5682->component);
 	snd_soc_dapm_mutex_lock(dapm);
 	mutex_lock(&rt5682->calibrate_mutex);
 		return -EINVAL;
 	component = rt5682->component;
-	dapm = snd_soc_component_get_dapm(component);
+	dapm = snd_soc_component_to_dapm(component);
 	snd_soc_dapm_mutex_lock(dapm);
 		return;
 	component = rt5682->component;
-	dapm = snd_soc_component_get_dapm(component);
+	dapm = snd_soc_component_to_dapm(component);
 	snd_soc_dapm_mutex_lock(dapm);
 static int rt5682_probe(struct snd_soc_component *component)
 {
 	struct rt5682_priv *rt5682 = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	struct sdw_slave *slave;
 	unsigned long time;
-	struct snd_soc_dapm_context *dapm = &component->dapm;
 	rt5682->component = component;

sound/soc/codecs/rt5682s.c+3−2

 		return;
 	}
-	dapm = snd_soc_component_get_dapm(rt5682s->component);
+	dapm = snd_soc_component_to_dapm(rt5682s->component);
 	snd_soc_dapm_mutex_lock(dapm);
 	mutex_lock(&rt5682s->calibrate_mutex);
 		enum snd_soc_bias_level level)
 {
 	struct rt5682s_priv *rt5682s = snd_soc_component_get_drvdata(component);
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 	switch (level) {
 	case SND_SOC_BIAS_PREPARE:
 			RT5682S_PWR_LDO, RT5682S_PWR_LDO);
 		break;
 	case SND_SOC_BIAS_STANDBY:
-		if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF)
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_OFF)
 			regmap_update_bits(rt5682s->regmap, RT5682S_PWR_DIG_1,
 				RT5682S_DIG_GATE_CTRL, RT5682S_DIG_GATE_CTRL);
 		break;

sound/soc/codecs/rt700.c+11−17

 static void rt700_jack_init(struct rt700_priv *rt700)
 {
-	struct snd_soc_dapm_context *dapm =
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(rt700->component);
-		snd_soc_component_get_dapm(rt700->component);
 	/* power on */
-	if (dapm->bias_level <= SND_SOC_BIAS_STANDBY)
+	if (snd_soc_dapm_get_bias_level(dapm) <= SND_SOC_BIAS_STANDBY)
 		regmap_write(rt700->regmap,
 			RT700_SET_AUDIO_POWER_STATE, AC_PWRST_D0);
 	}
 	/* power off */
-	if (dapm->bias_level <= SND_SOC_BIAS_STANDBY)
+	if (snd_soc_dapm_get_bias_level(dapm) <= SND_SOC_BIAS_STANDBY)
 		regmap_write(rt700->regmap,
 			RT700_SET_AUDIO_POWER_STATE, AC_PWRST_D3);
 }
 		struct snd_ctl_elem_value *ucontrol)
 {
 	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-	struct snd_soc_dapm_context *dapm =
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
-		snd_soc_component_get_dapm(component);
 	struct soc_mixer_control *mc =
 		(struct soc_mixer_control *)kcontrol->private_value;
 	struct rt700_priv *rt700 = snd_soc_component_get_drvdata(component);
 		val_ll |= read_ll;
 	}
-	if (dapm->bias_level <= SND_SOC_BIAS_STANDBY)
+	if (snd_soc_dapm_get_bias_level(dapm) <= SND_SOC_BIAS_STANDBY)
 		regmap_write(rt700->regmap,
 				RT700_SET_AUDIO_POWER_STATE, AC_PWRST_D0);
 			break;
 	}
-	if (dapm->bias_level <= SND_SOC_BIAS_STANDBY)
+	if (snd_soc_dapm_get_bias_level(dapm) <= SND_SOC_BIAS_STANDBY)
 		regmap_write(rt700->regmap,
 				RT700_SET_AUDIO_POWER_STATE, AC_PWRST_D3);
 	return 0;
 static int rt700_mux_get(struct snd_kcontrol *kcontrol,
 			struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol);
-		snd_soc_dapm_kcontrol_component(kcontrol);
 	struct rt700_priv *rt700 = snd_soc_component_get_drvdata(component);
 	unsigned int reg, val = 0, nid;
 	int ret;
 static int rt700_mux_put(struct snd_kcontrol *kcontrol,
 			struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol);
-		snd_soc_dapm_kcontrol_component(kcontrol);
+	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol);
-	struct snd_soc_dapm_context *dapm =
-		snd_soc_dapm_kcontrol_dapm(kcontrol);
 	struct rt700_priv *rt700 = snd_soc_component_get_drvdata(component);
 	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
 	unsigned int *item = ucontrol->value.enumerated.item;
 static int rt700_set_bias_level(struct snd_soc_component *component,
 				enum snd_soc_bias_level level)
 {
-	struct snd_soc_dapm_context *dapm =
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
-		snd_soc_component_get_dapm(component);
 	struct rt700_priv *rt700 = snd_soc_component_get_drvdata(component);
 	switch (level) {
 	case SND_SOC_BIAS_PREPARE:
-		if (dapm->bias_level == SND_SOC_BIAS_STANDBY) {
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_STANDBY) {
 			regmap_write(rt700->regmap,
 				RT700_SET_AUDIO_POWER_STATE,
 				AC_PWRST_D0);

sound/soc/codecs/rt711-sdca.c+5−8

 			      struct snd_ctl_elem_value *ucontrol)
 {
 	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct rt711_sdca_priv *rt711 = snd_soc_component_get_drvdata(component);
 	unsigned int val, item;
 {
 	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
 	unsigned int *item = ucontrol->value.enumerated.item;
-	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
 	struct rt711_sdca_priv *rt711 = snd_soc_component_get_drvdata(component);
 	unsigned int val, change = 0;
 static int rt711_sdca_mux_get(struct snd_kcontrol *kcontrol,
 			struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol);
-		snd_soc_dapm_kcontrol_component(kcontrol);
 	struct rt711_sdca_priv *rt711 = snd_soc_component_get_drvdata(component);
 	unsigned int val = 0, mask_sft;
 static int rt711_sdca_mux_put(struct snd_kcontrol *kcontrol,
 			struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol);
-		snd_soc_dapm_kcontrol_component(kcontrol);
+	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol);
-	struct snd_soc_dapm_context *dapm =
-		snd_soc_dapm_kcontrol_dapm(kcontrol);
 	struct rt711_sdca_priv *rt711 = snd_soc_component_get_drvdata(component);
 	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
 	unsigned int *item = ucontrol->value.enumerated.item;

sound/soc/codecs/rt711.c+11−17

 static void rt711_jack_init(struct rt711_priv *rt711)
 {
-	struct snd_soc_dapm_context *dapm =
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(rt711->component);
-		snd_soc_component_get_dapm(rt711->component);
 	mutex_lock(&rt711->calibrate_mutex);
 	/* power on */
-	if (dapm->bias_level <= SND_SOC_BIAS_STANDBY)
+	if (snd_soc_dapm_get_bias_level(dapm) <= SND_SOC_BIAS_STANDBY)
 		regmap_write(rt711->regmap,
 			RT711_SET_AUDIO_POWER_STATE, AC_PWRST_D0);
 	}
 	/* power off */
-	if (dapm->bias_level <= SND_SOC_BIAS_STANDBY)
+	if (snd_soc_dapm_get_bias_level(dapm) <= SND_SOC_BIAS_STANDBY)
 		regmap_write(rt711->regmap,
 			RT711_SET_AUDIO_POWER_STATE, AC_PWRST_D3);
 	mutex_unlock(&rt711->calibrate_mutex);
 		struct snd_ctl_elem_value *ucontrol)
 {
 	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
-	struct snd_soc_dapm_context *dapm =
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
-		snd_soc_component_get_dapm(component);
 	struct soc_mixer_control *mc =
 		(struct soc_mixer_control *)kcontrol->private_value;
 	struct rt711_priv *rt711 = snd_soc_component_get_drvdata(component);
 		val_ll |= read_ll;
 	}
-	if (dapm->bias_level <= SND_SOC_BIAS_STANDBY)
+	if (snd_soc_dapm_get_bias_level(dapm) <= SND_SOC_BIAS_STANDBY)
 		regmap_write(rt711->regmap,
 				RT711_SET_AUDIO_POWER_STATE, AC_PWRST_D0);
 			break;
 	}
-	if (dapm->bias_level <= SND_SOC_BIAS_STANDBY)
+	if (snd_soc_dapm_get_bias_level(dapm) <= SND_SOC_BIAS_STANDBY)
 		regmap_write(rt711->regmap,
 				RT711_SET_AUDIO_POWER_STATE, AC_PWRST_D3);
 static int rt711_mux_get(struct snd_kcontrol *kcontrol,
 			struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol);
-		snd_soc_dapm_kcontrol_component(kcontrol);
 	struct rt711_priv *rt711 = snd_soc_component_get_drvdata(component);
 	unsigned int reg, val = 0, nid;
 	int ret;
 static int rt711_mux_put(struct snd_kcontrol *kcontrol,
 			struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol);
-		snd_soc_dapm_kcontrol_component(kcontrol);
+	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol);
-	struct snd_soc_dapm_context *dapm =
-		snd_soc_dapm_kcontrol_dapm(kcontrol);
 	struct rt711_priv *rt711 = snd_soc_component_get_drvdata(component);
 	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
 	unsigned int *item = ucontrol->value.enumerated.item;
 static int rt711_set_bias_level(struct snd_soc_component *component,
 				enum snd_soc_bias_level level)
 {
-	struct snd_soc_dapm_context *dapm =
+	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
-		snd_soc_component_get_dapm(component);
 	struct rt711_priv *rt711 = snd_soc_component_get_drvdata(component);
 	switch (level) {
 	case SND_SOC_BIAS_PREPARE:
-		if (dapm->bias_level == SND_SOC_BIAS_STANDBY) {
+		if (snd_soc_dapm_get_bias_level(dapm) == SND_SOC_BIAS_STANDBY) {
 			regmap_write(rt711->regmap,
 				RT711_SET_AUDIO_POWER_STATE,
 				AC_PWRST_D0);

sound/soc/codecs/rt712-sdca-dmic.c+3−6

 static int rt712_sdca_dmic_mux_get(struct snd_kcontrol *kcontrol,
 			struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol);
-		snd_soc_dapm_kcontrol_component(kcontrol);
 	struct rt712_sdca_dmic_priv *rt712 = snd_soc_component_get_drvdata(component);
 	unsigned int val = 0, mask_sft;
 static int rt712_sdca_dmic_mux_put(struct snd_kcontrol *kcontrol,
 			struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol);
-		snd_soc_dapm_kcontrol_component(kcontrol);
+	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol);
-	struct snd_soc_dapm_context *dapm =
-		snd_soc_dapm_kcontrol_dapm(kcontrol);
 	struct rt712_sdca_dmic_priv *rt712 = snd_soc_component_get_drvdata(component);
 	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
 	unsigned int *item = ucontrol->value.enumerated.item;

sound/soc/codecs/rt712-sdca.c+7−13

 static int rt712_sdca_mux_get(struct snd_kcontrol *kcontrol,
 			struct snd_ctl_elem_value *ucontrol)
 {
-	struct snd_soc_component *component =
+	struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol);
-		snd_soc_dapm_kcontrol_component(kcontrol);
 	struct rt712_sdca_priv *rt712 = snd_soc_component_get_drvdata(component);
 	unsigned int val = 0, mask = 0x3300;
 static int rt712_sdca_mux_put(struct snd_kcontrol *kcontrol,

43 more lines aren’t shown here.

sound/soc/codecs/rt715-sdca.c+3−6

This diff is large: its 23 lines aren’t shown here.

sound/soc/codecs/rt715.c+14−21

This diff is large: its 123 lines aren’t shown here.

sound/soc/codecs/rt721-sdca.c+3−6

This diff is large: its 23 lines aren’t shown here.

sound/soc/codecs/rt722-sdca-sdw.c+3−1

This diff is large: its 11 lines aren’t shown here.

sound/soc/codecs/rt9123.c+3−3

This diff is large: its 27 lines aren’t shown here.

sound/soc/codecs/sgtl5000.c+4−4

This diff is large: its 36 lines aren’t shown here.

sound/soc/codecs/simple-mux.c+4−3

This diff is large: its 28 lines aren’t shown here.

sound/soc/codecs/sma1303.c+11−20

This diff is large: its 108 lines aren’t shown here.

sound/soc/codecs/sma1307.c+37−58

This diff is large: its 242 lines aren’t shown here.

sound/soc/codecs/ssm2518.c+2−1

This diff is large: its 17 lines aren’t shown here.

sound/soc/codecs/ssm2602.c+2−2

This diff is large: its 18 lines aren’t shown here.

sound/soc/codecs/ssm4567.c+2−1

This diff is large: its 17 lines aren’t shown here.

sound/soc/codecs/sta32x.c+6−4

This diff is large: its 52 lines aren’t shown here.

sound/soc/codecs/sta350.c+6−4

This diff is large: its 52 lines aren’t shown here.

sound/soc/codecs/sta529.c+2−1

This diff is large: its 17 lines aren’t shown here.

sound/soc/codecs/tas2562.c+2−2

This diff is large: its 18 lines aren’t shown here.

sound/soc/codecs/tas2781-comlib-i2c.c+1−1

This diff is large: its 9 lines aren’t shown here.

sound/soc/codecs/tas2781-i2c.c+66−40

This diff is large: its 436 lines aren’t shown here.

sound/soc/codecs/tas2783-sdw.c+2−2

This diff is large: its 18 lines aren’t shown here.

sound/soc/codecs/tas5086.c+2−2

This diff is large: its 18 lines aren’t shown here.

sound/soc/codecs/tas571x.c+4−3

This diff is large: its 35 lines aren’t shown here.

sound/soc/codecs/tas5720.c+2−2

This diff is large: its 18 lines aren’t shown here.

sound/soc/codecs/tas5805m.c+2−4

This diff is large: its 20 lines aren’t shown here.

sound/soc/codecs/tas6424.c+3−1

This diff is large: its 18 lines aren’t shown here.

sound/soc/codecs/tfa989x.c+1−1

This diff is large: its 9 lines aren’t shown here.

sound/soc/codecs/tlv320adc3xxx.c+4−4

This diff is large: its 36 lines aren’t shown here.

sound/soc/codecs/tlv320adcx140.c+2−4

This diff is large: its 20 lines aren’t shown here.

sound/soc/codecs/tlv320aic23.c+2−2

This diff is large: its 18 lines aren’t shown here.

sound/soc/codecs/tlv320aic31xx.c+8−6

This diff is large: its 51 lines aren’t shown here.

sound/soc/codecs/tlv320aic32x4.c+2−1

This diff is large: its 17 lines aren’t shown here.

sound/soc/codecs/tlv320aic3x.c+6−5

This diff is large: its 45 lines aren’t shown here.

sound/soc/codecs/tlv320dac33.c+5−4

This diff is large: its 44 lines aren’t shown here.

sound/soc/codecs/tscs42xx.c+2−4

This diff is large: its 20 lines aren’t shown here.

sound/soc/codecs/tscs454.c+2−4

This diff is large: its 20 lines aren’t shown here.

sound/soc/codecs/twl4030.c+8−6

This diff is large: its 62 lines aren’t shown here.

sound/soc/codecs/twl6040.c+8−7

This diff is large: its 71 lines aren’t shown here.

sound/soc/codecs/uda1334.c+2−2

This diff is large: its 18 lines aren’t shown here.

sound/soc/codecs/uda1380.c+2−1

This diff is large: its 17 lines aren’t shown here.

sound/soc/codecs/wcd9335.c+19−15

This diff is large: its 104 lines aren’t shown here.

sound/soc/codecs/wcd934x.c+23−21

This diff is large: its 142 lines aren’t shown here.

sound/soc/codecs/wcd937x.c+43−20

This diff is large: its 191 lines aren’t shown here.

sound/soc/codecs/wcd938x.c+13−14

This diff is large: its 118 lines aren’t shown here.

sound/soc/codecs/wcd939x-sdw.c+7−1

This diff is large: its 20 lines aren’t shown here.

sound/soc/codecs/wcd939x.c+12−12

This diff is large: its 108 lines aren’t shown here.

sound/soc/codecs/wm0010.c+3−2

This diff is large: its 20 lines aren’t shown here.

sound/soc/codecs/wm2000.c+4−4

This diff is large: its 36 lines aren’t shown here.

sound/soc/codecs/wm5100.c+2−2

This diff is large: its 18 lines aren’t shown here.

sound/soc/codecs/wm5102.c+6−6

This diff is large: its 54 lines aren’t shown here.

sound/soc/codecs/wm5110.c+8−8

This diff is large: its 51 lines aren’t shown here.

sound/soc/codecs/wm8350.c+4−3

This diff is large: its 35 lines aren’t shown here.

sound/soc/codecs/wm8400.c+8−6

This diff is large: its 70 lines aren’t shown here.

sound/soc/codecs/wm8510.c+2−1

This diff is large: its 17 lines aren’t shown here.

sound/soc/codecs/wm8523.c+2−1

This diff is large: its 17 lines aren’t shown here.

sound/soc/codecs/wm8580.c+5−3

This diff is large: its 35 lines aren’t shown here.

sound/soc/codecs/wm8711.c+2−1

This diff is large: its 17 lines aren’t shown here.

sound/soc/codecs/wm8728.c+2−1

This diff is large: its 16 lines aren’t shown here.

sound/soc/codecs/wm8731.c+5−4

This diff is large: its 44 lines aren’t shown here.

sound/soc/codecs/wm8737.c+4−2

This diff is large: its 34 lines aren’t shown here.

sound/soc/codecs/wm8750.c+2−1

This diff is large: its 17 lines aren’t shown here.

sound/soc/codecs/wm8753.c+4−3

This diff is large: its 35 lines aren’t shown here.

sound/soc/codecs/wm8770.c+2−1

This diff is large: its 17 lines aren’t shown here.

sound/soc/codecs/wm8776.c+2−1

This diff is large: its 17 lines aren’t shown here.

sound/soc/codecs/wm8804.c+2−2

This diff is large: its 11 lines aren’t shown here.

sound/soc/codecs/wm8900.c+8−4

This diff is large: its 68 lines aren’t shown here.

sound/soc/codecs/wm8903.c+6−4

This diff is large: its 45 lines aren’t shown here.

sound/soc/codecs/wm8904.c+12−11

This diff is large: its 107 lines aren’t shown here.

sound/soc/codecs/wm8940.c+4−2

This diff is large: its 34 lines aren’t shown here.

sound/soc/codecs/wm8955.c+6−4

This diff is large: its 52 lines aren’t shown here.

sound/soc/codecs/wm8958-dsp2.c+16−16

This diff is large: its 144 lines aren’t shown here.

sound/soc/codecs/wm8960.c+9−7

This diff is large: its 79 lines aren’t shown here.

sound/soc/codecs/wm8961.c+3−2

This diff is large: its 26 lines aren’t shown here.

sound/soc/codecs/wm8962.c+17−13

This diff is large: its 142 lines aren’t shown here.

sound/soc/codecs/wm8971.c+2−1

This diff is large: its 17 lines aren’t shown here.

sound/soc/codecs/wm8974.c+2−1

This diff is large: its 17 lines aren’t shown here.

sound/soc/codecs/wm8978.c+6−3

This diff is large: its 42 lines aren’t shown here.

sound/soc/codecs/wm8983.c+4−3

This diff is large: its 35 lines aren’t shown here.

sound/soc/codecs/wm8985.c+5−4

This diff is large: its 44 lines aren’t shown here.

sound/soc/codecs/wm8988.c+2−1

This diff is large: its 17 lines aren’t shown here.

sound/soc/codecs/wm8990.c+6−3

This diff is large: its 40 lines aren’t shown here.

sound/soc/codecs/wm8991.c+3−2

This diff is large: its 26 lines aren’t shown here.

sound/soc/codecs/wm8993.c+8−5

This diff is large: its 64 lines aren’t shown here.

sound/soc/codecs/wm8994.c+24−22

This diff is large: its 211 lines aren’t shown here.

sound/soc/codecs/wm8995.c+4−3

This diff is large: its 35 lines aren’t shown here.

sound/soc/codecs/wm8996.c+7−6

This diff is large: its 62 lines aren’t shown here.

sound/soc/codecs/wm8997.c+2−2

This diff is large: its 18 lines aren’t shown here.

sound/soc/codecs/wm8998.c+4−4

This diff is large: its 29 lines aren’t shown here.

sound/soc/codecs/wm9081.c+4−3

This diff is large: its 35 lines aren’t shown here.

sound/soc/codecs/wm9090.c+3−2

This diff is large: its 26 lines aren’t shown here.

sound/soc/codecs/wm9712.c+4−3

This diff is large: its 35 lines aren’t shown here.

sound/soc/codecs/wm9713.c+4−3

This diff is large: its 35 lines aren’t shown here.

sound/soc/codecs/wm_adsp.c+11−10

This diff is large: its 83 lines aren’t shown here.

sound/soc/codecs/wm_hubs.c+5−5

This diff is large: its 45 lines aren’t shown here.

sound/soc/codecs/wsa881x.c+4−5

This diff is large: its 37 lines aren’t shown here.

sound/soc/codecs/wsa883x.c+8−11

This diff is large: its 70 lines aren’t shown here.

sound/soc/codecs/wsa884x.c+4−4

This diff is large: its 36 lines aren’t shown here.

sound/soc/fsl/fsl-asoc-card.c+2−2

This diff is large: its 18 lines aren’t shown here.

sound/soc/fsl/fsl_aud2htx.h+2−1

This diff is large: its 10 lines aren’t shown here.

sound/soc/fsl/fsl_micfil.c+111−25

This diff is large: its 226 lines aren’t shown here.

sound/soc/fsl/fsl_spdif.c+8−8

This diff is large: its 72 lines aren’t shown here.

sound/soc/fsl/fsl_xcvr.c+35−53

This diff is large: its 151 lines aren’t shown here.

sound/soc/fsl/imx-rpmsg.c+1−1

This diff is large: its 9 lines aren’t shown here.

sound/soc/generic/audio-graph-card.c+2−2

This diff is large: its 11 lines aren’t shown here.

sound/soc/intel/atom/sst-atom-controls.c+7−8

This diff is large: its 64 lines aren’t shown here.

sound/soc/intel/atom/sst/sst_acpi.c+2−1

This diff is large: its 17 lines aren’t shown here.

sound/soc/intel/avs/boards/da7219.c+1−2

This diff is large: its 10 lines aren’t shown here.

sound/soc/intel/avs/boards/es8336.c+3−2

This diff is large: its 26 lines aren’t shown here.

sound/soc/intel/avs/boards/nau8825.c+1−2

This diff is large: its 10 lines aren’t shown here.

sound/soc/intel/avs/boards/rt274.c+3−3

This diff is large: its 27 lines aren’t shown here.

sound/soc/intel/avs/boards/rt5514.c+2−1

This diff is large: its 10 lines aren’t shown here.

sound/soc/intel/avs/boards/rt5640.c+2−1

This diff is large: its 17 lines aren’t shown here.

sound/soc/intel/avs/control.c+3−4

This diff is large: its 15 lines aren’t shown here.

sound/soc/intel/avs/debugfs.c+3−6

This diff is large: its 20 lines aren’t shown here.

sound/soc/intel/avs/path.c+9−4

This diff is large: its 27 lines aren’t shown here.

sound/soc/intel/avs/pcm.c+1−1

This diff is large: its 9 lines aren’t shown here.

sound/soc/intel/avs/topology.c+110−3

This diff is large: its 184 lines aren’t shown here.

sound/soc/intel/avs/topology.h+8−0

This diff is large: its 29 lines aren’t shown here.

sound/soc/intel/boards/bdw-rt5677.c+4−5

This diff is large: its 37 lines aren’t shown here.

sound/soc/intel/boards/bytcht_cx2072x.c+2−1

This diff is large: its 17 lines aren’t shown here.

sound/soc/intel/boards/bytcht_es8316.c+5−4

This diff is large: its 42 lines aren’t shown here.

sound/soc/intel/boards/bytcr_rt5640.c+13−12

This diff is large: its 97 lines aren’t shown here.

sound/soc/intel/boards/bytcr_rt5651.c+9−9

This diff is large: its 66 lines aren’t shown here.

sound/soc/intel/boards/bytcr_wm5102.c+7−7

This diff is large: its 61 lines aren’t shown here.

sound/soc/intel/boards/cht_bsw_max98090_ti.c+2−3

This diff is large: its 19 lines aren’t shown here.

sound/soc/intel/boards/cht_bsw_rt5645.c+6−6

This diff is large: its 42 lines aren’t shown here.

sound/soc/intel/boards/cht_bsw_rt5672.c+4−4

This diff is large: its 32 lines aren’t shown here.

sound/soc/intel/boards/hda_dsp_common.c+12−3

This diff is large: its 29 lines aren’t shown here.

sound/soc/intel/boards/sof_board_helpers.c+6−4

This diff is large: its 40 lines aren’t shown here.

sound/soc/intel/boards/sof_cirrus_common.c+3−2

This diff is large: its 21 lines aren’t shown here.

sound/soc/intel/boards/sof_da7219.c+2−3

This diff is large: its 19 lines aren’t shown here.

sound/soc/intel/boards/sof_es8336.c+8−6

This diff is large: its 62 lines aren’t shown here.

sound/soc/intel/boards/sof_maxim_common.c+12−10

This diff is large: its 98 lines aren’t shown here.

sound/soc/intel/boards/sof_nau8825.c+1−1

This diff is large: its 9 lines aren’t shown here.

sound/soc/intel/boards/sof_nuvoton_common.c+3−2

This diff is large: its 21 lines aren’t shown here.

sound/soc/intel/boards/sof_pcm512x.c+3−2

This diff is large: its 21 lines aren’t shown here.

sound/soc/intel/boards/sof_realtek_common.c+18−16

This diff is large: its 140 lines aren’t shown here.

sound/soc/intel/boards/sof_rt5682.c+14−3

This diff is large: its 54 lines aren’t shown here.

sound/soc/intel/boards/sof_sdw.c+68−12

This diff is large: its 161 lines aren’t shown here.

sound/soc/intel/catpt/device.c+18−8

This diff is large: its 64 lines aren’t shown here.

sound/soc/intel/catpt/loader.c+9−9

This diff is large: its 59 lines aren’t shown here.

sound/soc/intel/catpt/pcm.c+14−17

This diff is large: its 112 lines aren’t shown here.

sound/soc/intel/catpt/sysfs.c+1−1

This diff is large: its 9 lines aren’t shown here.

sound/soc/intel/common/Makefile+1−0

This diff is large: its 8 lines aren’t shown here.

sound/soc/intel/common/soc-acpi-intel-nvl-match.c+90−0

This diff is large: its 91 lines aren’t shown here.

sound/soc/intel/common/soc-acpi-intel-ptl-match.c+79−0

This diff is large: its 121 lines aren’t shown here.

sound/soc/intel/common/sof-function-topology-lib.c+6−2

This diff is large: its 18 lines aren’t shown here.

sound/soc/mediatek/Kconfig+31−0

This diff is large: its 38 lines aren’t shown here.

sound/soc/mediatek/Makefile+1−0

This diff is large: its 5 lines aren’t shown here.

sound/soc/mediatek/common/mtk-afe-platform-driver.c+4−3

This diff is large: its 31 lines aren’t shown here.

sound/soc/mediatek/common/mtk-btcvsd.c+12−12

This diff is large: its 108 lines aren’t shown here.

sound/soc/mediatek/common/mtk-dsp-sof-common.c+3−2

This diff is large: its 24 lines aren’t shown here.

sound/soc/mediatek/mt8183/mt8183-dai-adda.c+2−2

This diff is large: its 18 lines aren’t shown here.

sound/soc/mediatek/mt8183/mt8183-dai-i2s.c+2−2

This diff is large: its 18 lines aren’t shown here.

sound/soc/mediatek/mt8186/mt8186-afe-pcm.c+6−6

This diff is large: its 54 lines aren’t shown here.

sound/soc/mediatek/mt8186/mt8186-dai-adda.c+2−2

This diff is large: its 18 lines aren’t shown here.

sound/soc/mediatek/mt8186/mt8186-dai-i2s.c+2−2

This diff is large: its 18 lines aren’t shown here.

sound/soc/mediatek/mt8186/mt8186-dai-tdm.c+2−2

This diff is large: its 18 lines aren’t shown here.

sound/soc/mediatek/mt8186/mt8186-misc-control.c+6−6

This diff is large: its 54 lines aren’t shown here.

sound/soc/mediatek/mt8186/mt8186-mt6366-common.c+1−1

This diff is large: its 9 lines aren’t shown here.

sound/soc/mediatek/mt8186/mt8186-mt6366.c+10−9

This diff is large: its 59 lines aren’t shown here.

sound/soc/mediatek/mt8188/mt8188-afe-pcm.c+4−6

This diff is large: its 38 lines aren’t shown here.

sound/soc/mediatek/mt8188/mt8188-dai-adda.c+2−2

This diff is large: its 18 lines aren’t shown here.

sound/soc/mediatek/mt8188/mt8188-dai-dmic.c+1−1

This diff is large: its 9 lines aren’t shown here.

sound/soc/mediatek/mt8188/mt8188-dai-etdm.c+1−2

This diff is large: its 10 lines aren’t shown here.

sound/soc/mediatek/mt8188/mt8188-mt6359.c+10−7

This diff is large: its 68 lines aren’t shown here.

sound/soc/mediatek/mt8189/Makefile+18−0

This diff is large: its 19 lines aren’t shown here.

sound/soc/mediatek/mt8189/mt8189-afe-clk.c+750−0

This diff is large: its 751 lines aren’t shown here.

sound/soc/mediatek/mt8189/mt8189-afe-clk.h+76−0

This diff is large: its 77 lines aren’t shown here.

sound/soc/mediatek/mt8189/mt8189-afe-common.h+240−0

This diff is large: its 241 lines aren’t shown here.

sound/soc/mediatek/mt8189/mt8189-afe-pcm.c+2615−0

This diff is large: its 2616 lines aren’t shown here.

sound/soc/mediatek/mt8189/mt8189-dai-adda.c+1228−0

This diff is large: its 1229 lines aren’t shown here.

sound/soc/mediatek/mt8189/mt8189-dai-i2s.c+1463−0

This diff is large: its 1464 lines aren’t shown here.

sound/soc/mediatek/mt8189/mt8189-dai-pcm.c+332−0

This diff is large: its 333 lines aren’t shown here.

sound/soc/mediatek/mt8189/mt8189-dai-tdm.c+672−0

This diff is large: its 673 lines aren’t shown here.

sound/soc/mediatek/mt8189/mt8189-interconnection.h+97−0

This diff is large: its 98 lines aren’t shown here.

sound/soc/mediatek/mt8189/mt8189-nau8825.c+1178−0

This diff is large: its 1179 lines aren’t shown here.

sound/soc/mediatek/mt8189/mt8189-reg.h+10773−0

This diff is large: its 10774 lines aren’t shown here.

sound/soc/mediatek/mt8192/mt8192-dai-adda.c+6−6

This diff is large: its 54 lines aren’t shown here.

sound/soc/mediatek/mt8192/mt8192-dai-i2s.c+2−2

This diff is large: its 18 lines aren’t shown here.

sound/soc/mediatek/mt8195/mt8195-afe-pcm.c+2−4

This diff is large: its 20 lines aren’t shown here.

sound/soc/mediatek/mt8195/mt8195-dai-adda.c+4−4

This diff is large: its 36 lines aren’t shown here.

sound/soc/mediatek/mt8195/mt8195-dai-etdm.c+1−2

This diff is large: its 10 lines aren’t shown here.

sound/soc/mediatek/mt8195/mt8195-mt6359.c+13−8

This diff is large: its 96 lines aren’t shown here.

sound/soc/mediatek/mt8365/mt8365-afe-pcm.c+1−2

This diff is large: its 10 lines aren’t shown here.

sound/soc/meson/aiu-acodec-ctrl.c+2−4

This diff is large: its 13 lines aren’t shown here.

sound/soc/meson/aiu-codec-ctrl.c+2−4

This diff is large: its 13 lines aren’t shown here.

sound/soc/meson/axg-spdifout.c+2−2

This diff is large: its 11 lines aren’t shown here.

sound/soc/meson/axg-tdm-interface.c+2−2

This diff is large: its 11 lines aren’t shown here.

sound/soc/meson/g12a-toacodec.c+2−4

This diff is large: its 14 lines aren’t shown here.

sound/soc/meson/g12a-tohdmitx.c+4−8

This diff is large: its 26 lines aren’t shown here.

sound/soc/meson/t9015.c+2−2

This diff is large: its 11 lines aren’t shown here.

sound/soc/mxs/mxs-saif.c+90−33

This diff is large: its 160 lines aren’t shown here.

sound/soc/pxa/spitz.c+6−3

This diff is large: its 42 lines aren’t shown here.

sound/soc/qcom/qdsp6/audioreach.c+66−168

This diff is large: its 453 lines aren’t shown here.

sound/soc/qcom/qdsp6/q6adm.c+80−99

This diff is large: its 256 lines aren’t shown here.

sound/soc/qcom/qdsp6/q6afe.c+14−35

This diff is large: its 163 lines aren’t shown here.

sound/soc/qcom/qdsp6/q6apm-dai.c+7−18

This diff is large: its 115 lines aren’t shown here.

sound/soc/qcom/qdsp6/q6apm.c+17−40

This diff is large: its 125 lines aren’t shown here.

sound/soc/qcom/qdsp6/q6asm-dai.c+48−39

This diff is large: its 267 lines aren’t shown here.

sound/soc/qcom/qdsp6/q6asm.c+63−140

This diff is large: its 531 lines aren’t shown here.

sound/soc/qcom/qdsp6/q6asm.h+1−0

This diff is large: its 6 lines aren’t shown here.

sound/soc/qcom/qdsp6/q6prm.c+6−21

This diff is large: its 69 lines aren’t shown here.

sound/soc/qcom/qdsp6/q6routing.c+2−4

This diff is large: its 20 lines aren’t shown here.

sound/soc/qcom/qdsp6/q6usb.c+2−1

This diff is large: its 13 lines aren’t shown here.

sound/soc/qcom/qdsp6/topology.c+6−6

This diff is large: its 40 lines aren’t shown here.

sound/soc/qcom/sc7180.c+6−4

This diff is large: its 24 lines aren’t shown here.

sound/soc/qcom/sc7280.c+3−64

This diff is large: its 117 lines aren’t shown here.

sound/soc/qcom/sc8280xp.c+4−30

This diff is large: its 80 lines aren’t shown here.

sound/soc/qcom/sdm845.c+3−50

This diff is large: its 102 lines aren’t shown here.

sound/soc/qcom/sdw.c+76−52

This diff is large: its 186 lines aren’t shown here.

sound/soc/qcom/sdw.h+2−5

This diff is large: its 16 lines aren’t shown here.

sound/soc/qcom/sm8250.c+4−30

This diff is large: its 73 lines aren’t shown here.

sound/soc/qcom/x1e80100.c+3−30

This diff is large: its 80 lines aren’t shown here.

sound/soc/renesas/fsi.c+4−4

This diff is large: its 34 lines aren’t shown here.

sound/soc/renesas/rz-ssi.c+47−17

This diff is large: its 148 lines aren’t shown here.

sound/soc/rockchip/rk3288_hdmi_analog.c+2−1

This diff is large: its 10 lines aren’t shown here.

sound/soc/rockchip/rockchip_i2s_tdm.c+1−2

This diff is large: its 10 lines aren’t shown here.

sound/soc/rockchip/rockchip_max98090.c+1−1

This diff is large: its 9 lines aren’t shown here.

sound/soc/rockchip/rockchip_sai.c+4−4

This diff is large: its 36 lines aren’t shown here.

sound/soc/samsung/aries_wm8994.c+3−3

This diff is large: its 27 lines aren’t shown here.

sound/soc/samsung/bells.c+3−3

This diff is large: its 24 lines aren’t shown here.

sound/soc/samsung/littlemill.c+4−4

This diff is large: its 36 lines aren’t shown here.

sound/soc/samsung/lowland.c+2−1

This diff is large: its 11 lines aren’t shown here.

sound/soc/samsung/midas_wm1811.c+4−4

This diff is large: its 36 lines aren’t shown here.

sound/soc/samsung/smdk_wm8994.c+15−15

This diff is large: its 39 lines aren’t shown here.

sound/soc/samsung/speyside.c+13−11

This diff is large: its 56 lines aren’t shown here.

sound/soc/samsung/tm2_wm5110.c+4−3

This diff is large: its 29 lines aren’t shown here.

sound/soc/samsung/tobermory.c+3−3

This diff is large: its 24 lines aren’t shown here.

sound/soc/sdca/Kconfig+28−0

This diff is large: its 43 lines aren’t shown here.

sound/soc/sdca/Makefile+9−1

This diff is large: its 17 lines aren’t shown here.

sound/soc/sdca/sdca_asoc.c+16−73

This diff is large: its 152 lines aren’t shown here.

sound/soc/sdca/sdca_class.c+304−0

This diff is large: its 305 lines aren’t shown here.

sound/soc/sdca/sdca_class.h+37−0

This diff is large: its 38 lines aren’t shown here.

sound/soc/sdca/sdca_class_function.c+460−0

This diff is large: its 461 lines aren’t shown here.

sound/soc/sdca/sdca_device.c+20−0

This diff is large: its 34 lines aren’t shown here.

sound/soc/sdca/sdca_fdl.c+504−0

This diff is large: its 505 lines aren’t shown here.

sound/soc/sdca/sdca_function_device.c+117−0

This diff is large: its 118 lines aren’t shown here.

sound/soc/sdca/sdca_function_device.h+15−0

This diff is large: its 16 lines aren’t shown here.

sound/soc/sdca/sdca_functions.c+275−35

This diff is large: its 524 lines aren’t shown here.

sound/soc/sdca/sdca_hid.c+50−9

This diff is large: its 95 lines aren’t shown here.

sound/soc/sdca/sdca_interrupts.c+224−56

This diff is large: its 484 lines aren’t shown here.

sound/soc/sdca/sdca_regmap.c+68−30

This diff is large: its 137 lines aren’t shown here.

sound/soc/sdca/sdca_ump.c+262−0

This diff is large: its 263 lines aren’t shown here.

sound/soc/sdw_utils/Makefile+1−0

This diff is large: its 8 lines aren’t shown here.

sound/soc/sdw_utils/soc_sdw_bridge_cs35l56.c+3−2

This diff is large: its 25 lines aren’t shown here.

sound/soc/sdw_utils/soc_sdw_cs42l42.c+2−1

This diff is large: its 17 lines aren’t shown here.

sound/soc/sdw_utils/soc_sdw_cs42l43.c+6−3

This diff is large: its 51 lines aren’t shown here.

sound/soc/sdw_utils/soc_sdw_cs42l45.c+80−0

This diff is large: its 81 lines aren’t shown here.

sound/soc/sdw_utils/soc_sdw_cs_amp.c+2−1

This diff is large: its 17 lines aren’t shown here.

sound/soc/sdw_utils/soc_sdw_dmic.c+3−2

This diff is large: its 21 lines aren’t shown here.

sound/soc/sdw_utils/soc_sdw_maxim.c+4−4

This diff is large: its 31 lines aren’t shown here.

sound/soc/sdw_utils/soc_sdw_rt5682.c+2−1

This diff is large: its 17 lines aren’t shown here.

sound/soc/sdw_utils/soc_sdw_rt700.c+2−1

This diff is large: its 17 lines aren’t shown here.

sound/soc/sdw_utils/soc_sdw_rt711.c+2−1

This diff is large: its 17 lines aren’t shown here.

sound/soc/sdw_utils/soc_sdw_rt_amp.c+3−2

This diff is large: its 20 lines aren’t shown here.

sound/soc/sdw_utils/soc_sdw_rt_mf_sdca.c+2−1

This diff is large: its 17 lines aren’t shown here.

sound/soc/sdw_utils/soc_sdw_rt_sdca_jack_common.c+6−5

This diff is large: its 33 lines aren’t shown here.

sound/soc/sdw_utils/soc_sdw_ti_amp.c+2−1

This diff is large: its 17 lines aren’t shown here.

sound/soc/sdw_utils/soc_sdw_utils.c+136−22

This diff is large: its 484 lines aren’t shown here.

sound/soc/soc-core.c+23−19

This diff is large: its 160 lines aren’t shown here.

sound/soc/soc-dai.c+3−2

This diff is large: its 12 lines aren’t shown here.

sound/soc/soc-dapm.c+116−80

This diff is large: its 827 lines aren’t shown here.

sound/soc/soc-jack.c+1−1

This diff is large: its 9 lines aren’t shown here.

sound/soc/soc-ops.c+51−11

This diff is large: its 115 lines aren’t shown here.

sound/soc/soc-pcm.c+23−15

This diff is large: its 68 lines aren’t shown here.

sound/soc/soc-topology.c+5−5

This diff is large: its 38 lines aren’t shown here.

sound/soc/sof/fw-file-profile.c+12−1

This diff is large: its 34 lines aren’t shown here.

sound/soc/sof/imx/Kconfig+1−0

This diff is large: its 8 lines aren’t shown here.

sound/soc/sof/imx/imx9.c+8−28

This diff is large: its 68 lines aren’t shown here.

sound/soc/sof/intel/Kconfig+18−0

This diff is large: its 32 lines aren’t shown here.

sound/soc/sof/intel/Makefile+2−0

This diff is large: its 13 lines aren’t shown here.

sound/soc/sof/intel/apl.c+1−0

This diff is large: its 6 lines aren’t shown here.

sound/soc/sof/intel/cnl.c+3−1

This diff is large: its 24 lines aren’t shown here.

sound/soc/sof/intel/hda-dsp.c+1−0

This diff is large: its 8 lines aren’t shown here.

sound/soc/sof/intel/hda-ipc.c+1−1

This diff is large: its 9 lines aren’t shown here.

sound/soc/sof/intel/hda.c+211−2

This diff is large: its 255 lines aren’t shown here.

sound/soc/sof/intel/hda.h+1−0

This diff is large: its 8 lines aren’t shown here.

sound/soc/sof/intel/icl.c+1−0

This diff is large: its 6 lines aren’t shown here.

sound/soc/sof/intel/lnl.c+1−0

This diff is large: its 8 lines aren’t shown here.

sound/soc/sof/intel/mtl.c+2−0

This diff is large: its 14 lines aren’t shown here.

sound/soc/sof/intel/nvl.c+55−0

This diff is large: its 56 lines aren’t shown here.

sound/soc/sof/intel/nvl.h+14−0

This diff is large: its 15 lines aren’t shown here.

sound/soc/sof/intel/pci-nvl.c+82−0

This diff is large: its 83 lines aren’t shown here.

sound/soc/sof/intel/ptl.c+2−0

This diff is large: its 16 lines aren’t shown here.

sound/soc/sof/intel/shim.h+2−0

This diff is large: its 16 lines aren’t shown here.

sound/soc/sof/intel/skl.c+1−0

This diff is large: its 7 lines aren’t shown here.

sound/soc/sof/intel/tgl.c+4−0

This diff is large: its 30 lines aren’t shown here.

sound/soc/sof/pcm.c+18−0

This diff is large: its 25 lines aren’t shown here.

sound/soc/sof/sof-client-probes-ipc4.c+1−1

This diff is large: its 9 lines aren’t shown here.

sound/soc/sof/sof-client-probes.c+8−3

This diff is large: its 25 lines aren’t shown here.

sound/soc/sof/topology.c+6−1

This diff is large: its 16 lines aren’t shown here.

sound/soc/spacemit/Kconfig+15−0

This diff is large: its 16 lines aren’t shown here.

sound/soc/spacemit/Makefile+5−0

This diff is large: its 6 lines aren’t shown here.

sound/soc/spacemit/k1_i2s.c+461−0

This diff is large: its 462 lines aren’t shown here.

sound/soc/stm/stm32_adfsdm.c+1−1

This diff is large: its 9 lines aren’t shown here.

sound/soc/stm/stm32_sai.c+4−10

This diff is large: its 35 lines aren’t shown here.

sound/soc/stm/stm32_sai_sub.c+40−17

This diff is large: its 127 lines aren’t shown here.

sound/soc/sunxi/sun4i-codec.c+2−1

This diff is large: its 10 lines aren’t shown here.

sound/soc/sunxi/sun4i-spdif.c+24−2

This diff is large: its 62 lines aren’t shown here.

sound/soc/sunxi/sun50i-codec-analog.c+1−1

This diff is large: its 9 lines aren’t shown here.

sound/soc/sunxi/sun8i-codec-analog.c+7−7

This diff is large: its 63 lines aren’t shown here.

sound/soc/sunxi/sun8i-codec.c+2−2

This diff is large: its 18 lines aren’t shown here.

sound/soc/tegra/Kconfig+1−1

This diff is large: its 9 lines aren’t shown here.

sound/soc/tegra/tegra186_asrc.c+12−12

This diff is large: its 108 lines aren’t shown here.

sound/soc/tegra/tegra186_dspk.c+12−12

This diff is large: its 108 lines aren’t shown here.

sound/soc/tegra/tegra210_admaif.c+8−8

This diff is large: its 72 lines aren’t shown here.

sound/soc/tegra/tegra210_adx.c+2−2

This diff is large: its 18 lines aren’t shown here.

sound/soc/tegra/tegra210_ahub.c+3−3

This diff is large: its 21 lines aren’t shown here.

sound/soc/tegra/tegra210_amx.c+2−2

This diff is large: its 18 lines aren’t shown here.

sound/soc/tegra/tegra210_dmic.c+12−12

This diff is large: its 108 lines aren’t shown here.

sound/soc/tegra/tegra210_i2s.c+16−16

This diff is large: its 144 lines aren’t shown here.

sound/soc/tegra/tegra210_mbdrc.c+12−12

This diff is large: its 108 lines aren’t shown here.

sound/soc/tegra/tegra210_mixer.c+2−2

This diff is large: its 18 lines aren’t shown here.

sound/soc/tegra/tegra210_mvc.c+6−6

This diff is large: its 54 lines aren’t shown here.

sound/soc/tegra/tegra210_ope.c+2−2

This diff is large: its 18 lines aren’t shown here.

sound/soc/tegra/tegra210_peq.c+4−4

This diff is large: its 36 lines aren’t shown here.

sound/soc/tegra/tegra210_sfc.c+8−8

This diff is large: its 72 lines aren’t shown here.

sound/soc/tegra/tegra_asoc_machine.c+7−4

This diff is large: its 38 lines aren’t shown here.

sound/soc/tegra/tegra_wm8903.c+2−1

This diff is large: its 17 lines aren’t shown here.

sound/soc/ti/ams-delta.c+4−4

This diff is large: its 36 lines aren’t shown here.

sound/soc/ti/davinci-evm.c+6−5

This diff is large: its 33 lines aren’t shown here.

sound/soc/ti/j721e-evm.c+1−1

This diff is large: its 9 lines aren’t shown here.

sound/soc/ti/n810.c+8−4

This diff is large: its 58 lines aren’t shown here.

sound/soc/ti/omap-abe-twl6040.c+1−1

This diff is large: its 9 lines aren’t shown here.

sound/soc/ti/omap-twl4030.c+1−1

This diff is large: its 9 lines aren’t shown here.

sound/soc/ti/omap3pandora.c+19−17

This diff is large: its 62 lines aren’t shown here.

sound/soc/ti/rx51.c+10−7

This diff is large: its 76 lines aren’t shown here.

sound/soc/uniphier/aio-cpu.c+2−2

This diff is large: its 18 lines aren’t shown here.

sound/soc/uniphier/evea.c+6−6

This diff is large: its 54 lines aren’t shown here.

sound/soc/ux500/mop500_ab8500.c+1−1

This diff is large: its 9 lines aren’t shown here.

sound/usb/line6/podhd.c+15−1

This diff is large: its 37 lines aren’t shown here.

sound/usb/mixer_quirks.c+115−7

This diff is large: its 167 lines aren’t shown here.

sound/usb/stream.c+2−4

This diff is large: its 21 lines aren’t shown here.

tools/testing/selftests/alsa/conf.c+1−1

This diff is large: its 9 lines aren’t shown here.

Merge tag 'sound-6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code

@@ -58,8 +58,8 @@ struct tse850_priv { · 57 unmodified lines
58	static int tse850_get_mux1(struct snd_kcontrol *kctrl,	58	static int tse850_get_mux1(struct snd_kcontrol *kctrl,
59	struct snd_ctl_elem_value *ucontrol)	59	struct snd_ctl_elem_value *ucontrol)
60	{	60	{
61	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kctrl);	61	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kctrl);
62	struct snd_soc_card *card = dapm->card;	62	struct snd_soc_card *card = snd_soc_dapm_to_card(dapm);
63	struct tse850_priv *tse850 = snd_soc_card_get_drvdata(card);	63	struct tse850_priv *tse850 = snd_soc_card_get_drvdata(card);
64		64
65	ucontrol->value.enumerated.item[0] = tse850->loop1_cache;	65	ucontrol->value.enumerated.item[0] = tse850->loop1_cache;
@@ -70,8 +70,8 @@ static int tse850_get_mux1(struct snd_kcontrol *kctrl, · 4 unmodified lines
70	static int tse850_put_mux1(struct snd_kcontrol *kctrl,	70	static int tse850_put_mux1(struct snd_kcontrol *kctrl,
71	struct snd_ctl_elem_value *ucontrol)	71	struct snd_ctl_elem_value *ucontrol)
72	{	72	{
73	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kctrl);	73	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kctrl);
74	struct snd_soc_card *card = dapm->card;	74	struct snd_soc_card *card = snd_soc_dapm_to_card(dapm);
75	struct tse850_priv *tse850 = snd_soc_card_get_drvdata(card);	75	struct tse850_priv *tse850 = snd_soc_card_get_drvdata(card);
76	struct soc_enum e = (struct soc_enum )kctrl->private_value;	76	struct soc_enum e = (struct soc_enum )kctrl->private_value;
77	unsigned int val = ucontrol->value.enumerated.item[0];	77	unsigned int val = ucontrol->value.enumerated.item[0];
@@ -88,8 +88,8 @@ static int tse850_put_mux1(struct snd_kcontrol *kctrl, · 10 unmodified lines
88	static int tse850_get_mux2(struct snd_kcontrol *kctrl,	88	static int tse850_get_mux2(struct snd_kcontrol *kctrl,
89	struct snd_ctl_elem_value *ucontrol)	89	struct snd_ctl_elem_value *ucontrol)
90	{	90	{
91	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kctrl);	91	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kctrl);
92	struct snd_soc_card *card = dapm->card;	92	struct snd_soc_card *card = snd_soc_dapm_to_card(dapm);
93	struct tse850_priv *tse850 = snd_soc_card_get_drvdata(card);	93	struct tse850_priv *tse850 = snd_soc_card_get_drvdata(card);
94		94
95	ucontrol->value.enumerated.item[0] = tse850->loop2_cache;	95	ucontrol->value.enumerated.item[0] = tse850->loop2_cache;
@@ -100,8 +100,8 @@ static int tse850_get_mux2(struct snd_kcontrol *kctrl, · 4 unmodified lines
100	static int tse850_put_mux2(struct snd_kcontrol *kctrl,	100	static int tse850_put_mux2(struct snd_kcontrol *kctrl,
101	struct snd_ctl_elem_value *ucontrol)	101	struct snd_ctl_elem_value *ucontrol)
102	{	102	{
103	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kctrl);	103	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kctrl);
104	struct snd_soc_card *card = dapm->card;	104	struct snd_soc_card *card = snd_soc_dapm_to_card(dapm);
105	struct tse850_priv *tse850 = snd_soc_card_get_drvdata(card);	105	struct tse850_priv *tse850 = snd_soc_card_get_drvdata(card);
106	struct soc_enum e = (struct soc_enum )kctrl->private_value;	106	struct soc_enum e = (struct soc_enum )kctrl->private_value;
107	unsigned int val = ucontrol->value.enumerated.item[0];	107	unsigned int val = ucontrol->value.enumerated.item[0];
@@ -118,8 +118,8 @@ static int tse850_put_mux2(struct snd_kcontrol *kctrl, · 10 unmodified lines
118	static int tse850_get_mix(struct snd_kcontrol *kctrl,	118	static int tse850_get_mix(struct snd_kcontrol *kctrl,
119	struct snd_ctl_elem_value *ucontrol)	119	struct snd_ctl_elem_value *ucontrol)
120	{	120	{
121	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kctrl);	121	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kctrl);
122	struct snd_soc_card *card = dapm->card;	122	struct snd_soc_card *card = snd_soc_dapm_to_card(dapm);
123	struct tse850_priv *tse850 = snd_soc_card_get_drvdata(card);	123	struct tse850_priv *tse850 = snd_soc_card_get_drvdata(card);
124		124
125	ucontrol->value.enumerated.item[0] = tse850->add_cache;	125	ucontrol->value.enumerated.item[0] = tse850->add_cache;
@@ -130,8 +130,8 @@ static int tse850_get_mix(struct snd_kcontrol *kctrl, · 4 unmodified lines
130	static int tse850_put_mix(struct snd_kcontrol *kctrl,	130	static int tse850_put_mix(struct snd_kcontrol *kctrl,
131	struct snd_ctl_elem_value *ucontrol)	131	struct snd_ctl_elem_value *ucontrol)
132	{	132	{
133	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kctrl);	133	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kctrl);
134	struct snd_soc_card *card = dapm->card;	134	struct snd_soc_card *card = snd_soc_dapm_to_card(dapm);
135	struct tse850_priv *tse850 = snd_soc_card_get_drvdata(card);	135	struct tse850_priv *tse850 = snd_soc_card_get_drvdata(card);
136	int connect = !!ucontrol->value.integer.value[0];	136	int connect = !!ucontrol->value.integer.value[0];
137		137
@@ -152,8 +152,8 @@ static int tse850_put_mix(struct snd_kcontrol *kctrl, · 14 unmodified lines
152	static int tse850_get_ana(struct snd_kcontrol *kctrl,	152	static int tse850_get_ana(struct snd_kcontrol *kctrl,
153	struct snd_ctl_elem_value *ucontrol)	153	struct snd_ctl_elem_value *ucontrol)
154	{	154	{
155	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kctrl);	155	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kctrl);
156	struct snd_soc_card *card = dapm->card;	156	struct snd_soc_card *card = snd_soc_dapm_to_card(dapm);
157	struct tse850_priv *tse850 = snd_soc_card_get_drvdata(card);	157	struct tse850_priv *tse850 = snd_soc_card_get_drvdata(card);
158	int ret;	158	int ret;
159		159
@@ -185,8 +185,8 @@ static int tse850_get_ana(struct snd_kcontrol *kctrl, · 25 unmodified lines
185	static int tse850_put_ana(struct snd_kcontrol *kctrl,	185	static int tse850_put_ana(struct snd_kcontrol *kctrl,
186	struct snd_ctl_elem_value *ucontrol)	186	struct snd_ctl_elem_value *ucontrol)
187	{	187	{
188	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kctrl);	188	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kctrl);
189	struct snd_soc_card *card = dapm->card;	189	struct snd_soc_card *card = snd_soc_dapm_to_card(dapm);
190	struct tse850_priv *tse850 = snd_soc_card_get_drvdata(card);	190	struct tse850_priv *tse850 = snd_soc_card_get_drvdata(card);
191	struct soc_enum e = (struct soc_enum )kctrl->private_value;	191	struct soc_enum e = (struct soc_enum )kctrl->private_value;
192	unsigned int uV = ucontrol->value.enumerated.item[0];	192	unsigned int uV = ucontrol->value.enumerated.item[0];

@@ -1114,7 +1114,7 @@ static void anc_configure(struct snd_soc_component *component, · 1113 unmodified lines
1114	static int sid_status_control_get(struct snd_kcontrol *kcontrol,	1114	static int sid_status_control_get(struct snd_kcontrol *kcontrol,
1115	struct snd_ctl_elem_value *ucontrol)	1115	struct snd_ctl_elem_value *ucontrol)
1116	{	1116	{
1117	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	1117	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
1118	struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(component->dev);	1118	struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(component->dev);
1119		1119
1120	mutex_lock(&drvdata->ctrl_lock);	1120	mutex_lock(&drvdata->ctrl_lock);
@@ -1128,7 +1128,7 @@ static int sid_status_control_get(struct snd_kcontrol *kcontrol, · 7 unmodified lines
1128	static int sid_status_control_put(struct snd_kcontrol *kcontrol,	1128	static int sid_status_control_put(struct snd_kcontrol *kcontrol,
1129	struct snd_ctl_elem_value *ucontrol)	1129	struct snd_ctl_elem_value *ucontrol)
1130	{	1130	{
1131	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	1131	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
1132	struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(component->dev);	1132	struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(component->dev);
1133	unsigned int param, sidconf, val;	1133	unsigned int param, sidconf, val;
1134	int status = 1;	1134	int status = 1;
@@ -1183,7 +1183,7 @@ out: · 48 unmodified lines
1183	static int anc_status_control_get(struct snd_kcontrol *kcontrol,	1183	static int anc_status_control_get(struct snd_kcontrol *kcontrol,
1184	struct snd_ctl_elem_value *ucontrol)	1184	struct snd_ctl_elem_value *ucontrol)
1185	{	1185	{
1186	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	1186	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
1187	struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(component->dev);	1187	struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(component->dev);
1188		1188
1189	mutex_lock(&drvdata->ctrl_lock);	1189	mutex_lock(&drvdata->ctrl_lock);
@@ -1196,8 +1196,8 @@ static int anc_status_control_get(struct snd_kcontrol *kcontrol, · 6 unmodified lines
1196	static int anc_status_control_put(struct snd_kcontrol *kcontrol,	1196	static int anc_status_control_put(struct snd_kcontrol *kcontrol,
1197	struct snd_ctl_elem_value *ucontrol)	1197	struct snd_ctl_elem_value *ucontrol)
1198	{	1198	{
1199	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	1199	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
1200	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	1200	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
1201	struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(component->dev);	1201	struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(component->dev);
1202	struct device *dev = component->dev;	1202	struct device *dev = component->dev;
1203	bool apply_fir, apply_iir;	1203	bool apply_fir, apply_iir;
@@ -1279,7 +1279,7 @@ static int filter_control_info(struct snd_kcontrol *kcontrol, · 75 unmodified lines
1279	static int filter_control_get(struct snd_kcontrol *kcontrol,	1279	static int filter_control_get(struct snd_kcontrol *kcontrol,
1280	struct snd_ctl_elem_value *ucontrol)	1280	struct snd_ctl_elem_value *ucontrol)
1281	{	1281	{
1282	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	1282	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
1283	struct ab8500_codec_drvdata *drvdata = snd_soc_component_get_drvdata(component);	1283	struct ab8500_codec_drvdata *drvdata = snd_soc_component_get_drvdata(component);
1284	struct filter_control *fc =	1284	struct filter_control *fc =
1285	(struct filter_control *)kcontrol->private_value;	1285	(struct filter_control *)kcontrol->private_value;
@@ -1296,7 +1296,7 @@ static int filter_control_get(struct snd_kcontrol *kcontrol, · 10 unmodified lines
1296	static int filter_control_put(struct snd_kcontrol *kcontrol,	1296	static int filter_control_put(struct snd_kcontrol *kcontrol,
1297	struct snd_ctl_elem_value *ucontrol)	1297	struct snd_ctl_elem_value *ucontrol)
1298	{	1298	{
1299	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	1299	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
1300	struct ab8500_codec_drvdata *drvdata = snd_soc_component_get_drvdata(component);	1300	struct ab8500_codec_drvdata *drvdata = snd_soc_component_get_drvdata(component);
1301	struct filter_control *fc =	1301	struct filter_control *fc =
1302	(struct filter_control *)kcontrol->private_value;	1302	(struct filter_control *)kcontrol->private_value;
@@ -1934,7 +1934,7 @@ static int ab8500_audio_init_audioblock(struct snd_soc_component *component) · 631 unmodified lines
1934	static int ab8500_audio_setup_mics(struct snd_soc_component *component,	1934	static int ab8500_audio_setup_mics(struct snd_soc_component *component,
1935	struct amic_settings *amics)	1935	struct amic_settings *amics)
1936	{	1936	{
1937	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	1937	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
1938	u8 value8;	1938	u8 value8;
1939	unsigned int value;	1939	unsigned int value;
1940	int status;	1940	int status;
@@ -2449,7 +2449,7 @@ static void ab8500_codec_of_probe(struct device dev, struct device_node np, · 508 unmodified lines
2449		2449
2450	static int ab8500_codec_probe(struct snd_soc_component *component)	2450	static int ab8500_codec_probe(struct snd_soc_component *component)
2451	{	2451	{
2452	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	2452	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
2453	struct device *dev = component->dev;	2453	struct device *dev = component->dev;
2454	struct device_node *np = dev->of_node;	2454	struct device_node *np = dev->of_node;
2455	struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(dev);	2455	struct ab8500_codec_drvdata *drvdata = dev_get_drvdata(dev);

@@ -185,8 +185,8 @@ static const struct snd_soc_dapm_route adau17x1_dapm_pll_route = { · 184 unmodified lines
185	static int adau17x1_dsp_mux_enum_put(struct snd_kcontrol *kcontrol,	185	static int adau17x1_dsp_mux_enum_put(struct snd_kcontrol *kcontrol,
186	struct snd_ctl_elem_value *ucontrol)	186	struct snd_ctl_elem_value *ucontrol)
187	{	187	{
188	struct snd_soc_component *component = snd_soc_dapm_kcontrol_component(kcontrol);	188	struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol);
189	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	189	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
190	struct adau *adau = snd_soc_component_get_drvdata(component);	190	struct adau *adau = snd_soc_component_get_drvdata(component);
191	struct soc_enum e = (struct soc_enum )kcontrol->private_value;	191	struct soc_enum e = (struct soc_enum )kcontrol->private_value;
192	struct snd_soc_dapm_update update = {};	192	struct snd_soc_dapm_update update = {};
@@ -230,7 +230,7 @@ static int adau17x1_dsp_mux_enum_put(struct snd_kcontrol *kcontrol, · 37 unmodified lines
230	static int adau17x1_dsp_mux_enum_get(struct snd_kcontrol *kcontrol,	230	static int adau17x1_dsp_mux_enum_get(struct snd_kcontrol *kcontrol,
231	struct snd_ctl_elem_value *ucontrol)	231	struct snd_ctl_elem_value *ucontrol)
232	{	232	{
233	struct snd_soc_component *component = snd_soc_dapm_kcontrol_component(kcontrol);	233	struct snd_soc_component *component = snd_soc_dapm_kcontrol_to_component(kcontrol);
234	struct adau *adau = snd_soc_component_get_drvdata(component);	234	struct adau *adau = snd_soc_component_get_drvdata(component);
235	struct soc_enum e = (struct soc_enum )kcontrol->private_value;	235	struct soc_enum e = (struct soc_enum )kcontrol->private_value;
236	unsigned int stream = e->shift_l;	236	unsigned int stream = e->shift_l;
@@ -383,7 +383,7 @@ static int adau17x1_set_dai_pll(struct snd_soc_dai *dai, int pll_id, · 146 unmodified lines
383	static int adau17x1_set_dai_sysclk(struct snd_soc_dai *dai,	383	static int adau17x1_set_dai_sysclk(struct snd_soc_dai *dai,
384	int clk_id, unsigned int freq, int dir)	384	int clk_id, unsigned int freq, int dir)
385	{	385	{
386	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(dai->component);	386	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(dai->component);
387	struct adau *adau = snd_soc_component_get_drvdata(dai->component);	387	struct adau *adau = snd_soc_component_get_drvdata(dai->component);
388	bool is_pll;	388	bool is_pll;
389	bool was_pll;	389	bool was_pll;
@@ -881,7 +881,7 @@ static int adau17x1_setup_firmware(struct snd_soc_component *component, · 491 unmodified lines
881	int ret;	881	int ret;
882	int dspsr, dsp_run;	882	int dspsr, dsp_run;
883	struct adau *adau = snd_soc_component_get_drvdata(component);	883	struct adau *adau = snd_soc_component_get_drvdata(component);
884	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	884	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
885		885
886	/* Check if sample rate is the same as before. If it is there is no	886	/* Check if sample rate is the same as before. If it is there is no
887	* point in performing the below steps as the call to	887	* point in performing the below steps as the call to
@@ -922,7 +922,7 @@ err: · 34 unmodified lines
922		922
923	int adau17x1_add_widgets(struct snd_soc_component *component)	923	int adau17x1_add_widgets(struct snd_soc_component *component)
924	{	924	{
925	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	925	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
926	struct adau *adau = snd_soc_component_get_drvdata(component);	926	struct adau *adau = snd_soc_component_get_drvdata(component);
927	int ret;	927	int ret;
928		928
@@ -958,7 +958,7 @@ EXPORT_SYMBOL_GPL(adau17x1_add_widgets); · 29 unmodified lines
958		958
959	int adau17x1_add_routes(struct snd_soc_component *component)	959	int adau17x1_add_routes(struct snd_soc_component *component)
960	{	960	{
961	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	961	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
962	struct adau *adau = snd_soc_component_get_drvdata(component);	962	struct adau *adau = snd_soc_component_get_drvdata(component);
963	int ret;	963	int ret;
964		964

@@ -314,7 +314,7 @@ static int adav80x_set_deemph(struct snd_soc_component *component) · 313 unmodified lines
314	static int adav80x_put_deemph(struct snd_kcontrol *kcontrol,	314	static int adav80x_put_deemph(struct snd_kcontrol *kcontrol,
315	struct snd_ctl_elem_value *ucontrol)	315	struct snd_ctl_elem_value *ucontrol)
316	{	316	{
317	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	317	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
318	struct adav80x *adav80x = snd_soc_component_get_drvdata(component);	318	struct adav80x *adav80x = snd_soc_component_get_drvdata(component);
319	unsigned int deemph = ucontrol->value.integer.value[0];	319	unsigned int deemph = ucontrol->value.integer.value[0];
320		320
@@ -329,7 +329,7 @@ static int adav80x_put_deemph(struct snd_kcontrol *kcontrol, · 8 unmodified lines
329	static int adav80x_get_deemph(struct snd_kcontrol *kcontrol,	329	static int adav80x_get_deemph(struct snd_kcontrol *kcontrol,
330	struct snd_ctl_elem_value *ucontrol)	330	struct snd_ctl_elem_value *ucontrol)
331	{	331	{
332	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	332	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
333	struct adav80x *adav80x = snd_soc_component_get_drvdata(component);	333	struct adav80x *adav80x = snd_soc_component_get_drvdata(component);
334		334
335	ucontrol->value.integer.value[0] = adav80x->deemph;	335	ucontrol->value.integer.value[0] = adav80x->deemph;
@@ -539,7 +539,7 @@ static int adav80x_set_sysclk(struct snd_soc_component *component, · 203 unmodified lines
539	unsigned int freq, int dir)	539	unsigned int freq, int dir)
540	{	540	{
541	struct adav80x *adav80x = snd_soc_component_get_drvdata(component);	541	struct adav80x *adav80x = snd_soc_component_get_drvdata(component);
542	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	542	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
543		543
544	if (dir == SND_SOC_CLOCK_IN) {	544	if (dir == SND_SOC_CLOCK_IN) {
545	switch (clk_id) {	545	switch (clk_id) {
@@ -622,7 +622,7 @@ static int adav80x_set_sysclk(struct snd_soc_component *component, · 76 unmodified lines
622	static int adav80x_set_pll(struct snd_soc_component *component, int pll_id,	622	static int adav80x_set_pll(struct snd_soc_component *component, int pll_id,
623	int source, unsigned int freq_in, unsigned int freq_out)	623	int source, unsigned int freq_in, unsigned int freq_out)
624	{	624	{
625	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	625	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
626	struct adav80x *adav80x = snd_soc_component_get_drvdata(component);	626	struct adav80x *adav80x = snd_soc_component_get_drvdata(component);
627	unsigned int pll_ctrl1 = 0;	627	unsigned int pll_ctrl1 = 0;
628	unsigned int pll_ctrl2 = 0;	628	unsigned int pll_ctrl2 = 0;
@@ -802,7 +802,7 @@ static struct snd_soc_dai_driver adav80x_dais[] = { · 173 unmodified lines
802		802
803	static int adav80x_probe(struct snd_soc_component *component)	803	static int adav80x_probe(struct snd_soc_component *component)
804	{	804	{
805	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	805	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
806	struct adav80x *adav80x = snd_soc_component_get_drvdata(component);	806	struct adav80x *adav80x = snd_soc_component_get_drvdata(component);
807		807
808	/* Force PLLs on for SYSCLK output */	808	/* Force PLLs on for SYSCLK output */

@@ -779,7 +779,7 @@ static void aw88081_start(struct aw88081 *aw88081, bool sync_start) · 778 unmodified lines
779	if (sync_start == AW88081_SYNC_START)	779	if (sync_start == AW88081_SYNC_START)
780	aw88081_start_pa(aw88081);	780	aw88081_start_pa(aw88081);
781	else	781	else
782	queue_delayed_work(system_wq,	782	queue_delayed_work(system_dfl_wq,
783	&aw88081->start_work,	783	&aw88081->start_work,
784	AW88081_START_WORK_DELAY_MS);	784	AW88081_START_WORK_DELAY_MS);
785	}	785	}
@@ -808,7 +808,7 @@ static struct snd_soc_dai_driver aw88081_dai[] = { · 22 unmodified lines
808	static int aw88081_get_fade_in_time(struct snd_kcontrol *kcontrol,	808	static int aw88081_get_fade_in_time(struct snd_kcontrol *kcontrol,
809	struct snd_ctl_elem_value *ucontrol)	809	struct snd_ctl_elem_value *ucontrol)
810	{	810	{
811	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	811	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
812	struct aw88081 *aw88081 = snd_soc_component_get_drvdata(component);	812	struct aw88081 *aw88081 = snd_soc_component_get_drvdata(component);
813	struct aw_device *aw_dev = aw88081->aw_pa;	813	struct aw_device *aw_dev = aw88081->aw_pa;
814		814
@@ -820,7 +820,7 @@ static int aw88081_get_fade_in_time(struct snd_kcontrol *kcontrol, · 5 unmodified lines
820	static int aw88081_set_fade_in_time(struct snd_kcontrol *kcontrol,	820	static int aw88081_set_fade_in_time(struct snd_kcontrol *kcontrol,
821	struct snd_ctl_elem_value *ucontrol)	821	struct snd_ctl_elem_value *ucontrol)
822	{	822	{
823	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	823	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
824	struct aw88081 *aw88081 = snd_soc_component_get_drvdata(component);	824	struct aw88081 *aw88081 = snd_soc_component_get_drvdata(component);
825	struct soc_mixer_control *mc =	825	struct soc_mixer_control *mc =
826	(struct soc_mixer_control *)kcontrol->private_value;	826	(struct soc_mixer_control *)kcontrol->private_value;
@@ -843,7 +843,7 @@ static int aw88081_set_fade_in_time(struct snd_kcontrol *kcontrol, · 16 unmodified lines
843	static int aw88081_get_fade_out_time(struct snd_kcontrol *kcontrol,	843	static int aw88081_get_fade_out_time(struct snd_kcontrol *kcontrol,
844	struct snd_ctl_elem_value *ucontrol)	844	struct snd_ctl_elem_value *ucontrol)
845	{	845	{
846	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	846	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
847	struct aw88081 *aw88081 = snd_soc_component_get_drvdata(component);	847	struct aw88081 *aw88081 = snd_soc_component_get_drvdata(component);
848	struct aw_device *aw_dev = aw88081->aw_pa;	848	struct aw_device *aw_dev = aw88081->aw_pa;
849		849
@@ -855,7 +855,7 @@ static int aw88081_get_fade_out_time(struct snd_kcontrol *kcontrol, · 5 unmodified lines
855	static int aw88081_set_fade_out_time(struct snd_kcontrol *kcontrol,	855	static int aw88081_set_fade_out_time(struct snd_kcontrol *kcontrol,
856	struct snd_ctl_elem_value *ucontrol)	856	struct snd_ctl_elem_value *ucontrol)
857	{	857	{
858	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	858	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
859	struct aw88081 *aw88081 = snd_soc_component_get_drvdata(component);	859	struct aw88081 *aw88081 = snd_soc_component_get_drvdata(component);
860	struct soc_mixer_control *mc =	860	struct soc_mixer_control *mc =
861	(struct soc_mixer_control *)kcontrol->private_value;	861	(struct soc_mixer_control *)kcontrol->private_value;
@@ -891,7 +891,7 @@ static int aw88081_dev_set_profile_index(struct aw_device *aw_dev, int index) · 29 unmodified lines
891	static int aw88081_profile_info(struct snd_kcontrol *kcontrol,	891	static int aw88081_profile_info(struct snd_kcontrol *kcontrol,
892	struct snd_ctl_elem_info *uinfo)	892	struct snd_ctl_elem_info *uinfo)
893	{	893	{
894	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);	894	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
895	struct aw88081 *aw88081 = snd_soc_component_get_drvdata(codec);	895	struct aw88081 *aw88081 = snd_soc_component_get_drvdata(codec);
896	char *prof_name;	896	char *prof_name;
897	int count, ret;	897	int count, ret;
@@ -926,7 +926,7 @@ static int aw88081_profile_info(struct snd_kcontrol *kcontrol, · 28 unmodified lines
926	static int aw88081_profile_get(struct snd_kcontrol *kcontrol,	926	static int aw88081_profile_get(struct snd_kcontrol *kcontrol,
927	struct snd_ctl_elem_value *ucontrol)	927	struct snd_ctl_elem_value *ucontrol)
928	{	928	{
929	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);	929	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
930	struct aw88081 *aw88081 = snd_soc_component_get_drvdata(codec);	930	struct aw88081 *aw88081 = snd_soc_component_get_drvdata(codec);
931		931
932	ucontrol->value.integer.value[0] = aw88081->aw_pa->prof_index;	932	ucontrol->value.integer.value[0] = aw88081->aw_pa->prof_index;
@@ -937,7 +937,7 @@ static int aw88081_profile_get(struct snd_kcontrol *kcontrol, · 4 unmodified lines
937	static int aw88081_profile_set(struct snd_kcontrol *kcontrol,	937	static int aw88081_profile_set(struct snd_kcontrol *kcontrol,
938	struct snd_ctl_elem_value *ucontrol)	938	struct snd_ctl_elem_value *ucontrol)
939	{	939	{
940	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);	940	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
941	struct aw88081 *aw88081 = snd_soc_component_get_drvdata(codec);	941	struct aw88081 *aw88081 = snd_soc_component_get_drvdata(codec);
942	int ret;	942	int ret;
943		943
@@ -963,7 +963,7 @@ static int aw88081_profile_set(struct snd_kcontrol *kcontrol, · 19 unmodified lines
963	static int aw88081_volume_get(struct snd_kcontrol *kcontrol,	963	static int aw88081_volume_get(struct snd_kcontrol *kcontrol,
964	struct snd_ctl_elem_value *ucontrol)	964	struct snd_ctl_elem_value *ucontrol)
965	{	965	{
966	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);	966	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
967	struct aw88081 *aw88081 = snd_soc_component_get_drvdata(codec);	967	struct aw88081 *aw88081 = snd_soc_component_get_drvdata(codec);
968	struct aw_volume_desc *vol_desc = &aw88081->aw_pa->volume_desc;	968	struct aw_volume_desc *vol_desc = &aw88081->aw_pa->volume_desc;
969		969
@@ -975,7 +975,7 @@ static int aw88081_volume_get(struct snd_kcontrol *kcontrol, · 5 unmodified lines
975	static int aw88081_volume_set(struct snd_kcontrol *kcontrol,	975	static int aw88081_volume_set(struct snd_kcontrol *kcontrol,
976	struct snd_ctl_elem_value *ucontrol)	976	struct snd_ctl_elem_value *ucontrol)
977	{	977	{
978	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);	978	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
979	struct aw88081 *aw88081 = snd_soc_component_get_drvdata(codec);	979	struct aw88081 *aw88081 = snd_soc_component_get_drvdata(codec);
980	struct aw_volume_desc *vol_desc = &aw88081->aw_pa->volume_desc;	980	struct aw_volume_desc *vol_desc = &aw88081->aw_pa->volume_desc;
981	struct soc_mixer_control *mc =	981	struct soc_mixer_control *mc =
@@ -1003,7 +1003,7 @@ static int aw88081_volume_set(struct snd_kcontrol *kcontrol, · 21 unmodified lines
1003	static int aw88081_get_fade_step(struct snd_kcontrol *kcontrol,	1003	static int aw88081_get_fade_step(struct snd_kcontrol *kcontrol,
1004	struct snd_ctl_elem_value *ucontrol)	1004	struct snd_ctl_elem_value *ucontrol)
1005	{	1005	{
1006	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);	1006	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
1007	struct aw88081 *aw88081 = snd_soc_component_get_drvdata(codec);	1007	struct aw88081 *aw88081 = snd_soc_component_get_drvdata(codec);
1008		1008
1009	ucontrol->value.integer.value[0] = aw88081->aw_pa->fade_step;	1009	ucontrol->value.integer.value[0] = aw88081->aw_pa->fade_step;
@@ -1014,7 +1014,7 @@ static int aw88081_get_fade_step(struct snd_kcontrol *kcontrol, · 4 unmodified lines
1014	static int aw88081_set_fade_step(struct snd_kcontrol *kcontrol,	1014	static int aw88081_set_fade_step(struct snd_kcontrol *kcontrol,
1015	struct snd_ctl_elem_value *ucontrol)	1015	struct snd_ctl_elem_value *ucontrol)
1016	{	1016	{
1017	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);	1017	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
1018	struct aw88081 *aw88081 = snd_soc_component_get_drvdata(codec);	1018	struct aw88081 *aw88081 = snd_soc_component_get_drvdata(codec);
1019	struct soc_mixer_control *mc =	1019	struct soc_mixer_control *mc =
1020	(struct soc_mixer_control *)kcontrol->private_value;	1020	(struct soc_mixer_control *)kcontrol->private_value;

@@ -75,7 +75,7 @@ static void aw88395_start(struct aw88395 *aw88395, bool sync_start) · 74 unmodified lines
75	if (sync_start == AW88395_SYNC_START)	75	if (sync_start == AW88395_SYNC_START)
76	aw88395_start_pa(aw88395);	76	aw88395_start_pa(aw88395);
77	else	77	else
78	queue_delayed_work(system_wq,	78	queue_delayed_work(system_dfl_wq,
79	&aw88395->start_work,	79	&aw88395->start_work,
80	AW88395_START_WORK_DELAY_MS);	80	AW88395_START_WORK_DELAY_MS);
81	}	81	}
@@ -104,7 +104,7 @@ static struct snd_soc_dai_driver aw88395_dai[] = { · 22 unmodified lines
104	static int aw88395_get_fade_in_time(struct snd_kcontrol *kcontrol,	104	static int aw88395_get_fade_in_time(struct snd_kcontrol *kcontrol,
105	struct snd_ctl_elem_value *ucontrol)	105	struct snd_ctl_elem_value *ucontrol)
106	{	106	{
107	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	107	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
108	struct aw88395 *aw88395 = snd_soc_component_get_drvdata(component);	108	struct aw88395 *aw88395 = snd_soc_component_get_drvdata(component);
109	struct aw_device *aw_dev = aw88395->aw_pa;	109	struct aw_device *aw_dev = aw88395->aw_pa;
110		110
@@ -116,7 +116,7 @@ static int aw88395_get_fade_in_time(struct snd_kcontrol *kcontrol, · 5 unmodified lines
116	static int aw88395_set_fade_in_time(struct snd_kcontrol *kcontrol,	116	static int aw88395_set_fade_in_time(struct snd_kcontrol *kcontrol,
117	struct snd_ctl_elem_value *ucontrol)	117	struct snd_ctl_elem_value *ucontrol)
118	{	118	{
119	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	119	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
120	struct aw88395 *aw88395 = snd_soc_component_get_drvdata(component);	120	struct aw88395 *aw88395 = snd_soc_component_get_drvdata(component);
121	struct soc_mixer_control *mc =	121	struct soc_mixer_control *mc =
122	(struct soc_mixer_control *)kcontrol->private_value;	122	(struct soc_mixer_control *)kcontrol->private_value;
@@ -139,7 +139,7 @@ static int aw88395_set_fade_in_time(struct snd_kcontrol *kcontrol, · 16 unmodified lines
139	static int aw88395_get_fade_out_time(struct snd_kcontrol *kcontrol,	139	static int aw88395_get_fade_out_time(struct snd_kcontrol *kcontrol,
140	struct snd_ctl_elem_value *ucontrol)	140	struct snd_ctl_elem_value *ucontrol)
141	{	141	{
142	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	142	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
143	struct aw88395 *aw88395 = snd_soc_component_get_drvdata(component);	143	struct aw88395 *aw88395 = snd_soc_component_get_drvdata(component);
144	struct aw_device *aw_dev = aw88395->aw_pa;	144	struct aw_device *aw_dev = aw88395->aw_pa;
145		145
@@ -151,7 +151,7 @@ static int aw88395_get_fade_out_time(struct snd_kcontrol *kcontrol, · 5 unmodified lines
151	static int aw88395_set_fade_out_time(struct snd_kcontrol *kcontrol,	151	static int aw88395_set_fade_out_time(struct snd_kcontrol *kcontrol,
152	struct snd_ctl_elem_value *ucontrol)	152	struct snd_ctl_elem_value *ucontrol)
153	{	153	{
154	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	154	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
155	struct aw88395 *aw88395 = snd_soc_component_get_drvdata(component);	155	struct aw88395 *aw88395 = snd_soc_component_get_drvdata(component);
156	struct soc_mixer_control *mc =	156	struct soc_mixer_control *mc =
157	(struct soc_mixer_control *)kcontrol->private_value;	157	(struct soc_mixer_control *)kcontrol->private_value;
@@ -173,7 +173,7 @@ static int aw88395_set_fade_out_time(struct snd_kcontrol *kcontrol, · 15 unmodified lines
173	static int aw88395_profile_info(struct snd_kcontrol *kcontrol,	173	static int aw88395_profile_info(struct snd_kcontrol *kcontrol,
174	struct snd_ctl_elem_info *uinfo)	174	struct snd_ctl_elem_info *uinfo)
175	{	175	{
176	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);	176	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
177	struct aw88395 *aw88395 = snd_soc_component_get_drvdata(codec);	177	struct aw88395 *aw88395 = snd_soc_component_get_drvdata(codec);
178	char *prof_name;	178	char *prof_name;
179	int count, ret;	179	int count, ret;
@@ -208,7 +208,7 @@ static int aw88395_profile_info(struct snd_kcontrol *kcontrol, · 28 unmodified lines
208	static int aw88395_profile_get(struct snd_kcontrol *kcontrol,	208	static int aw88395_profile_get(struct snd_kcontrol *kcontrol,
209	struct snd_ctl_elem_value *ucontrol)	209	struct snd_ctl_elem_value *ucontrol)
210	{	210	{
211	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);	211	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
212	struct aw88395 *aw88395 = snd_soc_component_get_drvdata(codec);	212	struct aw88395 *aw88395 = snd_soc_component_get_drvdata(codec);
213		213
214	ucontrol->value.integer.value[0] = aw88395_dev_get_profile_index(aw88395->aw_pa);	214	ucontrol->value.integer.value[0] = aw88395_dev_get_profile_index(aw88395->aw_pa);
@@ -219,7 +219,7 @@ static int aw88395_profile_get(struct snd_kcontrol *kcontrol, · 4 unmodified lines
219	static int aw88395_profile_set(struct snd_kcontrol *kcontrol,	219	static int aw88395_profile_set(struct snd_kcontrol *kcontrol,
220	struct snd_ctl_elem_value *ucontrol)	220	struct snd_ctl_elem_value *ucontrol)
221	{	221	{
222	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);	222	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
223	struct aw88395 *aw88395 = snd_soc_component_get_drvdata(codec);	223	struct aw88395 *aw88395 = snd_soc_component_get_drvdata(codec);
224	int ret;	224	int ret;
225		225
@@ -245,7 +245,7 @@ static int aw88395_profile_set(struct snd_kcontrol *kcontrol, · 19 unmodified lines
245	static int aw88395_volume_get(struct snd_kcontrol *kcontrol,	245	static int aw88395_volume_get(struct snd_kcontrol *kcontrol,
246	struct snd_ctl_elem_value *ucontrol)	246	struct snd_ctl_elem_value *ucontrol)
247	{	247	{
248	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);	248	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
249	struct aw88395 *aw88395 = snd_soc_component_get_drvdata(codec);	249	struct aw88395 *aw88395 = snd_soc_component_get_drvdata(codec);
250	struct aw_volume_desc *vol_desc = &aw88395->aw_pa->volume_desc;	250	struct aw_volume_desc *vol_desc = &aw88395->aw_pa->volume_desc;
251		251
@@ -257,7 +257,7 @@ static int aw88395_volume_get(struct snd_kcontrol *kcontrol, · 5 unmodified lines
257	static int aw88395_volume_set(struct snd_kcontrol *kcontrol,	257	static int aw88395_volume_set(struct snd_kcontrol *kcontrol,
258	struct snd_ctl_elem_value *ucontrol)	258	struct snd_ctl_elem_value *ucontrol)
259	{	259	{
260	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);	260	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
261	struct aw88395 *aw88395 = snd_soc_component_get_drvdata(codec);	261	struct aw88395 *aw88395 = snd_soc_component_get_drvdata(codec);
262	struct aw_volume_desc *vol_desc = &aw88395->aw_pa->volume_desc;	262	struct aw_volume_desc *vol_desc = &aw88395->aw_pa->volume_desc;
263	struct soc_mixer_control *mc =	263	struct soc_mixer_control *mc =
@@ -281,7 +281,7 @@ static int aw88395_volume_set(struct snd_kcontrol *kcontrol, · 17 unmodified lines
281	static int aw88395_get_fade_step(struct snd_kcontrol *kcontrol,	281	static int aw88395_get_fade_step(struct snd_kcontrol *kcontrol,
282	struct snd_ctl_elem_value *ucontrol)	282	struct snd_ctl_elem_value *ucontrol)
283	{	283	{
284	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);	284	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
285	struct aw88395 *aw88395 = snd_soc_component_get_drvdata(codec);	285	struct aw88395 *aw88395 = snd_soc_component_get_drvdata(codec);
286		286
287	ucontrol->value.integer.value[0] = aw88395->aw_pa->fade_step;	287	ucontrol->value.integer.value[0] = aw88395->aw_pa->fade_step;
@@ -292,7 +292,7 @@ static int aw88395_get_fade_step(struct snd_kcontrol *kcontrol, · 4 unmodified lines
292	static int aw88395_set_fade_step(struct snd_kcontrol *kcontrol,	292	static int aw88395_set_fade_step(struct snd_kcontrol *kcontrol,
293	struct snd_ctl_elem_value *ucontrol)	293	struct snd_ctl_elem_value *ucontrol)
294	{	294	{
295	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);	295	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
296	struct aw88395 *aw88395 = snd_soc_component_get_drvdata(codec);	296	struct aw88395 *aw88395 = snd_soc_component_get_drvdata(codec);
297	struct soc_mixer_control *mc =	297	struct soc_mixer_control *mc =
298	(struct soc_mixer_control *)kcontrol->private_value;	298	(struct soc_mixer_control *)kcontrol->private_value;
@@ -313,7 +313,7 @@ static int aw88395_set_fade_step(struct snd_kcontrol *kcontrol, · 14 unmodified lines
313	static int aw88395_re_get(struct snd_kcontrol *kcontrol,	313	static int aw88395_re_get(struct snd_kcontrol *kcontrol,
314	struct snd_ctl_elem_value *ucontrol)	314	struct snd_ctl_elem_value *ucontrol)
315	{	315	{
316	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);	316	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
317	struct aw88395 *aw88395 = snd_soc_component_get_drvdata(codec);	317	struct aw88395 *aw88395 = snd_soc_component_get_drvdata(codec);
318	struct aw_device *aw_dev = aw88395->aw_pa;	318	struct aw_device *aw_dev = aw88395->aw_pa;
319		319
@@ -325,7 +325,7 @@ static int aw88395_re_get(struct snd_kcontrol *kcontrol, · 5 unmodified lines
325	static int aw88395_re_set(struct snd_kcontrol *kcontrol,	325	static int aw88395_re_set(struct snd_kcontrol *kcontrol,
326	struct snd_ctl_elem_value *ucontrol)	326	struct snd_ctl_elem_value *ucontrol)
327	{	327	{
328	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);	328	struct snd_soc_component *codec = snd_kcontrol_chip(kcontrol);
329	struct aw88395 *aw88395 = snd_soc_component_get_drvdata(codec);	329	struct aw88395 *aw88395 = snd_soc_component_get_drvdata(codec);
330	struct soc_mixer_control *mc =	330	struct soc_mixer_control *mc =
331	(struct soc_mixer_control *)kcontrol->private_value;	331	(struct soc_mixer_control *)kcontrol->private_value;
@@ -401,7 +401,7 @@ static const struct snd_soc_dapm_route aw88395_audio_map[] = { · 69 unmodified lines
401		401
402	static int aw88395_codec_probe(struct snd_soc_component *component)	402	static int aw88395_codec_probe(struct snd_soc_component *component)
403	{	403	{
404	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	404	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
405	struct aw88395 *aw88395 = snd_soc_component_get_drvdata(component);	405	struct aw88395 *aw88395 = snd_soc_component_get_drvdata(component);
406	int ret;	406	int ret;
407		407

@@ -300,7 +300,7 @@ irqreturn_t cs42l43_bias_detect_clamp(int irq, void *data) · 299 unmodified lines
300	{	300	{
301	struct cs42l43_codec *priv = data;	301	struct cs42l43_codec *priv = data;
302		302
303	queue_delayed_work(system_wq, &priv->bias_sense_timeout,	303	queue_delayed_work(system_dfl_wq, &priv->bias_sense_timeout,
304	msecs_to_jiffies(1000));	304	msecs_to_jiffies(1000));
305		305
306	return IRQ_HANDLED;	306	return IRQ_HANDLED;
@@ -502,7 +502,7 @@ static void cs42l43_start_load_detect(struct cs42l43_codec *priv) · 195 unmodified lines
502		502
503	dev_dbg(priv->dev, "Start load detect\n");	503	dev_dbg(priv->dev, "Start load detect\n");
504		504
505	snd_soc_dapm_mutex_lock(snd_soc_component_get_dapm(priv->component));	505	snd_soc_dapm_mutex_lock(snd_soc_component_to_dapm(priv->component));
506		506
507	priv->load_detect_running = true;	507	priv->load_detect_running = true;
508		508
@@ -539,7 +539,7 @@ static void cs42l43_start_load_detect(struct cs42l43_codec *priv) · 30 unmodified lines
539	CS42L43_HPLOAD_DET_EN_MASK,	539	CS42L43_HPLOAD_DET_EN_MASK,
540	CS42L43_HPLOAD_DET_EN_MASK);	540	CS42L43_HPLOAD_DET_EN_MASK);
541		541
542	snd_soc_dapm_mutex_unlock(snd_soc_component_get_dapm(priv->component));	542	snd_soc_dapm_mutex_unlock(snd_soc_component_to_dapm(priv->component));
543	}	543	}
544		544
545	static void cs42l43_stop_load_detect(struct cs42l43_codec *priv)	545	static void cs42l43_stop_load_detect(struct cs42l43_codec *priv)
@@ -548,7 +548,7 @@ static void cs42l43_stop_load_detect(struct cs42l43_codec *priv) · 2 unmodified lines
548		548
549	dev_dbg(priv->dev, "Stop load detect\n");	549	dev_dbg(priv->dev, "Stop load detect\n");
550		550
551	snd_soc_dapm_mutex_lock(snd_soc_component_get_dapm(priv->component));	551	snd_soc_dapm_mutex_lock(snd_soc_component_to_dapm(priv->component));
552		552
553	regmap_update_bits(cs42l43->regmap, CS42L43_LOADDETENA,	553	regmap_update_bits(cs42l43->regmap, CS42L43_LOADDETENA,
554	CS42L43_HPLOAD_DET_EN_MASK, 0);	554	CS42L43_HPLOAD_DET_EN_MASK, 0);
@@ -587,7 +587,7 @@ static void cs42l43_stop_load_detect(struct cs42l43_codec *priv) · 32 unmodified lines
587		587
588	priv->load_detect_running = false;	588	priv->load_detect_running = false;
589		589
590	snd_soc_dapm_mutex_unlock(snd_soc_component_get_dapm(priv->component));	590	snd_soc_dapm_mutex_unlock(snd_soc_component_to_dapm(priv->component));
591	}	591	}
592		592
593	static int cs42l43_run_load_detect(struct cs42l43_codec *priv, bool mic)	593	static int cs42l43_run_load_detect(struct cs42l43_codec *priv, bool mic)
@@ -866,7 +866,7 @@ SOC_ENUM_SINGLE_VIRT_DECL(cs42l43_jack_enum, cs42l43_jack_text); · 272 unmodified lines
866		866
867	int cs42l43_jack_get(struct snd_kcontrol kcontrol, struct snd_ctl_elem_value ucontrol)	867	int cs42l43_jack_get(struct snd_kcontrol kcontrol, struct snd_ctl_elem_value ucontrol)
868	{	868	{
869	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	869	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
870	struct cs42l43_codec *priv = snd_soc_component_get_drvdata(component);	870	struct cs42l43_codec *priv = snd_soc_component_get_drvdata(component);
871		871
872	mutex_lock(&priv->jack_lock);	872	mutex_lock(&priv->jack_lock);
@@ -878,7 +878,7 @@ int cs42l43_jack_get(struct snd_kcontrol kcontrol, struct snd_ctl_elem_value u · 5 unmodified lines
878		878
879	int cs42l43_jack_put(struct snd_kcontrol kcontrol, struct snd_ctl_elem_value ucontrol)	879	int cs42l43_jack_put(struct snd_kcontrol kcontrol, struct snd_ctl_elem_value ucontrol)
880	{	880	{
881	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	881	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
882	struct cs42l43_codec *priv = snd_soc_component_get_drvdata(component);	882	struct cs42l43_codec *priv = snd_soc_component_get_drvdata(component);
883	struct cs42l43 *cs42l43 = priv->core;	883	struct cs42l43 *cs42l43 = priv->core;
884	struct soc_enum e = (struct soc_enum )kcontrol->private_value;	884	struct soc_enum e = (struct soc_enum )kcontrol->private_value;

@@ -154,14 +154,14 @@ static void cs42l43_hp_ilimit_clear_work(struct work_struct *work) · 153 unmodified lines
154	{	154	{
155	struct cs42l43_codec *priv = container_of(work, struct cs42l43_codec,	155	struct cs42l43_codec *priv = container_of(work, struct cs42l43_codec,
156	hp_ilimit_clear_work.work);	156	hp_ilimit_clear_work.work);
157	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(priv->component);	157	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(priv->component);
158		158
159	snd_soc_dapm_mutex_lock(dapm);	159	snd_soc_dapm_mutex_lock(dapm);
160		160
161	priv->hp_ilimit_count--;	161	priv->hp_ilimit_count--;
162		162
163	if (priv->hp_ilimit_count)	163	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,
165	msecs_to_jiffies(CS42L43_HP_ILIMIT_DECAY_MS));	165	msecs_to_jiffies(CS42L43_HP_ILIMIT_DECAY_MS));
166		166
167	snd_soc_dapm_mutex_unlock(dapm);	167	snd_soc_dapm_mutex_unlock(dapm);
@@ -170,7 +170,7 @@ static void cs42l43_hp_ilimit_clear_work(struct work_struct *work) · 2 unmodified lines
170	static irqreturn_t cs42l43_hp_ilimit(int irq, void *data)	170	static irqreturn_t cs42l43_hp_ilimit(int irq, void *data)
171	{	171	{
172	struct cs42l43_codec *priv = data;	172	struct cs42l43_codec *priv = data;
173	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(priv->component);	173	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(priv->component);
174	struct cs42l43 *cs42l43 = priv->core;	174	struct cs42l43 *cs42l43 = priv->core;
175		175
176	dev_dbg(priv->dev, "headphone ilimit IRQ\n");	176	dev_dbg(priv->dev, "headphone ilimit IRQ\n");
@@ -179,7 +179,7 @@ static irqreturn_t cs42l43_hp_ilimit(int irq, void *data) · 2 unmodified lines
179		179
180	if (priv->hp_ilimit_count < CS42L43_HP_ILIMIT_MAX_COUNT) {	180	if (priv->hp_ilimit_count < CS42L43_HP_ILIMIT_MAX_COUNT) {
181	if (!priv->hp_ilimit_count)	181	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,
183	msecs_to_jiffies(CS42L43_HP_ILIMIT_DECAY_MS));	183	msecs_to_jiffies(CS42L43_HP_ILIMIT_DECAY_MS));
184		184
185	priv->hp_ilimit_count++;	185	priv->hp_ilimit_count++;
@@ -451,7 +451,7 @@ static int cs42l43_asp_hw_params(struct snd_pcm_substream *substream, · 265 unmodified lines
451	static int cs42l43_asp_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)	451	static int cs42l43_asp_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
452	{	452	{
453	struct snd_soc_component *component = dai->component;	453	struct snd_soc_component *component = dai->component;
454	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	454	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
455	struct cs42l43_codec *priv = snd_soc_component_get_drvdata(component);	455	struct cs42l43_codec *priv = snd_soc_component_get_drvdata(component);
456	struct cs42l43 *cs42l43 = priv->core;	456	struct cs42l43 *cs42l43 = priv->core;
457	int provider = regmap_test_bits(cs42l43->regmap, CS42L43_ASP_CLK_CONFIG2,	457	int provider = regmap_test_bits(cs42l43->regmap, CS42L43_ASP_CLK_CONFIG2,
@@ -949,8 +949,8 @@ CS42L43_DECL_MIXER(amp4, CS42L43_AMP4MIX_INPUT1); · 491 unmodified lines
949	static int cs42l43_dapm_get_volsw(struct snd_kcontrol *kcontrol,	949	static int cs42l43_dapm_get_volsw(struct snd_kcontrol *kcontrol,
950	struct snd_ctl_elem_value *ucontrol)	950	struct snd_ctl_elem_value *ucontrol)
951	{	951	{
952	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	952	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
953	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	953	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
954	int ret;	954	int ret;
955		955
956	snd_soc_dapm_mutex_lock(dapm);	956	snd_soc_dapm_mutex_lock(dapm);
@@ -963,8 +963,8 @@ static int cs42l43_dapm_get_volsw(struct snd_kcontrol *kcontrol, · 6 unmodified lines
963	static int cs42l43_dapm_put_volsw(struct snd_kcontrol *kcontrol,	963	static int cs42l43_dapm_put_volsw(struct snd_kcontrol *kcontrol,
964	struct snd_ctl_elem_value *ucontrol)	964	struct snd_ctl_elem_value *ucontrol)
965	{	965	{
966	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	966	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
967	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	967	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
968	int ret;	968	int ret;
969		969
970	snd_soc_dapm_mutex_lock(dapm);	970	snd_soc_dapm_mutex_lock(dapm);
@@ -977,8 +977,8 @@ static int cs42l43_dapm_put_volsw(struct snd_kcontrol *kcontrol, · 6 unmodified lines
977	static int cs42l43_dapm_get_enum(struct snd_kcontrol *kcontrol,	977	static int cs42l43_dapm_get_enum(struct snd_kcontrol *kcontrol,
978	struct snd_ctl_elem_value *ucontrol)	978	struct snd_ctl_elem_value *ucontrol)
979	{	979	{
980	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	980	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
981	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	981	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
982	int ret;	982	int ret;
983		983
984	snd_soc_dapm_mutex_lock(dapm);	984	snd_soc_dapm_mutex_lock(dapm);
@@ -991,8 +991,8 @@ static int cs42l43_dapm_get_enum(struct snd_kcontrol *kcontrol, · 6 unmodified lines
991	static int cs42l43_dapm_put_enum(struct snd_kcontrol *kcontrol,	991	static int cs42l43_dapm_put_enum(struct snd_kcontrol *kcontrol,
992	struct snd_ctl_elem_value *ucontrol)	992	struct snd_ctl_elem_value *ucontrol)
993	{	993	{
994	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	994	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
995	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	995	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
996	int ret;	996	int ret;
997		997
998	snd_soc_dapm_mutex_lock(dapm);	998	snd_soc_dapm_mutex_lock(dapm);
@@ -1005,7 +1005,7 @@ static int cs42l43_dapm_put_enum(struct snd_kcontrol *kcontrol, · 6 unmodified lines
1005	static int cs42l43_eq_get(struct snd_kcontrol *kcontrol,	1005	static int cs42l43_eq_get(struct snd_kcontrol *kcontrol,
1006	struct snd_ctl_elem_value *ucontrol)	1006	struct snd_ctl_elem_value *ucontrol)
1007	{	1007	{
1008	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	1008	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
1009	struct cs42l43_codec *priv = snd_soc_component_get_drvdata(component);	1009	struct cs42l43_codec *priv = snd_soc_component_get_drvdata(component);
1010		1010
1011	memcpy(ucontrol->value.integer.value, priv->eq_coeffs, sizeof(priv->eq_coeffs));	1011	memcpy(ucontrol->value.integer.value, priv->eq_coeffs, sizeof(priv->eq_coeffs));
@@ -1016,8 +1016,8 @@ static int cs42l43_eq_get(struct snd_kcontrol *kcontrol, · 4 unmodified lines
1016	static int cs42l43_eq_put(struct snd_kcontrol *kcontrol,	1016	static int cs42l43_eq_put(struct snd_kcontrol *kcontrol,
1017	struct snd_ctl_elem_value *ucontrol)	1017	struct snd_ctl_elem_value *ucontrol)
1018	{	1018	{
1019	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	1019	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
1020	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	1020	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
1021	struct cs42l43_codec *priv = snd_soc_component_get_drvdata(component);	1021	struct cs42l43_codec *priv = snd_soc_component_get_drvdata(component);
1022		1022
1023	snd_soc_dapm_mutex_lock(dapm);	1023	snd_soc_dapm_mutex_lock(dapm);
@@ -1088,7 +1088,7 @@ error: · 64 unmodified lines
1088	static int cs42l43_decim_get(struct snd_kcontrol *kcontrol,	1088	static int cs42l43_decim_get(struct snd_kcontrol *kcontrol,
1089	struct snd_ctl_elem_value *ucontrol)	1089	struct snd_ctl_elem_value *ucontrol)
1090	{	1090	{
1091	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	1091	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
1092	struct cs42l43_codec *priv = snd_soc_component_get_drvdata(component);	1092	struct cs42l43_codec *priv = snd_soc_component_get_drvdata(component);
1093	int ret;	1093	int ret;
1094		1094
@@ -1104,7 +1104,7 @@ static int cs42l43_decim_get(struct snd_kcontrol *kcontrol, · 9 unmodified lines
1104	static int cs42l43_spk_get(struct snd_kcontrol *kcontrol,	1104	static int cs42l43_spk_get(struct snd_kcontrol *kcontrol,
1105	struct snd_ctl_elem_value *ucontrol)	1105	struct snd_ctl_elem_value *ucontrol)
1106	{	1106	{
1107	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	1107	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
1108	struct cs42l43_codec *priv = snd_soc_component_get_drvdata(component);	1108	struct cs42l43_codec *priv = snd_soc_component_get_drvdata(component);
1109	int ret;	1109	int ret;
1110		1110
@@ -1120,7 +1120,7 @@ static int cs42l43_spk_get(struct snd_kcontrol *kcontrol, · 9 unmodified lines
1120	static int cs42l43_spk_put(struct snd_kcontrol *kcontrol,	1120	static int cs42l43_spk_put(struct snd_kcontrol *kcontrol,
1121	struct snd_ctl_elem_value *ucontrol)	1121	struct snd_ctl_elem_value *ucontrol)
1122	{	1122	{
1123	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	1123	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
1124	struct cs42l43_codec *priv = snd_soc_component_get_drvdata(component);	1124	struct cs42l43_codec *priv = snd_soc_component_get_drvdata(component);
1125	int ret;	1125	int ret;
1126		1126

@@ -57,7 +57,7 @@ struct cs42l51_private { · 56 unmodified lines
57	static int cs42l51_get_chan_mix(struct snd_kcontrol *kcontrol,	57	static int cs42l51_get_chan_mix(struct snd_kcontrol *kcontrol,
58	struct snd_ctl_elem_value *ucontrol)	58	struct snd_ctl_elem_value *ucontrol)
59	{	59	{
60	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	60	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
61	unsigned long value = snd_soc_component_read(component, CS42L51_PCM_MIXER)&3;	61	unsigned long value = snd_soc_component_read(component, CS42L51_PCM_MIXER)&3;
62		62
63	switch (value) {	63	switch (value) {
@@ -85,7 +85,7 @@ static int cs42l51_get_chan_mix(struct snd_kcontrol *kcontrol, · 21 unmodified lines
85	static int cs42l51_set_chan_mix(struct snd_kcontrol *kcontrol,	85	static int cs42l51_set_chan_mix(struct snd_kcontrol *kcontrol,
86	struct snd_ctl_elem_value *ucontrol)	86	struct snd_ctl_elem_value *ucontrol)
87	{	87	{
88	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	88	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
89	unsigned char val;	89	unsigned char val;
90		90
91	switch (ucontrol->value.enumerated.item[0]) {	91	switch (ucontrol->value.enumerated.item[0]) {
@@ -567,7 +567,7 @@ static int cs42l51_component_probe(struct snd_soc_component *component) · 475 unmodified lines
567	struct cs42l51_private *cs42l51;	567	struct cs42l51_private *cs42l51;
568		568
569	cs42l51 = snd_soc_component_get_drvdata(component);	569	cs42l51 = snd_soc_component_get_drvdata(component);
570	dapm = snd_soc_component_get_dapm(component);	570	dapm = snd_soc_component_to_dapm(component);
571		571
572	if (cs42l51->mclk_handle)	572	if (cs42l51->mclk_handle)
573	snd_soc_dapm_new_controls(dapm, cs42l51_dapm_mclk_widgets, 1);	573	snd_soc_dapm_new_controls(dapm, cs42l51_dapm_mclk_widgets, 1);

@@ -231,7 +231,7 @@ static_assert(ARRAY_SIZE(cs48l32_rate_val) == ARRAY_SIZE(cs48l32_rate_text)); · 230 unmodified lines
231		231
232	static int cs48l32_rate_put(struct snd_kcontrol kcontrol, struct snd_ctl_elem_value ucontrol)	232	static int cs48l32_rate_put(struct snd_kcontrol kcontrol, struct snd_ctl_elem_value ucontrol)
233	{	233	{
234	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	234	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
235	struct cs48l32_codec *cs48l32_codec = snd_soc_component_get_drvdata(component);	235	struct cs48l32_codec *cs48l32_codec = snd_soc_component_get_drvdata(component);
236	int ret;	236	int ret;
237		237
@@ -320,8 +320,8 @@ static const struct soc_enum cs48l32_sample_rate[] = { · 82 unmodified lines
320	static int cs48l32_inmux_put(struct snd_kcontrol *kcontrol,	320	static int cs48l32_inmux_put(struct snd_kcontrol *kcontrol,
321	struct snd_ctl_elem_value *ucontrol)	321	struct snd_ctl_elem_value *ucontrol)
322	{	322	{
323	struct snd_soc_component *component = snd_soc_dapm_kcontrol_component(kcontrol);	323	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol);
324	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kcontrol);	324	struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
325	struct cs48l32_codec *cs48l32_codec = snd_soc_component_get_drvdata(component);	325	struct cs48l32_codec *cs48l32_codec = snd_soc_component_get_drvdata(component);
326	struct soc_enum e = (struct soc_enum ) kcontrol->private_value;	326	struct soc_enum e = (struct soc_enum ) kcontrol->private_value;
327	unsigned int mux, src_val, in_type;	327	unsigned int mux, src_val, in_type;
@@ -347,7 +347,7 @@ static int cs48l32_inmux_put(struct snd_kcontrol *kcontrol, · 19 unmodified lines
347	if (in_type == CS48L32_IN_TYPE_SE)	347	if (in_type == CS48L32_IN_TYPE_SE)
348	src_val \|= 1 << CS48L32_INx_SRC_SHIFT;	348	src_val \|= 1 << CS48L32_INx_SRC_SHIFT;
349		349
350	ret = snd_soc_component_update_bits(dapm->component,	350	ret = snd_soc_component_update_bits(component,
351	e->reg,	351	e->reg,
352	CS48L32_INx_SRC_MASK,	352	CS48L32_INx_SRC_MASK,
353	src_val);	353	src_val);
@@ -385,7 +385,7 @@ static const char * const cs48l32_dmode_texts[] = { · 31 unmodified lines
385	static int cs48l32_dmode_put(struct snd_kcontrol *kcontrol,	385	static int cs48l32_dmode_put(struct snd_kcontrol *kcontrol,
386	struct snd_ctl_elem_value *ucontrol)	386	struct snd_ctl_elem_value *ucontrol)
387	{	387	{
388	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kcontrol);	388	struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol);
389	struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);	389	struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
390	struct soc_enum e = (struct soc_enum ) kcontrol->private_value;	390	struct soc_enum e = (struct soc_enum ) kcontrol->private_value;
391	unsigned int mode;	391	unsigned int mode;
@@ -704,8 +704,8 @@ static bool cs48l32_is_input_enabled(struct snd_soc_component *component, · 312 unmodified lines
704	static int cs48l32_in_rate_put(struct snd_kcontrol *kcontrol,	704	static int cs48l32_in_rate_put(struct snd_kcontrol *kcontrol,
705	struct snd_ctl_elem_value *ucontrol)	705	struct snd_ctl_elem_value *ucontrol)
706	{	706	{
707	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	707	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
708	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	708	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
709	struct soc_enum e = (struct soc_enum )kcontrol->private_value;	709	struct soc_enum e = (struct soc_enum )kcontrol->private_value;
710	int ret;	710	int ret;
711		711
@@ -755,8 +755,8 @@ static int cs48l32_low_power_mode_put(struct snd_kcontrol *kcontrol, · 43 unmodified lines
755	struct snd_ctl_elem_value *ucontrol)	755	struct snd_ctl_elem_value *ucontrol)
756	{	756	{
757	struct soc_mixer_control mc = (struct soc_mixer_control )kcontrol->private_value;	757	struct soc_mixer_control mc = (struct soc_mixer_control )kcontrol->private_value;
758	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	758	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
759	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	759	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
760	int ret;	760	int ret;
761		761
762	snd_soc_dapm_mutex_lock(dapm);	762	snd_soc_dapm_mutex_lock(dapm);
@@ -912,7 +912,7 @@ static const struct soc_enum cs48l32_lhpf_mode[] = { · 149 unmodified lines
912	static int cs48l32_lhpf_coeff_put(struct snd_kcontrol *kcontrol,	912	static int cs48l32_lhpf_coeff_put(struct snd_kcontrol *kcontrol,
913	struct snd_ctl_elem_value *ucontrol)	913	struct snd_ctl_elem_value *ucontrol)
914	{	914	{
915	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	915	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
916	struct cs48l32_codec *cs48l32_codec = snd_soc_component_get_drvdata(component);	916	struct cs48l32_codec *cs48l32_codec = snd_soc_component_get_drvdata(component);
917	__be32 data = (__be32 )ucontrol->value.bytes.data;	917	__be32 data = (__be32 )ucontrol->value.bytes.data;
918	s16 val = (s16)be32_to_cpu(*data);	918	s16 val = (s16)be32_to_cpu(*data);
@@ -947,7 +947,7 @@ static const struct soc_enum cs48l32_eq_mode[] = { · 28 unmodified lines
947	static int cs48l32_eq_mode_get(struct snd_kcontrol *kcontrol,	947	static int cs48l32_eq_mode_get(struct snd_kcontrol *kcontrol,
948	struct snd_ctl_elem_value *ucontrol)	948	struct snd_ctl_elem_value *ucontrol)
949	{	949	{
950	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	950	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
951	struct cs48l32_codec *cs48l32_codec = snd_soc_component_get_drvdata(component);	951	struct cs48l32_codec *cs48l32_codec = snd_soc_component_get_drvdata(component);
952	struct soc_enum e = (struct soc_enum ) kcontrol->private_value;	952	struct soc_enum e = (struct soc_enum ) kcontrol->private_value;
953	unsigned int item;	953	unsigned int item;
@@ -961,8 +961,8 @@ static int cs48l32_eq_mode_get(struct snd_kcontrol *kcontrol, · 7 unmodified lines
961	static int cs48l32_eq_mode_put(struct snd_kcontrol *kcontrol,	961	static int cs48l32_eq_mode_put(struct snd_kcontrol *kcontrol,
962	struct snd_ctl_elem_value *ucontrol)	962	struct snd_ctl_elem_value *ucontrol)
963	{	963	{
964	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	964	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
965	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	965	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
966	struct cs48l32_codec *cs48l32_codec = snd_soc_component_get_drvdata(component);	966	struct cs48l32_codec *cs48l32_codec = snd_soc_component_get_drvdata(component);
967	struct soc_enum e = (struct soc_enum ) kcontrol->private_value;	967	struct soc_enum e = (struct soc_enum ) kcontrol->private_value;
968	unsigned int *item = ucontrol->value.enumerated.item;	968	unsigned int *item = ucontrol->value.enumerated.item;
@@ -1000,7 +1000,7 @@ static int cs48l32_eq_coeff_info(struct snd_kcontrol *kcontrol, · 31 unmodified lines
1000	static int cs48l32_eq_coeff_get(struct snd_kcontrol *kcontrol,	1000	static int cs48l32_eq_coeff_get(struct snd_kcontrol *kcontrol,
1001	struct snd_ctl_elem_value *ucontrol)	1001	struct snd_ctl_elem_value *ucontrol)
1002	{	1002	{
1003	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	1003	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
1004	struct cs48l32_codec *cs48l32_codec = snd_soc_component_get_drvdata(component);	1004	struct cs48l32_codec *cs48l32_codec = snd_soc_component_get_drvdata(component);
1005	struct cs48l32_eq_control params = (void )kcontrol->private_value;	1005	struct cs48l32_eq_control params = (void )kcontrol->private_value;
1006	__be16 *coeffs;	1006	__be16 *coeffs;
@@ -1025,8 +1025,8 @@ static int cs48l32_eq_coeff_get(struct snd_kcontrol *kcontrol, · 18 unmodified lines
1025	static int cs48l32_eq_coeff_put(struct snd_kcontrol *kcontrol,	1025	static int cs48l32_eq_coeff_put(struct snd_kcontrol *kcontrol,
1026	struct snd_ctl_elem_value *ucontrol)	1026	struct snd_ctl_elem_value *ucontrol)
1027	{	1027	{
1028	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	1028	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
1029	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	1029	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
1030	struct cs48l32_codec *cs48l32_codec = snd_soc_component_get_drvdata(component);	1030	struct cs48l32_codec *cs48l32_codec = snd_soc_component_get_drvdata(component);
1031	struct cs48l32_eq_control params = (void )kcontrol->private_value;	1031	struct cs48l32_eq_control params = (void )kcontrol->private_value;
1032	__be16 *coeffs;	1032	__be16 *coeffs;
@@ -1062,7 +1062,7 @@ static const struct snd_kcontrol_new cs48l32_dsp_trigger_output_mux[] = { · 29 unmodified lines
1062	static int cs48l32_dsp_rate_get(struct snd_kcontrol *kcontrol,	1062	static int cs48l32_dsp_rate_get(struct snd_kcontrol *kcontrol,
1063	struct snd_ctl_elem_value *ucontrol)	1063	struct snd_ctl_elem_value *ucontrol)
1064	{	1064	{
1065	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	1065	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
1066	struct cs48l32_codec *cs48l32_codec = snd_soc_component_get_drvdata(component);	1066	struct cs48l32_codec *cs48l32_codec = snd_soc_component_get_drvdata(component);
1067	struct soc_enum e = (struct soc_enum ) kcontrol->private_value;	1067	struct soc_enum e = (struct soc_enum ) kcontrol->private_value;
1068	unsigned int cached_rate;	1068	unsigned int cached_rate;
@@ -1082,8 +1082,8 @@ static int cs48l32_dsp_rate_get(struct snd_kcontrol *kcontrol, · 13 unmodified lines
1082	static int cs48l32_dsp_rate_put(struct snd_kcontrol *kcontrol,	1082	static int cs48l32_dsp_rate_put(struct snd_kcontrol *kcontrol,
1083	struct snd_ctl_elem_value *ucontrol)	1083	struct snd_ctl_elem_value *ucontrol)
1084	{	1084	{
1085	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	1085	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
1086	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	1086	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
1087	struct cs48l32_codec *cs48l32_codec = snd_soc_component_get_drvdata(component);	1087	struct cs48l32_codec *cs48l32_codec = snd_soc_component_get_drvdata(component);
1088	struct soc_enum e = (struct soc_enum ) kcontrol->private_value;	1088	struct soc_enum e = (struct soc_enum ) kcontrol->private_value;
1089	const unsigned int rate_num = e->mask;	1089	const unsigned int rate_num = e->mask;
@@ -2465,7 +2465,7 @@ static int cs48l32_in_ev(struct snd_soc_dapm_widget w, struct snd_kcontrol kco · 1375 unmodified lines
2465	static int cs48l32_in_put_volsw(struct snd_kcontrol *kcontrol,	2465	static int cs48l32_in_put_volsw(struct snd_kcontrol *kcontrol,
2466	struct snd_ctl_elem_value *ucontrol)	2466	struct snd_ctl_elem_value *ucontrol)
2467	{	2467	{
2468	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	2468	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
2469	struct cs48l32_codec *cs48l32_codec = snd_soc_component_get_drvdata(component);	2469	struct cs48l32_codec *cs48l32_codec = snd_soc_component_get_drvdata(component);
2470	int ret;	2470	int ret;
2471		2471

@@ -53,7 +53,7 @@ static void da7219_aad_btn_det_work(struct work_struct *work) · 52 unmodified lines
53	struct da7219_aad_priv *da7219_aad =	53	struct da7219_aad_priv *da7219_aad =
54	container_of(work, struct da7219_aad_priv, btn_det_work);	54	container_of(work, struct da7219_aad_priv, btn_det_work);
55	struct snd_soc_component *component = da7219_aad->component;	55	struct snd_soc_component *component = da7219_aad->component;
56	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	56	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
57	struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component);	57	struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component);
58	u8 statusa, micbias_ctrl;	58	u8 statusa, micbias_ctrl;
59	bool micbias_up = false;	59	bool micbias_up = false;
@@ -109,7 +109,7 @@ static void da7219_aad_hptest_work(struct work_struct *work) · 49 unmodified lines
109	struct da7219_aad_priv *da7219_aad =	109	struct da7219_aad_priv *da7219_aad =
110	container_of(work, struct da7219_aad_priv, hptest_work);	110	container_of(work, struct da7219_aad_priv, hptest_work);
111	struct snd_soc_component *component = da7219_aad->component;	111	struct snd_soc_component *component = da7219_aad->component;
112	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	112	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
113	struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component);	113	struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component);
114		114
115	__le16 tonegen_freq_hptest;	115	__le16 tonegen_freq_hptest;
@@ -351,7 +351,7 @@ static irqreturn_t da7219_aad_irq_thread(int irq, void *data) · 235 unmodified lines
351	{	351	{
352	struct da7219_aad_priv *da7219_aad = data;	352	struct da7219_aad_priv *da7219_aad = data;
353	struct snd_soc_component *component = da7219_aad->component;	353	struct snd_soc_component *component = da7219_aad->component;
354	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	354	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
355	struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component);	355	struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component);
356	u8 events[DA7219_AAD_IRQ_REG_MAX];	356	u8 events[DA7219_AAD_IRQ_REG_MAX];
357	u8 statusa;	357	u8 statusa;
@@ -928,7 +928,7 @@ void da7219_aad_suspend(struct snd_soc_component *component) · 570 unmodified lines
928	{	928	{
929	struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component);	929	struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component);
930	struct da7219_aad_priv *da7219_aad = da7219->aad;	930	struct da7219_aad_priv *da7219_aad = da7219->aad;
931	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	931	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
932	u8 micbias_ctrl;	932	u8 micbias_ctrl;
933		933
934	disable_irq(da7219_aad->irq);	934	disable_irq(da7219_aad->irq);
@@ -962,7 +962,7 @@ void da7219_aad_resume(struct snd_soc_component *component) · 27 unmodified lines
962	{	962	{
963	struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component);	963	struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component);
964	struct da7219_aad_priv *da7219_aad = da7219->aad;	964	struct da7219_aad_priv *da7219_aad = da7219->aad;
965	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	965	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
966		966
967	if (da7219_aad->jack) {	967	if (da7219_aad->jack) {
968	/* Re-enable micbias if previously enabled for 4-pole jack */	968	/* Re-enable micbias if previously enabled for 4-pole jack */

@@ -402,7 +402,7 @@ static int idt821034_kctrl_gain_get(struct snd_kcontrol *kcontrol, · 401 unmodified lines
402	struct snd_ctl_elem_value *ucontrol)	402	struct snd_ctl_elem_value *ucontrol)
403	{	403	{
404	struct soc_mixer_control mc = (struct soc_mixer_control )kcontrol->private_value;	404	struct soc_mixer_control mc = (struct soc_mixer_control )kcontrol->private_value;
405	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	405	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
406	struct idt821034 *idt821034 = snd_soc_component_get_drvdata(component);	406	struct idt821034 *idt821034 = snd_soc_component_get_drvdata(component);
407	int min = mc->min;	407	int min = mc->min;
408	int max = mc->max;	408	int max = mc->max;
@@ -433,7 +433,7 @@ static int idt821034_kctrl_gain_put(struct snd_kcontrol *kcontrol, · 24 unmodified lines
433	struct snd_ctl_elem_value *ucontrol)	433	struct snd_ctl_elem_value *ucontrol)
434	{	434	{
435	struct soc_mixer_control mc = (struct soc_mixer_control )kcontrol->private_value;	435	struct soc_mixer_control mc = (struct soc_mixer_control )kcontrol->private_value;
436	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	436	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
437	struct idt821034 *idt821034 = snd_soc_component_get_drvdata(component);	437	struct idt821034 *idt821034 = snd_soc_component_get_drvdata(component);
438	struct idt821034_amp *amp;	438	struct idt821034_amp *amp;
439	int min = mc->min;	439	int min = mc->min;
@@ -487,7 +487,7 @@ end: · 47 unmodified lines
487	static int idt821034_kctrl_mute_get(struct snd_kcontrol *kcontrol,	487	static int idt821034_kctrl_mute_get(struct snd_kcontrol *kcontrol,
488	struct snd_ctl_elem_value *ucontrol)	488	struct snd_ctl_elem_value *ucontrol)
489	{	489	{
490	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	490	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
491	struct idt821034 *idt821034 = snd_soc_component_get_drvdata(component);	491	struct idt821034 *idt821034 = snd_soc_component_get_drvdata(component);
492	int id = kcontrol->private_value;	492	int id = kcontrol->private_value;
493	bool is_muted;	493	bool is_muted;
@@ -509,7 +509,7 @@ static int idt821034_kctrl_mute_get(struct snd_kcontrol *kcontrol, · 15 unmodified lines
509	static int idt821034_kctrl_mute_put(struct snd_kcontrol *kcontrol,	509	static int idt821034_kctrl_mute_put(struct snd_kcontrol *kcontrol,
510	struct snd_ctl_elem_value *ucontrol)	510	struct snd_ctl_elem_value *ucontrol)
511	{	511	{
512	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	512	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
513	struct idt821034 *idt821034 = snd_soc_component_get_drvdata(component);	513	struct idt821034 *idt821034 = snd_soc_component_get_drvdata(component);
514	int id = kcontrol->private_value;	514	int id = kcontrol->private_value;
515	struct idt821034_amp *amp;	515	struct idt821034_amp *amp;

@@ -42,7 +42,7 @@ static const DECLARE_TLV_DB_SCALE(speaker_gain_tlv, 600, 600, 0); · 41 unmodified lines
42	static int speaker_gain_control_get(struct snd_kcontrol *kcontrol,	42	static int speaker_gain_control_get(struct snd_kcontrol *kcontrol,
43	struct snd_ctl_elem_value *ucontrol)	43	struct snd_ctl_elem_value *ucontrol)
44	{	44	{
45	struct snd_soc_component *c = snd_soc_kcontrol_component(kcontrol);	45	struct snd_soc_component *c = snd_kcontrol_chip(kcontrol);
46	struct max9759 *priv = snd_soc_component_get_drvdata(c);	46	struct max9759 *priv = snd_soc_component_get_drvdata(c);
47		47
48	ucontrol->value.integer.value[0] = priv->gain;	48	ucontrol->value.integer.value[0] = priv->gain;
@@ -61,7 +61,7 @@ static const bool speaker_gain_table[4][2] = { · 12 unmodified lines
61	static int speaker_gain_control_put(struct snd_kcontrol *kcontrol,	61	static int speaker_gain_control_put(struct snd_kcontrol *kcontrol,
62	struct snd_ctl_elem_value *ucontrol)	62	struct snd_ctl_elem_value *ucontrol)
63	{	63	{
64	struct snd_soc_component *c = snd_soc_kcontrol_component(kcontrol);	64	struct snd_soc_component *c = snd_kcontrol_chip(kcontrol);
65	struct max9759 *priv = snd_soc_component_get_drvdata(c);	65	struct max9759 *priv = snd_soc_component_get_drvdata(c);
66		66
67	if (ucontrol->value.integer.value[0] < 0 \|\|	67	if (ucontrol->value.integer.value[0] < 0 \|\|
@@ -83,7 +83,7 @@ static int speaker_gain_control_put(struct snd_kcontrol *kcontrol, · 15 unmodified lines
83	static int speaker_mute_get(struct snd_kcontrol *kcontrol,	83	static int speaker_mute_get(struct snd_kcontrol *kcontrol,
84	struct snd_ctl_elem_value *ucontrol)	84	struct snd_ctl_elem_value *ucontrol)
85	{	85	{
86	struct snd_soc_component *c = snd_soc_kcontrol_component(kcontrol);	86	struct snd_soc_component *c = snd_kcontrol_chip(kcontrol);
87	struct max9759 *priv = snd_soc_component_get_drvdata(c);	87	struct max9759 *priv = snd_soc_component_get_drvdata(c);
88		88
89	ucontrol->value.integer.value[0] = !priv->is_mute;	89	ucontrol->value.integer.value[0] = !priv->is_mute;
@@ -94,7 +94,7 @@ static int speaker_mute_get(struct snd_kcontrol *kcontrol, · 4 unmodified lines
94	static int speaker_mute_put(struct snd_kcontrol *kcontrol,	94	static int speaker_mute_put(struct snd_kcontrol *kcontrol,
95	struct snd_ctl_elem_value *ucontrol)	95	struct snd_ctl_elem_value *ucontrol)
96	{	96	{
97	struct snd_soc_component *c = snd_soc_kcontrol_component(kcontrol);	97	struct snd_soc_component *c = snd_kcontrol_chip(kcontrol);
98	struct max9759 *priv = snd_soc_component_get_drvdata(c);	98	struct max9759 *priv = snd_soc_component_get_drvdata(c);
99		99
100	priv->is_mute = !ucontrol->value.integer.value[0];	100	priv->is_mute = !ucontrol->value.integer.value[0];

@@ -276,7 +276,7 @@ static int peb2466_lkup_ctrl_put(struct snd_kcontrol *kcontrol, · 275 unmodified lines
276	{	276	{
277	struct peb2466_lkup_ctrl *lkup_ctrl =	277	struct peb2466_lkup_ctrl *lkup_ctrl =
278	(struct peb2466_lkup_ctrl *)kcontrol->private_value;	278	(struct peb2466_lkup_ctrl *)kcontrol->private_value;
279	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	279	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
280	struct peb2466 *peb2466 = snd_soc_component_get_drvdata(component);	280	struct peb2466 *peb2466 = snd_soc_component_get_drvdata(component);
281	unsigned int index;	281	unsigned int index;
282	int ret;	282	int ret;
@@ -377,7 +377,7 @@ static const struct soc_enum peb2466_tg_freq[][2] = { · 94 unmodified lines
377	static int peb2466_tg_freq_get(struct snd_kcontrol *kcontrol,	377	static int peb2466_tg_freq_get(struct snd_kcontrol *kcontrol,
378	struct snd_ctl_elem_value *ucontrol)	378	struct snd_ctl_elem_value *ucontrol)
379	{	379	{
380	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	380	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
381	struct peb2466 *peb2466 = snd_soc_component_get_drvdata(component);	381	struct peb2466 *peb2466 = snd_soc_component_get_drvdata(component);
382	struct soc_enum e = (struct soc_enum )kcontrol->private_value;	382	struct soc_enum e = (struct soc_enum )kcontrol->private_value;
383		383
@@ -415,7 +415,7 @@ static int peb2466_tg_freq_get(struct snd_kcontrol *kcontrol, · 31 unmodified lines
415	static int peb2466_tg_freq_put(struct snd_kcontrol *kcontrol,	415	static int peb2466_tg_freq_put(struct snd_kcontrol *kcontrol,
416	struct snd_ctl_elem_value *ucontrol)	416	struct snd_ctl_elem_value *ucontrol)
417	{	417	{
418	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	418	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
419	struct peb2466 *peb2466 = snd_soc_component_get_drvdata(component);	419	struct peb2466 *peb2466 = snd_soc_component_get_drvdata(component);
420	struct soc_enum e = (struct soc_enum )kcontrol->private_value;	420	struct soc_enum e = (struct soc_enum )kcontrol->private_value;
421	unsigned int *tg_freq_item;	421	unsigned int *tg_freq_item;

@@ -993,7 +993,7 @@ static const struct snd_kcontrol_new rt5665_if3_adc_swap_mux = · 992 unmodified lines
993	static int rt5665_hp_vol_put(struct snd_kcontrol *kcontrol,	993	static int rt5665_hp_vol_put(struct snd_kcontrol *kcontrol,
994	struct snd_ctl_elem_value *ucontrol)	994	struct snd_ctl_elem_value *ucontrol)
995	{	995	{
996	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	996	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
997	int ret = snd_soc_put_volsw(kcontrol, ucontrol);	997	int ret = snd_soc_put_volsw(kcontrol, ucontrol);
998		998
999	if (snd_soc_component_read(component, RT5665_STO_NG2_CTRL_1) & RT5665_NG2_EN) {	999	if (snd_soc_component_read(component, RT5665_STO_NG2_CTRL_1) & RT5665_NG2_EN) {
@@ -1009,7 +1009,7 @@ static int rt5665_hp_vol_put(struct snd_kcontrol *kcontrol, · 9 unmodified lines
1009	static int rt5665_mono_vol_put(struct snd_kcontrol *kcontrol,	1009	static int rt5665_mono_vol_put(struct snd_kcontrol *kcontrol,
1010	struct snd_ctl_elem_value *ucontrol)	1010	struct snd_ctl_elem_value *ucontrol)
1011	{	1011	{
1012	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);	1012	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
1013	int ret = snd_soc_put_volsw(kcontrol, ucontrol);	1013	int ret = snd_soc_put_volsw(kcontrol, ucontrol);
1014		1014
1015	if (snd_soc_component_read(component, RT5665_MONO_NG2_CTRL_1) & RT5665_NG2_EN) {	1015	if (snd_soc_component_read(component, RT5665_MONO_NG2_CTRL_1) & RT5665_NG2_EN) {
@@ -1067,7 +1067,7 @@ static void rt5665_enable_push_button_irq(struct snd_soc_component *component, · 51 unmodified lines
1067	static int rt5665_headset_detect(struct snd_soc_component *component, int jack_insert)	1067	static int rt5665_headset_detect(struct snd_soc_component *component, int jack_insert)
1068	{	1068	{
1069	struct rt5665_priv *rt5665 = snd_soc_component_get_drvdata(component);	1069	struct rt5665_priv *rt5665 = snd_soc_component_get_drvdata(component);
1070	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);	1070	struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
1071	unsigned int sar_hs_type, val;	1071	unsigned int sar_hs_type, val;
1072		1072
1073	if (jack_insert) {	1073	if (jack_insert) {