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

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

Pull SoC fixes from Arnd Bergmann:
 "The main changes are devicetree updates for qualcomm and rockchips
  arm64 platforms, fixing minor mistakes in SoC and board specific
  settings:

   - GPIO settings for Pinephone Pro buttons

   - Register ranges for rk3576 GPU

   - Power domains on sc8280xp

   - Clocks on qcom talos

   - dtc warnings for extraneous properties, nonstandard node names and
     undocument identifiers

  The Tegra210 platform gets a single revert for a devicetree change
  that caused a 6.19 regression.

  On 32-bit Arm, we have trivial fixes for Microchip SAMA7 devicetree
  files and NPCM Kconfig, as well as Andrew Jeffery being officially
  listed as MAINTAINER for NPCM.

  A single driver fix is for Qualcomm RPMHD power domains, bringing the
  driver up to date with a devicetree change that added additional power
  domains to be enabled"

* tag 'soc-fixes-6.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (27 commits)
  MAINTAINERS: Add Andrew as M: to ARM/NUVOTON NPCM ARCHITECTURE
  MAINTAINERS: update email address for Yixun Lan
  Revert "arm64: tegra: Add interconnect properties for Tegra210"
  arm64: dts: rockchip: Drop unsupported properties
  arm64: dts: rockchip: Fix gpio pinctrl node names
  arm64: dts: rockchip: Fix pinctrl property typo on rk3326-odroid-go3
  arm64: dts: rockchip: Drop "sitronix,st7789v" fallback compatible from rk3568-wolfvision
  ARM: dts: microchip: sama7d65: fix size-cells property for i2c3
  ARM: dts: microchip: sama7d65: fix the ranges property for flx9
  arm: npcm: drop unused Kconfig ERRATA symbol
  arm64: dts: rockchip: Fix wrong register range of rk3576 gpu
  arm64: dts: rockchip: Configure MCLK for analog sound on NanoPi M5
  arm64: dts: rockchip: Fix headphones widget name on NanoPi M5
  ARM: dts: microchip: lan966x: Fix the access to the PHYs for pcb8290
  arm64: dts: rockchip: remove redundant max-link-speed from nanopi-r4s
  arm64: dts: rockchip: remove dangerous max-link-speed from helios64
  arm64: dts: rockchip: fix unit-address for RK3588 NPU's core1 and core2's IOMMU
  arm64: dts: rockchip: Fix wifi interrupts flag on Sakura Pi RK3308B
  arm64: dts: qcom: sm8650: Fix compile warnings in USB controller node
  arm64: dts: qcom: sm8550: Fix compile warnings in USB controller node
  ...
parents 119d1cbc 0638dc29

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#

Aaron Durbin <adurbin@google.com>

Abel Vesa <abelvesa@kernel.org> <abel.vesa@nxp.com>

Abel Vesa <abelvesa@kernel.org> <abel.vesa@linaro.org>

Abel Vesa <abelvesa@kernel.org> <abelvesa@gmail.com>

Abhijeet Dharmapurikar <quic_adharmap@quicinc.com> <adharmap@codeaurora.org>

Abhinav Kumar <quic_abhinavk@quicinc.com> <abhinavk@codeaurora.org>
@@ -878,6 +879,8 @@ Wolfram Sang <wsa@kernel.org> <wsa@the-dreams.de> 
Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>

Yanteng Si <si.yanteng@linux.dev> <siyanteng@loongson.cn>

Ying Huang <huang.ying.caritas@gmail.com> <ying.huang@intel.com>

Yixun Lan <dlan@kernel.org> <dlan@gentoo.org>

Yixun Lan <dlan@kernel.org> <yixun.lan@amlogic.com>

Yosry Ahmed <yosry.ahmed@linux.dev> <yosryahmed@google.com>

Yu-Chun Lin <eleanor.lin@realtek.com> <eleanor15x@gmail.com>

Yusuke Goda <goda.yusuke@renesas.com>

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -3132,6 +3132,7 @@ F: drivers/*/*ma35* 
K:	ma35d1









ARM/NUVOTON NPCM ARCHITECTURE









M:	Andrew Jeffery <andrew@codeconstruct.com.au>









M:	Avi Fishman <avifishman70@gmail.com>









M:	Tomer Maimon <tmaimon77@gmail.com>









M:	Tali Perry <tali.perry1@gmail.com>








@@ -3140,6 +3141,7 @@ R:	Nancy Yuen <yuenn@google.com>







R:	Benjamin Fair <benjaminfair@google.com>









L:	openbmc@lists.ozlabs.org (moderated for non-subscribers)









S:	Supported









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux.git









F:	Documentation/devicetree/bindings/*/*/*npcm*









F:	Documentation/devicetree/bindings/*/*npcm*









F:	Documentation/devicetree/bindings/rtc/nuvoton,nct3018y.yaml








@@ -22536,7 +22538,7 @@ F:	drivers/mailbox/riscv-sbi-mpxy-mbox.c







F:	include/linux/mailbox/riscv-rpmi-message.h

















RISC-V SPACEMIT SoC Support









M:	Yixun Lan <dlan@gentoo.org>









M:	Yixun Lan <dlan@kernel.org>









L:	linux-riscv@lists.infradead.org









L:	spacemit@lists.linux.dev









S:	Maintained

























arch/arm/boot/dts/microchip/lan966x-pcb8290.dts



+1
−0






























Original line number
Diff line number
Diff line







@@ -54,6 +54,7 @@ udc_pins: ucd-pins {







&mdio0 {









	pinctrl-0 = <&miim_a_pins>;









	pinctrl-names = "default";









	reset-gpios = <&gpio 53 GPIO_ACTIVE_LOW>;









	status = "okay";



















	ext_phy0: ethernet-phy@7 {
































arch/arm/boot/dts/microchip/sama7d65.dtsi



+2
−2






























Original line number
Diff line number
Diff line







@@ -527,7 +527,7 @@ i2c3: i2c@600 {







				interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;









				clocks = <&pmc PMC_TYPE_PERIPHERAL 37>;









				#address-cells = <1>;









				#size-cells = <1>;









				#size-cells = <0>;









				dmas = <&dma0 AT91_XDMAC_DT_PERID(12)>,









				       <&dma0 AT91_XDMAC_DT_PERID(11)>;









				dma-names = "tx", "rx";








@@ -676,7 +676,7 @@ i2c8: i2c@600 {







		flx9: flexcom@e2820000 {









			compatible = "microchip,sama7d65-flexcom", "atmel,sama5d2-flexcom";









			reg = <0xe2820000 0x200>;









			ranges = <0x0 0xe281c000 0x800>;









			ranges = <0x0 0xe2820000 0x800>;









			clocks = <&pmc PMC_TYPE_PERIPHERAL 43>;









			#address-cells = <1>;









			#size-cells = <1>;
































arch/arm/mach-npcm/Kconfig



+0
−1






























Original line number
Diff line number
Diff line







@@ -30,7 +30,6 @@ config ARCH_NPCM7XX







	select ARM_ERRATA_764369 if SMP









	select ARM_ERRATA_720789









	select ARM_ERRATA_754322









	select ARM_ERRATA_794072









	select PL310_ERRATA_588369









	select PL310_ERRATA_727915









	select MFD_SYSCON