Commit 2e1b3cc9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull SoC fixes from Arnd Bergmann:
 "Where the last set of fixes was mostly drivers, this time the
  devicetree changes all come at once, targeting mostly the Rockchips,
  Qualcomm and NXP platforms.

  The Qualcomm bugfixes target the Snapdragon X Elite laptops,
  specifically problems with PCIe and NVMe support to improve
  reliability, and a boot regresion on msm8939.

  Also for Snapdragon platforms, there are a number of correctness
  changes in the several platform specific device drivers, but none of
  these are as impactful.

  On the NXP i.MX platform, the fixes are all for 64-bit i.MX8 variants,
  correcting individual entries in the devicetree that were incorrect
  and causing the media, video, mmc and spi drivers to misbehave in
  minor ways.

  The Arm SCMI firmware driver gets fixes for a use-after-free bug and
  for correctly parsing firmware information.

  On the RISC-V side, there are three minor devicetree fixes for
  starfive and sophgo, again addressing only minor mistakes. One device
  driver patch fixes a problem with spurious interrupt handling"

* tag 'arm-fixes-6.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (63 commits)
  firmware: arm_scmi: Use vendor string in max-rx-timeout-ms
  dt-bindings: firmware: arm,scmi: Add missing vendor string
  riscv: dts: Replace deprecated snps,nr-gpios property for snps,dw-apb-gpio-port devices
  arm64: dts: rockchip: Correct GPIO polarity on brcm BT nodes
  arm64: dts: rockchip: Drop invalid clock-names from es8388 codec nodes
  ARM: dts: rockchip: Fix the realtek audio codec on rk3036-kylin
  ARM: dts: rockchip: Fix the spi controller on rk3036
  ARM: dts: rockchip: drop grf reference from rk3036 hdmi
  ARM: dts: rockchip: fix rk3036 acodec node
  arm64: dts: rockchip: remove orphaned pinctrl-names from pinephone pro
  soc: qcom: pmic_glink: Handle GLINK intent allocation rejections
  rpmsg: glink: Handle rejected intent request better
  arm64: dts: qcom: x1e80100: fix PCIe5 interconnect
  arm64: dts: qcom: x1e80100: fix PCIe4 interconnect
  arm64: dts: qcom: x1e80100: Fix up BAR spaces
  MAINTAINERS: invert Misc RISC-V SoC Support's pattern
  soc: qcom: socinfo: fix revision check in qcom_socinfo_probe()
  arm64: dts: qcom: x1e80100-qcp: fix nvme regulator boot glitch
  arm64: dts: qcom: x1e80100-microsoft-romulus: fix nvme regulator boot glitch
  arm64: dts: qcom: x1e80100-yoga-slim7x: fix nvme regulator boot glitch
  ...
parents 557329bc bbfbb579

Documentation/devicetree/bindings/firmware/arm,scmi.yaml

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ properties: 
      atomic mode of operation, even if requested.

    default: 0



  max-rx-timeout-ms:

  arm,max-rx-timeout-ms:

    description:

      An optional time value, expressed in milliseconds, representing the

      transport maximum timeout value for the receive channel. The value should

MAINTAINERS

+5 −7
Original line number Diff line number Diff line
@@ -2852,7 +2852,7 @@ F: Documentation/devicetree/bindings/arm/qcom.yaml 
F:	Documentation/devicetree/bindings/bus/qcom*

F:	Documentation/devicetree/bindings/cache/qcom,llcc.yaml

F:	Documentation/devicetree/bindings/firmware/qcom,scm.yaml

F:	Documentation/devicetree/bindings/reserved-memory/qcom

F:	Documentation/devicetree/bindings/reserved-memory/qcom*

F:	Documentation/devicetree/bindings/soc/qcom/

F:	arch/arm/boot/dts/qcom/

F:	arch/arm/configs/qcom_defconfig
@@ -19846,12 +19846,10 @@ L: linux-riscv@lists.infradead.org 
S:	Maintained

Q:	https://patchwork.kernel.org/project/linux-riscv/list/

T:	git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/

F:	Documentation/devicetree/bindings/riscv/

F:	arch/riscv/boot/dts/

X:	arch/riscv/boot/dts/allwinner/

X:	arch/riscv/boot/dts/renesas/

X:	arch/riscv/boot/dts/sophgo/

X:	arch/riscv/boot/dts/thead/

F:	arch/riscv/boot/dts/canaan/

F:	arch/riscv/boot/dts/microchip/

