Skip to content

Commit 1a75f24

Browse files
committed
ASoC: Fix sdw_utils calling wrong codec init callbacks
Merge series from Richard Fitzgerald <rf@opensource.cirrus.com>: This series fixes a problem with soc_sdw_utils.c calling the wrong codec init callbacks, because it assumed that the DAI name could be used to uniquely identify the codec. This isn't the case, especially on SDCA which is a generic driver for many parts. The first patch is needed to add a missing export to SoundWire core.
2 parents 390caee + 5b027c7 commit 1a75f24

343 files changed

Lines changed: 2829 additions & 2025 deletions

File tree

Some content is hidden

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

.mailmap

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,7 @@ Juha Yrjola <at solidboot.com>
416416
Juha Yrjola <juha.yrjola@nokia.com>
417417
Juha Yrjola <juha.yrjola@solidboot.com>
418418
Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>
419+
Justin Iurman <justin.iurman@gmail.com> <justin.iurman@uliege.be>
419420
Iskren Chernev <me@iskren.info> <iskren.chernev@gmail.com>
420421
Kalle Valo <kvalo@kernel.org> <kvalo@codeaurora.org>
421422
Kalle Valo <kvalo@kernel.org> <quic_kvalo@quicinc.com>
@@ -472,6 +473,10 @@ Linas Vepstas <linas@austin.ibm.com>
472473
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
473474
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
474475
Linus Lüssing <linus.luessing@c0d3.blue> <ll@simonwunderlich.de>
476+
Linus Walleij <linusw@kernel.org> <linus.walleij@ericsson.com>
477+
Linus Walleij <linusw@kernel.org> <linus.walleij@stericsson.com>
478+
Linus Walleij <linusw@kernel.org> <linus.walleij@linaro.org>
479+
Linus Walleij <linusw@kernel.org> <triad@df.lth.se>
475480
<linux-hardening@vger.kernel.org> <kernel-hardening@lists.openwall.com>
476481
Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>
477482
Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
@@ -705,6 +710,8 @@ Sankeerth Billakanti <quic_sbillaka@quicinc.com> <sbillaka@codeaurora.org>
705710
Santosh Shilimkar <santosh.shilimkar@oracle.org>
706711
Santosh Shilimkar <ssantosh@kernel.org>
707712
Sarangdhar Joshi <spjoshi@codeaurora.org>
713+
Saravana Kannan <saravanak@kernel.org> <skannan@codeaurora.org>
714+
Saravana Kannan <saravanak@kernel.org> <saravanak@google.com>
708715
Sascha Hauer <s.hauer@pengutronix.de>
709716
Sahitya Tummala <quic_stummala@quicinc.com> <stummala@codeaurora.org>
710717
Sathishkumar Muruganandam <quic_murugana@quicinc.com> <murugana@codeaurora.org>
@@ -794,6 +801,7 @@ Tanzir Hasan <tanzhasanwork@gmail.com> <tanzirh@google.com>
794801
Tejun Heo <htejun@gmail.com>
795802
Tomeu Vizoso <tomeu@tomeuvizoso.net> <tomeu.vizoso@collabora.com>
796803
Thomas Graf <tgraf@suug.ch>
804+
Thomas Gleixner <tglx@kernel.org> <tglx@linutronix.de>
797805
Thomas Körper <socketcan@esd.eu> <thomas.koerper@esd.eu>
798806
Thomas Pedersen <twp@codeaurora.org>
799807
Thorsten Blum <thorsten.blum@linux.dev> <thorsten.blum@toblux.com>

CREDITS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1398,7 +1398,7 @@ D: SRM environment driver (for Alpha systems)
13981398
P: 1024D/8399E1BB 250D 3BCF 7127 0D8C A444 A961 1DBD 5E75 8399 E1BB
13991399

14001400
N: Thomas Gleixner
1401-
E: tglx@linutronix.de
1401+
E: tglx@kernel.org
14021402
D: NAND flash hardware support, JFFS2 on NAND flash
14031403

14041404
N: Jérôme Glisse
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
What: /sys/kernel/time/aux_clocks/<ID>/enable
22
Date: May 2025
3-
Contact: Thomas Gleixner <tglx@linutronix.de>
3+
Contact: Thomas Gleixner <tglx@kernel.org>
44
Description:
55
Controls the enablement of auxiliary clock timekeepers.

Documentation/ABI/testing/sysfs-devices-soc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ Date: January 2012
1717
contact: Lee Jones <lee@kernel.org>
1818
Description:
1919
Read-only attribute common to all SoCs. Contains the SoC machine
20-
name (e.g. Ux500).
20+
name (e.g. DB8500).
2121

