Commit 00f281fd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull SoC fixes from Arnd Bergmann:
 "These all address issues in devicetree files:

   - The Rockchip rk3588j are now limited the same way as the vendor
     kernel, to allow room for the industrial-grade temperature ranges.

   - Seven more Rockchip fixes address minor issues with specific boards

   - Invalid clk controller references in multiple amlogic chips, plus
     one accidentally disabled audio on clock

   - Two devicetree fixes for i.MX8MP boards, both for incorrect
     regulator settings

   - A power domain change for apple laptop touchbar, fixing
     suspend/resume problems

   - An incorrect DMA controller setting for sophgo cv18xx chips"

* tag 'soc-fixes-6.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  arm64: dts: amazon: Fix simple-bus node name schema warnings
  MAINTAINERS: delete email for Shiraz Hashim
  arm64: dts: imx8mp-var-som: Fix LDO5 shutdown causing SD card timeout
  arm64: dts: imx8mp: use 800MHz NoC OPP for nominal drive mode
  arm64: dts: amlogic: dreambox: fix missing clkc_audio node
  riscv: dts: sophgo: fix DMA data-width configuration for CV18xx
  arm64: dts: rockchip: fix Sige5 RTC interrupt pin
  arm64: dts: rockchip: Assign RT5616 MCLK rate on rk3588-friendlyelec-cm3588
  arm64: dts: rockchip: Align wifi node name with bindings in CB2
  arm64: dts: amlogic: g12: fix reference to unknown/untested PWM clock
  arm64: dts: amlogic: gx: fix reference to unknown/untested PWM clock
  ARM: dts: amlogic: meson8b: fix reference to unknown/untested PWM clock
  ARM: dts: amlogic: meson8: fix reference to unknown/untested PWM clock
  arm64: dts: apple: touchbar: Mark ps_dispdfr_be as always-on
  mailmap: Update email for Asahi Lina
  arm64: dts: rockchip: Fix mmc-pwrseq clock name on rock-pi-4
  arm64: dts: rockchip: Use "regulator-fixed" for btreg on px30-engicam for vcc3v3-btreg
  arm64: dts: rockchip: Add pinmuxing for eMMC on QNAP TS433
  arm64: dts: rockchip: Remove overdrive-mode OPPs from RK3588J SoC dtsi
  arm64: dts: rockchip: Allow Turing RK1 cooling fan to spin down
parents 9f35e331 15eaaa71

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ Ard Biesheuvel <ardb@kernel.org> <ard.biesheuvel@linaro.org> 
Arnaud Patard <arnaud.patard@rtp-net.org>

Arnd Bergmann <arnd@arndb.de>

Arun Kumar Neelakantam <quic_aneela@quicinc.com> <aneela@codeaurora.org>

Asahi Lina <lina+kernel@asahilina.net> <lina@asahilina.net>

Ashok Raj Nagarajan <quic_arnagara@quicinc.com> <arnagara@codeaurora.org>

Ashwin Chaugule <quic_ashwinc@quicinc.com> <ashwinc@codeaurora.org>

Asutosh Das <quic_asutoshd@quicinc.com> <asutoshd@codeaurora.org>

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -22916,7 +22916,6 @@ F: drivers/accessibility/speakup/ 








SPEAR PLATFORM/CLOCK/PINCTRL SUPPORT









M:	Viresh Kumar <vireshk@kernel.org>









M:	Shiraz Hashim <shiraz.linux.kernel@gmail.com>









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









L:	soc@lists.linux.dev









S:	Maintained

























arch/arm/boot/dts/amlogic/meson8.dtsi



+3
−3






























Original line number
Diff line number
Diff line







@@ -451,7 +451,7 @@ analog_top: analog-top@81a8 {







	pwm_ef: pwm@86c0 {









		compatible = "amlogic,meson8-pwm-v2";









		clocks = <&xtal>,









			 <>, /* unknown/untested, the datasheet calls it "Video PLL" */









			 <0>, /* unknown/untested, the datasheet calls it "Video PLL" */









			 <&clkc CLKID_FCLK_DIV4>,









			 <&clkc CLKID_FCLK_DIV3>;









		reg = <0x86c0 0x10>;








@@ -705,7 +705,7 @@ timer@600 {







&pwm_ab {









	compatible = "amlogic,meson8-pwm-v2";









	clocks = <&xtal>,









		 <>, /* unknown/untested, the datasheet calls it "Video PLL" */









		 <0>, /* unknown/untested, the datasheet calls it "Video PLL" */









		 <&clkc CLKID_FCLK_DIV4>,









		 <&clkc CLKID_FCLK_DIV3>;









};








@@ -713,7 +713,7 @@ &pwm_ab {







&pwm_cd {









	compatible = "amlogic,meson8-pwm-v2";









	clocks = <&xtal>,









		 <>, /* unknown/untested, the datasheet calls it "Video PLL" */









		 <0>, /* unknown/untested, the datasheet calls it "Video PLL" */









		 <&clkc CLKID_FCLK_DIV4>,









		 <&clkc CLKID_FCLK_DIV3>;









};
































arch/arm/boot/dts/amlogic/meson8b.dtsi



+3
−3






























Original line number
Diff line number
Diff line







@@ -406,7 +406,7 @@ pwm_ef: pwm@86c0 {







		compatible = "amlogic,meson8b-pwm-v2", "amlogic,meson8-pwm-v2";









		reg = <0x86c0 0x10>;









		clocks = <&xtal>,









			 <>, /* unknown/untested, the datasheet calls it "Video PLL" */









			 <0>, /* unknown/untested, the datasheet calls it "Video PLL" */









			 <&clkc CLKID_FCLK_DIV4>,









			 <&clkc CLKID_FCLK_DIV3>;









		#pwm-cells = <3>;








@@ -680,7 +680,7 @@ timer@600 {







&pwm_ab {









	compatible = "amlogic,meson8b-pwm-v2", "amlogic,meson8-pwm-v2";









	clocks = <&xtal>,









		 <>, /* unknown/untested, the datasheet calls it "Video PLL" */









		 <0>, /* unknown/untested, the datasheet calls it "Video PLL" */









		 <&clkc CLKID_FCLK_DIV4>,









		 <&clkc CLKID_FCLK_DIV3>;









};








@@ -688,7 +688,7 @@ &pwm_ab {







&pwm_cd {









	compatible = "amlogic,meson8b-pwm-v2", "amlogic,meson8-pwm-v2";









	clocks = <&xtal>,









		 <>, /* unknown/untested, the datasheet calls it "Video PLL" */









		 <0>, /* unknown/untested, the datasheet calls it "Video PLL" */









		 <&clkc CLKID_FCLK_DIV4>,









		 <&clkc CLKID_FCLK_DIV3>;









};
































arch/arm64/boot/dts/amazon/alpine-v2.dtsi



+1
−1






























Original line number
Diff line number
Diff line







@@ -151,7 +151,7 @@ msix: msix@fbe00000 {







			al,msi-num-spis = <160>;









		};



















		io-fabric@fc000000 {









		io-bus@fc000000 {









			compatible = "simple-bus";









			#address-cells = <1>;









			#size-cells = <1>;