Commit 1ed46384 authored Jan 20, 2023 by Linus Torvalds

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

Pull ARM SoC DT and driver fixes from Arnd Bergmann:
 "Lots of dts fixes for Qualcomm Snapdragon and NXP i.MX platforms,
  including:

   - A regression fix for SDHCI controllers on Inforce 6540, and another
     SDHCI fix on SM8350

   - Reenable cluster idle on sm8250 after the the code fix is upstream

   - multiple fixes for the QMP PHY binding, needing an incompatible dt
     change

   - The reserved memory map is updated on Xiaomi Mi 4C and Huawei Nexus
     6P, to avoid instabilities caused by use of protected memory
     regions

   - Fix i.MX8MP DT for missing GPC Interrupt, power-domain typo and USB
     clock error

   - A couple of verdin-imx8mm DT fixes for audio playback support

   - Fix pca9547 i2c-mux node name for i.MX and Vybrid device trees

   - Fix an imx93-11x11-evk uSDHC pad setting problem that causes Micron
     eMMC CMD8 CRC error in HS400ES/HS400 mode

  The remaining ARM and RISC-V platforms only have very few smaller dts
  bugfixes this time:

   - A fix for the SiFive unmatched board's PCI memory space

   - A revert to fix a regression with GPIO on Marvell Armada

   - A fix for the UART address on Marvell AC5

   - Missing chip-select phandles for stm32 boards

   - Selecting the correct clock for the sam9x60 memory controller

   - Amlogic based Odroid-HC4 needs a revert to restore USB
     functionality.

  And finally, there are some minor code fixes:

   - Build fixes for OMAP1, pxa, riscpc, raspberry pi firmware, and zynq
     firmware

   - memory controller driver fixes for an OMAP regression and older
     bugs on tegra, atmel and mvebu

   - reset controller fixes for ti-sci and uniphier platforms

   - ARM SCMI firmware fixes for a couple of rare corner cases

   - Qualcomm platform driver fixes for incorrect error handling and a
     backwards compatibility fix for the apr driver using older dtb

   - NXP i.MX SoC driver fixes for HDMI output, error handling in the
     imx8 soc-id and missing reference counting on older cpuid code"

* tag 'soc-fixes-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (60 commits)
  firmware: zynqmp: fix declarations for gcc-13
  ARM: dts: stm32: Fix qspi pinctrl phandle for stm32mp151a-prtt1l
  ARM: dts: stm32: Fix qspi pinctrl phandle for stm32mp157c-emstamp-argon
  ARM: dts: stm32: Fix qspi pinctrl phandle for stm32mp15xx-dhcom-som
  ARM: dts: stm32: Fix qspi pinctrl phandle for stm32mp15xx-dhcor-som
  ARM: dts: at91: sam9x60: fix the ddr clock for sam9x60
  ARM: omap1: fix building gpio15xx
  ARM: omap1: fix !ARCH_OMAP1_ANY link failures
  firmware: raspberrypi: Fix type assignment
  arm64: dts: qcom: msm8992-libra: Fix the memory map
  arm64: dts: qcom: msm8992: Don't use sfpb mutex
  PM: AVS: qcom-cpr: Fix an error handling path in cpr_probe()
  arm64: dts: msm8994-angler: fix the memory map
  arm64: dts: marvell: AC5/AC5X: Fix address for UART1
  ARM: footbridge: drop unnecessary inclusion
  Revert "ARM: dts: armada-39x: Fix compatible string for gpios"
  Revert "ARM: dts: armada-38x: Fix compatible string for gpios"
  ARM: pxa: enable PXA310/PXA320 for DT-only build
  riscv: dts: sifive: fu740: fix size of pcie 32bit memory
  soc: qcom: apr: Make qcom,protection-domain optional again
  ...

parents ff83fec8 d2c86555

Documentation/devicetree/bindings/soc/qcom/qcom,apr-services.yaml

+2 −3

Original line number	Diff line number	Diff line
		@@ -39,8 +39,8 @@ properties:
		qcom,protection-domain:
		$ref: /schemas/types.yaml#/definitions/string-array
		description: \|
		Protection domain service name and path for APR service
		possible values are::
		Protection domain service name and path for APR service (if supported).
		Possible values are::
		"avs/audio", "msm/adsp/audio_pd".
		"kernel/elf_loader", "msm/modem/wlan_pd".
		"tms/servreg", "msm/adsp/audio_pd".
		@@ -49,6 +49,5 @@ properties:

		required:
		- reg
		- qcom,protection-domain

		additionalProperties: true

arch/arm/boot/dts/armada-38x.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -304,7 +304,7 @@ spdif_pins: spdif-pins {
		};

		gpio0: gpio@18100 {
		compatible = "marvell,armadaxp-gpio",
		compatible = "marvell,armada-370-gpio",
		"marvell,orion-gpio";
		reg = <0x18100 0x40>, <0x181c0 0x08>;
		reg-names = "gpio", "pwm";
		@@ -323,7 +323,7 @@ gpio0: gpio@18100 {
		};

		gpio1: gpio@18140 {
		compatible = "marvell,armadaxp-gpio",
		compatible = "marvell,armada-370-gpio",
		"marvell,orion-gpio";
		reg = <0x18140 0x40>, <0x181c8 0x08>;
		reg-names = "gpio", "pwm";

arch/arm/boot/dts/armada-39x.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -213,7 +213,7 @@ nand_pins: nand-pins {
		};

		gpio0: gpio@18100 {
		compatible = "marvell,armadaxp-gpio", "marvell,orion-gpio";
		compatible = "marvell,orion-gpio";
		reg = <0x18100 0x40>;
		ngpios = <32>;
		gpio-controller;
		@@ -227,7 +227,7 @@ gpio0: gpio@18100 {
		};

		gpio1: gpio@18140 {
		compatible = "marvell,armadaxp-gpio", "marvell,orion-gpio";
		compatible = "marvell,orion-gpio";
		reg = <0x18140 0x40>;
		ngpios = <28>;
		gpio-controller;

arch/arm/boot/dts/imx53-ppd.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -488,7 +488,7 @@ &i2c1 {
		scl-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;
		status = "okay";

		i2c-switch@70 {
		i2c-mux@70 {
		compatible = "nxp,pca9547";
		#address-cells = <1>;
		#size-cells = <0>;

arch/arm/boot/dts/imx6qdl-gw560x.dtsi

+0 −1

Original line number	Diff line number	Diff line
		@@ -632,7 +632,6 @@ &ssi1 {
		&uart1 {
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_uart1>;
		uart-has-rtscts;
		rts-gpios = <&gpio7 1 GPIO_ACTIVE_HIGH>;
		status = "okay";
		};