2222
What: /sys/devices/socX/family
2323
Date: January 2012
2424
contact: Lee Jones <lee@kernel.org>
2525
Description:
2626
Read-only attribute common to all SoCs. Contains SoC family name
27-
(e.g. DB8500).
27+
(e.g. ux500).
2828

2929
On many of ARM based silicon with SMCCC v1.2+ compliant firmware
3030
this will contain the JEDEC JEP106 manufacturer’s identification

Documentation/arch/x86/topology.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ with the generic one and look at this one in parallel for the x86 specifics.
1717
Needless to say, code should use the generic functions - this file is *only*
1818
here to *document* the inner workings of x86 topology.
1919

20-
Started by Thomas Gleixner <tglx@linutronix.de> and Borislav Petkov <bp@alien8.de>.
20+
Started by Thomas Gleixner <tglx@kernel.org> and Borislav Petkov <bp@alien8.de>.
2121

2222
The main aim of the topology facilities is to present adequate interfaces to
2323
code which needs to know/query/use the structure of the running system wrt

Documentation/core-api/cpu_hotplug.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ CPU hotplug in the Kernel
88
Srivatsa Vaddagiri <vatsa@in.ibm.com>,
99
Ashok Raj <ashok.raj@intel.com>,
1010
Joel Schopp <jschopp@austin.ibm.com>,
11-
Thomas Gleixner <tglx@linutronix.de>
11+
Thomas Gleixner <tglx@kernel.org>
1212

1313
Introduction
1414
============

Documentation/core-api/genericirq.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,6 @@ Credits
439439

440440
The following people have contributed to this document:
441441

442-
1. Thomas Gleixner tglx@linutronix.de
442+
1. Thomas Gleixner tglx@kernel.org
443443

444444
2. Ingo Molnar mingo@elte.hu

Documentation/core-api/librs.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,4 +209,4 @@ testing. Thanks a lot.
209209

210210
The following people have contributed to this document:
211211

212-
Thomas Gleixner\ tglx@linutronix.de
212+
Thomas Gleixner\ tglx@kernel.org

Documentation/devicetree/bindings/arm/fsl.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1105,7 +1105,6 @@ properties:
11051105
- gateworks,imx8mp-gw74xx # i.MX8MP Gateworks Board
11061106
- gateworks,imx8mp-gw75xx-2x # i.MX8MP Gateworks Board
11071107
- gateworks,imx8mp-gw82xx-2x # i.MX8MP Gateworks Board
1108-
- gocontroll,moduline-display # GOcontroll Moduline Display controller
11091108
- prt,prt8ml # Protonic PRT8ML
11101109
- skov,imx8mp-skov-basic # SKOV i.MX8MP baseboard without frontplate
11111110
- skov,imx8mp-skov-revb-hdmi # SKOV i.MX8MP climate control without panel
@@ -1164,6 +1163,14 @@ properties:
11641163
- const: engicam,icore-mx8mp # i.MX8MP Engicam i.Core MX8M Plus SoM
11651164
- const: fsl,imx8mp
11661165

1166+
- description: Ka-Ro TX8P-ML81 SoM based boards
1167+
items:
1168+
- enum:
1169+
- gocontroll,moduline-display
1170+
- gocontroll,moduline-display-106
1171+
- const: karo,tx8p-ml81
1172+
- const: fsl,imx8mp
1173+
11671174
- description: Kontron i.MX8MP OSM-S SoM based Boards
11681175
items:
11691176
- const: kontron,imx8mp-bl-osm-s # Kontron BL i.MX8MP OSM-S Board

Documentation/devicetree/bindings/misc/pci1de4,1.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ properties:
2525
items:
2626
- const: pci1de4,1
2727

28+
reg:
29+
maxItems: 1
30+
description: The PCI Bus-Device-Function address.
31+
2832
'#interrupt-cells':
2933
const: 2
3034
description: |
@@ -101,6 +105,7 @@ unevaluatedProperties: false
101105

102106
required:
103107
- compatible
108+
- reg
104109
- '#interrupt-cells'
105110
- interrupt-controller
106111
- pci-ep-bus@1
@@ -111,8 +116,9 @@ examples:
111116
#address-cells = <3>;
112117
#size-cells = <2>;
113118
114-
rp1@0,0 {
119+
dev@0,0 {
115120
compatible = "pci1de4,1";
121+
reg = <0x10000 0x0 0x0 0x0 0x0>;
116122
ranges = <0x01 0x00 0x00000000 0x82010000 0x00 0x00 0x00 0x400000>;
117123
#address-cells = <3>;
118124
#size-cells = <2>;

0 commit comments

Comments
 (0)