Commit b9a10f87 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'soc-fixes-6.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull SoC fixes from Arnd Bergmann:
 "These are mainly devicetree fixes for the rockchip and nxp platforms
  on arm64, addressing mistakes in the board and soc specific
  descriptions.

  In particular the newly added Rock 5T board required multiple bugfixes
  for PCIe and USB, while on the i.MX platform there are a number of
  regulator related fixes. The only other platforms with devicetree
  fixes are at91 with a fixup for SD/MMC and a change to enable all the
  available UARTS on the Axiado reference board.

  Also on the at91 platform, a Kconfig change addresses a regression
  that stopped the DMA engine from working in 6.17-rc.

  Three drivers each have a simple bugfix, stopping incorrect behavior
  in op-tee firmware, the tee subsystem and the qualcomm mdt_loader.

  Two trivial MAINTAINERS file changes are needed to make sure that
  patches reach the correct maintainer, but don't change the actual
  responsibilities"

* tag 'soc-fixes-6.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (27 commits)
  ARM: dts: microchip: sama7d65: Force SDMMC Legacy mode
  ARM: at91: select ARCH_MICROCHIP
  arm64: dts: rockchip: fix second M.2 slot on ROCK 5T
  arm64: dts: rockchip: fix USB on RADXA ROCK 5T
  MAINTAINERS: exclude defconfig from ARM64 PORT
  arm64: dts: axiado: Add missing UART aliases
  MAINTAINERS: Update Nobuhiro Iwamatsu's email address
  arm64: dts: rockchip: Add vcc-supply to SPI flash on Pinephone Pro
  arm64: dts: rockchip: fix es8388 address on rk3588s-roc-pc
  arm64: dts: rockchip: Fix Bluetooth interrupts flag on Neardi LBA3368
  arm64: dts: rockchip: correct network description on Sige5
  arm64: dts: rockchip: Minor whitespace cleanup
  ARM: dts: rockchip: Minor whitespace cleanup
  arm64: dts: rockchip: Add supplies for eMMC on rk3588-orangepi-5
  arm64: dts: rockchip: Fix the headphone detection on the orangepi 5 plus
  arm64: dts: imx95: Fix JPEG encoder node assigned clock
  arm64: dts: imx95-19x19-evk: correct the phy setting for flexcan1/2
  arm64: dts: imx8mp: Fix missing microSD slot vqmmc on Data Modul i.MX8M Plus eDM SBC
  arm64: dts: imx8mp: Fix missing microSD slot vqmmc on DH electronics i.MX8M Plus DHCOM
  arm64: dts: imx8mp-tqma8mpql: remove virtual 3.3V regulator
  ...
parents ec299e4d 875691ce

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -589,6 +589,7 @@ Nikolay Aleksandrov <razor@blackwall.org> <nikolay@redhat.com> 
Nikolay Aleksandrov <razor@blackwall.org> <nikolay@cumulusnetworks.com>

Nikolay Aleksandrov <razor@blackwall.org> <nikolay@nvidia.com>

Nikolay Aleksandrov <razor@blackwall.org> <nikolay@isovalent.com>

Nobuhiro Iwamatsu <nobuhiro.iwamatsu.x90@mail.toshiba> <nobuhiro1.iwamatsu@toshiba.co.jp>

Odelu Kukatla <quic_okukatla@quicinc.com> <okukatla@codeaurora.org>

Oleksandr Natalenko <oleksandr@natalenko.name> <oleksandr@redhat.com>

Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -3526,7 +3526,7 @@ F: Documentation/devicetree/bindings/arm/ti/nspire.yaml 
F:	arch/arm/boot/dts/nspire/









ARM/TOSHIBA VISCONTI ARCHITECTURE









M:	Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>









M:	Nobuhiro Iwamatsu <nobuhiro.iwamatsu.x90@mail.toshiba>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Supported









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/iwamatsu/linux-visconti.git








@@ -3667,6 +3667,7 @@ F:	drivers/virt/coco/arm-cca-guest/







F:	drivers/virt/coco/pkvm-guest/









F:	tools/testing/selftests/arm64/









X:	arch/arm64/boot/dts/









X:	arch/arm64/configs/defconfig

















ARROW SPEEDCHIPS XRS7000 SERIES ETHERNET SWITCH DRIVER









M:	George McCollister <george.mccollister@gmail.com>
































arch/arm/boot/dts/microchip/at91-sama7d65_curiosity.dts



+2
−0






























Original line number
Diff line number
Diff line







@@ -387,6 +387,8 @@ &rtt {

















&sdmmc1 {









	bus-width = <4>;









	no-1-8-v;









	sdhci-caps-mask = <0x0 0x00200000>;









	pinctrl-names = "default";









	pinctrl-0 = <&pinctrl_sdmmc1_default>;









	status = "okay";
































arch/arm/mach-at91/Kconfig



+4
−0






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0-only









config ARCH_MICROCHIP









	bool



















menuconfig ARCH_AT91









	bool "AT91/Microchip SoCs"









	depends on (CPU_LITTLE_ENDIAN && (ARCH_MULTI_V4T || ARCH_MULTI_V5)) || \








@@ -8,6 +11,7 @@ menuconfig ARCH_AT91







	select GPIOLIB









	select PINCTRL









	select SOC_BUS









	select ARCH_MICROCHIP



















if ARCH_AT91









config SOC_SAMV7
































arch/arm64/boot/dts/axiado/ax3000-evk.dts



+3
−0






























Original line number
Diff line number
Diff line







@@ -14,6 +14,9 @@ / {







	#size-cells = <2>;



















	aliases {









		serial0 = &uart0;









		serial1 = &uart1;









		serial2 = &uart2;









		serial3 = &uart3;









	};