F:	arch/riscv/boot/dts/sifive/

F:	arch/riscv/boot/dts/starfive/









RISC-V PMU DRIVERS









M:	Atish Patra <atishp@atishpatra.org>

























arch/arm/boot/dts/rockchip/rk3036-kylin.dts



+2
−2






























Original line number
Diff line number
Diff line







@@ -325,8 +325,8 @@ regulator-state-mem {







&i2c2 {









	status = "okay";



















	rt5616: rt5616@1b {









		compatible = "rt5616";









	rt5616: audio-codec@1b {









		compatible = "realtek,rt5616";









		reg = <0x1b>;









		clocks = <&cru SCLK_I2S_OUT>;









		clock-names = "mclk";
































arch/arm/boot/dts/rockchip/rk3036.dtsi



+7
−7






























Original line number
Diff line number
Diff line







@@ -384,12 +384,13 @@ reboot-mode {







		};









	};



















	acodec: acodec-ana@20030000 {









		compatible = "rk3036-codec";









	acodec: audio-codec@20030000 {









		compatible = "rockchip,rk3036-codec";









		reg = <0x20030000 0x4000>;









		rockchip,grf = <&grf>;









		clock-names = "acodec_pclk";









		clocks = <&cru PCLK_ACODEC>;









		rockchip,grf = <&grf>;









		#sound-dai-cells = <0>;









		status = "disabled";









	};


















@@ -399,7 +400,6 @@ hdmi: hdmi@20034000 {







		interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;









		clocks = <&cru  PCLK_HDMI>;









		clock-names = "pclk";









		rockchip,grf = <&grf>;









		pinctrl-names = "default";









		pinctrl-0 = <&hdmi_ctl>;









		#sound-dai-cells = <0>;








@@ -553,11 +553,11 @@ i2c0: i2c@20072000 {







	};



















	spi: spi@20074000 {









		compatible = "rockchip,rockchip-spi";









		compatible = "rockchip,rk3036-spi";









		reg = <0x20074000 0x1000>;









		interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;









		clocks = <&cru PCLK_SPI>, <&cru SCLK_SPI>;









		clock-names = "apb-pclk","spi_pclk";









		clocks = <&cru SCLK_SPI>, <&cru PCLK_SPI>;









		clock-names = "spiclk", "apb_pclk";









		dmas = <&pdma 8>, <&pdma 9>;









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









		pinctrl-names = "default";
































arch/arm64/boot/dts/freescale/imx8-ss-lvds0.dtsi



+6
−6






























Original line number
Diff line number
Diff line







@@ -14,7 +14,7 @@ qm_lvds0_lis_lpcg: qxp_mipi1_lis_lpcg: clock-controller@56243000 {







		compatible = "fsl,imx8qxp-lpcg";









		reg = <0x56243000 0x4>;









		#clock-cells = <1>;









		clock-output-names = "mipi1_lis_lpcg_ipg_clk";









		clock-output-names = "lvds0_lis_lpcg_ipg_clk";









		power-domains = <&pd IMX_SC_R_MIPI_1>;









	};


















@@ -22,9 +22,9 @@ qm_lvds0_pwm_lpcg: qxp_mipi1_pwm_lpcg: clock-controller@5624300c {







		compatible = "fsl,imx8qxp-lpcg";









		reg = <0x5624300c 0x4>;









		#clock-cells = <1>;









		clock-output-names = "mipi1_pwm_lpcg_clk",









				     "mipi1_pwm_lpcg_ipg_clk",









				     "mipi1_pwm_lpcg_32k_clk";









		clock-output-names = "lvds0_pwm_lpcg_clk",









				     "lvds0_pwm_lpcg_ipg_clk",









				     "lvds0_pwm_lpcg_32k_clk";









		power-domains = <&pd IMX_SC_R_MIPI_1_PWM_0>;









	};


















@@ -32,8 +32,8 @@ qm_lvds0_i2c0_lpcg: qxp_mipi1_i2c0_lpcg: clock-controller@56243010 {







		compatible = "fsl,imx8qxp-lpcg";









		reg = <0x56243010 0x4>;









		#clock-cells = <1>;









		clock-output-names = "mipi1_i2c0_lpcg_clk",









				     "mipi1_i2c0_lpcg_ipg_clk";









		clock-output-names = "lvds0_i2c0_lpcg_clk",









				     "lvds0_i2c0_lpcg_ipg_clk";









		power-domains = <&pd IMX_SC_R_MIPI_1_I2C_0>;









	};