From: Takashi Iwai Date: Thu, 21 Mar 2024 13:07:27 +0000 (+0100) Subject: Merge tag 'asoc-fix-v6.9-merge-window' of https://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v6.9-rc1~23^2 X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=9f2347842b526cbc2655068591fb0166362d2999;hp=-c;p=sfrench%2Fcifs-2.6.git Merge tag 'asoc-fix-v6.9-merge-window' of https://git./linux/kernel/git/broonie/sound into for-linus ASoC: Fixes for v6.9 A bunch of fixes that came in during the merge window, probably the most substantial thing is the DPCM locking fix for compressed audio which has been lurking for a while. --- 9f2347842b526cbc2655068591fb0166362d2999 diff --combined MAINTAINERS index 1d82cc96398b,1aabf1c15bb3..6f589aee6146 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -1395,6 -1395,7 +1395,7 @@@ F: drivers/hwmon/max31760. ANALOGBITS PLL LIBRARIES M: Paul Walmsley + M: Samuel Holland S: Supported F: drivers/clk/analogbits/* F: include/linux/clk/analogbits* @@@ -2156,7 -2157,7 +2157,7 @@@ M: Shawn Guo R: Pengutronix Kernel Team R: Fabio Estevam - R: NXP Linux Team + L: imx@lists.linux.dev L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git @@@ -5014,7 -5015,6 +5015,7 @@@ F: include/linux/mfd/cs42l43 F: include/sound/cs* F: sound/pci/hda/cirrus* F: sound/pci/hda/cs* +F: sound/pci/hda/hda_component* F: sound/pci/hda/hda_cs_dsp_ctl.* F: sound/soc/codecs/cs* @@@ -5379,7 -5379,7 +5380,7 @@@ CONTROL GROUP - MEMORY RESOURCE CONTROL M: Johannes Weiner M: Michal Hocko M: Roman Gushchin - M: Shakeel Butt + M: Shakeel Butt R: Muchun Song L: cgroups@vger.kernel.org L: linux-mm@kvack.org @@@ -8496,7 -8496,7 +8497,7 @@@ FREESCALE IMX / MXC FEC DRIVE M: Wei Fang R: Shenwei Wang R: Clark Wang - R: NXP Linux Team + L: imx@lists.linux.dev L: netdev@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/net/fsl,fec.yaml @@@ -8531,7 -8531,7 +8532,7 @@@ F: drivers/i2c/busses/i2c-imx. FREESCALE IMX LPI2C DRIVER M: Dong Aisheng L: linux-i2c@vger.kernel.org - L: linux-imx@nxp.com + L: imx@lists.linux.dev S: Maintained F: Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml F: drivers/i2c/busses/i2c-imx-lpi2c.c @@@ -10735,7 -10735,7 +10736,7 @@@ INTEL DRM I915 DRIVER (Meteor Lake, DG M: Jani Nikula M: Joonas Lahtinen M: Rodrigo Vivi - M: Tvrtko Ursulin + M: Tvrtko Ursulin L: intel-gfx@lists.freedesktop.org S: Supported W: https://drm.pages.freedesktop.org/intel-docs/ @@@ -14112,6 -14112,17 +14113,17 @@@ F: mm F: tools/mm/ F: tools/testing/selftests/mm/ + MEMORY MAPPING + M: Andrew Morton + R: Liam R. Howlett + R: Vlastimil Babka + R: Lorenzo Stoakes + L: linux-mm@kvack.org + S: Maintained + W: http://www.linux-mm.org + T: git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm + F: mm/mmap.c + MEMORY TECHNOLOGY DEVICES (MTD) M: Miquel Raynal M: Richard Weinberger @@@ -14370,7 -14381,7 +14382,7 @@@ MICROCHIP MCP16502 PMIC DRIVE M: Claudiu Beznea L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Supported - F: Documentation/devicetree/bindings/regulator/mcp16502-regulator.txt + F: Documentation/devicetree/bindings/regulator/microchip,mcp16502.yaml F: drivers/regulator/mcp16502.c MICROCHIP MCP3564 ADC DRIVER @@@ -15243,6 -15254,8 +15255,8 @@@ F: Documentation/networking F: Documentation/networking/net_cachelines/ F: Documentation/process/maintainer-netdev.rst F: Documentation/userspace-api/netlink/ + F: include/linux/framer/framer-provider.h + F: include/linux/framer/framer.h F: include/linux/in.h F: include/linux/indirect_call_wrapper.h F: include/linux/net.h @@@ -15715,7 -15728,7 +15729,7 @@@ F: drivers/iio/gyro/fxas21002c_spi. NXP i.MX 7D/6SX/6UL/93 AND VF610 ADC DRIVER M: Haibo Chen L: linux-iio@vger.kernel.org - L: linux-imx@nxp.com + L: imx@lists.linux.dev S: Maintained F: Documentation/devicetree/bindings/iio/adc/fsl,imx7d-adc.yaml F: Documentation/devicetree/bindings/iio/adc/fsl,vf610-adc.yaml @@@ -15752,7 -15765,7 +15766,7 @@@ F: drivers/gpu/drm/imx/dcss NXP i.MX 8QXP ADC DRIVER M: Cai Huoqing M: Haibo Chen - L: linux-imx@nxp.com + L: imx@lists.linux.dev L: linux-iio@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/iio/adc/nxp,imx8qxp-adc.yaml @@@ -15760,7 -15773,7 +15774,7 @@@ F: drivers/iio/adc/imx8qxp-adc. NXP i.MX 8QXP/8QM JPEG V4L2 DRIVER M: Mirela Rabulea - R: NXP Linux Team + L: imx@lists.linux.dev L: linux-media@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/media/nxp,imx8-jpeg.yaml @@@ -15770,7 -15783,7 +15784,7 @@@ NXP i.MX CLOCK DRIVER M: Abel Vesa R: Peng Fan L: linux-clk@vger.kernel.org - L: linux-imx@nxp.com + L: imx@lists.linux.dev S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk/imx F: Documentation/devicetree/bindings/clock/imx* @@@ -16731,6 -16744,7 +16745,7 @@@ F: drivers/pci/controller/dwc/*layersca PCI DRIVER FOR FU740 M: Paul Walmsley M: Greentime Hu + M: Samuel Holland L: linux-pci@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/pci/sifive,fu740-pcie.yaml @@@ -17983,33 -17997,34 +17998,34 @@@ F: drivers/media/tuners/qt1010 QUALCOMM ATH12K WIRELESS DRIVER M: Kalle Valo - M: Jeff Johnson + M: Jeff Johnson L: ath12k@lists.infradead.org S: Supported W: https://wireless.wiki.kernel.org/en/users/Drivers/ath12k T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git F: drivers/net/wireless/ath/ath12k/ + N: ath12k QUALCOMM ATHEROS ATH10K WIRELESS DRIVER M: Kalle Valo - M: Jeff Johnson + M: Jeff Johnson L: ath10k@lists.infradead.org S: Supported W: https://wireless.wiki.kernel.org/en/users/Drivers/ath10k T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git - F: Documentation/devicetree/bindings/net/wireless/qcom,ath10k.yaml F: drivers/net/wireless/ath/ath10k/ + N: ath10k QUALCOMM ATHEROS ATH11K WIRELESS DRIVER M: Kalle Valo - M: Jeff Johnson + M: Jeff Johnson L: ath11k@lists.infradead.org S: Supported W: https://wireless.wiki.kernel.org/en/users/Drivers/ath11k B: https://wireless.wiki.kernel.org/en/users/Drivers/ath11k/bugreport T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git - F: Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml F: drivers/net/wireless/ath/ath11k/ + N: ath11k QUALCOMM ATHEROS ATH9K WIRELESS DRIVER M: Toke Høiland-Jørgensen @@@ -19640,7 -19655,7 +19656,7 @@@ F: drivers/mmc/host/sdhci-of-at91. SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) NXP i.MX DRIVER M: Haibo Chen - L: linux-imx@nxp.com + L: imx@lists.linux.dev L: linux-mmc@vger.kernel.org S: Maintained F: drivers/mmc/host/sdhci-esdhc-imx.c @@@ -19975,36 -19990,15 +19991,15 @@@ S: Maintaine F: drivers/watchdog/simatic-ipc-wdt.c SIFIVE DRIVERS - M: Palmer Dabbelt M: Paul Walmsley + M: Samuel Holland L: linux-riscv@lists.infradead.org S: Supported + F: drivers/dma/sf-pdma/ N: sifive + K: fu[57]40 K: [^@]sifive - SIFIVE CACHE DRIVER - M: Conor Dooley - L: linux-riscv@lists.infradead.org - S: Maintained - F: Documentation/devicetree/bindings/cache/sifive,ccache0.yaml - F: drivers/cache/sifive_ccache.c - - SIFIVE FU540 SYSTEM-ON-CHIP - M: Paul Walmsley - M: Palmer Dabbelt - L: linux-riscv@lists.infradead.org - S: Supported - T: git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/sifive.git - N: fu540 - K: fu540 - - SIFIVE PDMA DRIVER - M: Green Wan - S: Maintained - F: Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml - F: drivers/dma/sf-pdma/ - - SILEAD TOUCHSCREEN DRIVER M: Hans de Goede L: linux-input@vger.kernel.org @@@ -20213,8 -20207,8 +20208,8 @@@ F: Documentation/devicetree/bindings/ne F: drivers/net/ethernet/socionext/sni_ave.c SOCIONEXT (SNI) NETSEC NETWORK DRIVER - M: Jassi Brar M: Ilias Apalodimas + M: Masahisa Kojima L: netdev@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/net/socionext,synquacer-netsec.yaml @@@ -20494,12 -20488,6 +20489,12 @@@ F: include/uapi/sound/compress_ F: sound/core/compress_offload.c F: sound/soc/soc-compress.c +SOUND - CORE KUNIT TEST +M: Ivan Orlov +L: linux-sound@vger.kernel.org +S: Supported +F: sound/core/sound_kunit.c + SOUND - DMAENGINE HELPERS M: Lars-Peter Clausen S: Supported @@@ -22885,9 -22873,8 +22880,8 @@@ S: Maintaine F: drivers/usb/typec/mux/pi3usb30532.c USB TYPEC PORT CONTROLLER DRIVERS - M: Guenter Roeck L: linux-usb@vger.kernel.org - S: Maintained + S: Orphan F: drivers/usb/typec/tcpm/ USB UHCI DRIVER