Commit c69cf88c authored Sep 22, 2022 by Linus Torvalds

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

Pull ARM SoC fixes from Arnd Bergmann:
 "Another set of fixes for fixes for the soc tree:

   - A fix for the interrupt number on at91/lan966 ethernet PHYs

   - A second round of fixes for NXP i.MX series, including a couple of
     build issues, and board specific DT corrections on TQMa8MPQL,
     imx8mp-venice-gw74xx and imx8mm-verdin for reliability and
     partially broken functionality

   - Several fixes for Rockchip SoCs, addressing a USB issue on
     BPI-R2-Pro, wakeup on Gru-Bob and reliability of high-speed SD
     cards, among other minor issues

   - A fix for a long-running naming mistake that prevented the moxart
     mmc driver from working at all

   - Multiple Arm SCMI firmware fixes for hardening some corner cases"

* tag 'soc-fixes-6.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (30 commits)
  arm64: dts: imx8mp-venice-gw74xx: fix port/phy validation
  ARM: dts: lan966x: Fix the interrupt number for internal PHYs
  arm64: dts: imx8mp-venice-gw74xx: fix ksz9477 cpu port
  arm64: dts: imx8mp-venice-gw74xx: fix CAN STBY polarity
  dt-bindings: memory-controllers: fsl,imx8m-ddrc: drop Leonard Crestez
  arm64: dts: tqma8mqml: Include phy-imx8-pcie.h header
  arm64: defconfig: enable ARCH_NXP
  arm64: dts: imx8mp-tqma8mpql-mba8mpxl: add missing pinctrl for RTC alarm
  ARM: dts: fix Moxa SDIO 'compatible', remove 'sdhci' misnomer
  arm64: dts: imx8mm-verdin: extend pmic voltages
  arm64: dts: rockchip: Remove 'enable-active-low' from rk3566-quartz64-a
  arm64: dts: rockchip: Remove 'enable-active-low' from rk3399-puma
  arm64: dts: rockchip: fix property for usb2 phy supply on rk3568-evb1-v10
  arm64: dts: rockchip: fix property for usb2 phy supply on rock-3a
  arm64: dts: imx8ulp: add #reset-cells for pcc
  arm64: dts: tqma8mpxl-ba8mpxl: Fix button GPIOs
  arm64: dts: imx8mn: remove GPU power domain reset
  arm64: dts: rockchip: Set RK3399-Gru PCLK_EDP to 24 MHz
  arm64: dts: imx8mm: Reverse CPLD_Dn GPIO label mapping on MX8Menlo
  arm64: dts: rockchip: fix upper usb port on BPI-R2-Pro
  ...

parents 504c25cb aaa58141

Documentation/devicetree/bindings/dma/moxa,moxart-dma.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -34,8 +34,8 @@ Example:
		Use specific request line passing from dma
		For example, MMC request line is 5

		sdhci: sdhci@98e00000 {
		compatible = "moxa,moxart-sdhci";
		mmc: mmc@98e00000 {
		compatible = "moxa,moxart-mmc";
		reg = <0x98e00000 0x5C>;
		interrupts = <5 0>;
		clocks = <&clk_apb>;

Documentation/devicetree/bindings/memory-controllers/fsl/imx8m-ddrc.yaml

+1 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
		title: i.MX8M DDR Controller

		maintainers:
		- Leonard Crestez <leonard.crestez@nxp.com>
		- Peng Fan <peng.fan@nxp.com>

		description:
		The DDRC block is integrated in i.MX8M for interfacing with DDR based

arch/arm/boot/dts/lan966x.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -541,13 +541,13 @@

		phy0: ethernet-phy@1 {
		reg = <1>;
		interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
		interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
		status = "disabled";
		};

		phy1: ethernet-phy@2 {
		reg = <2>;
		interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
		interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
		status = "disabled";
		};
		};

arch/arm/boot/dts/moxart-uc7112lx.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -79,7 +79,7 @@
		clocks = <&ref12>;
		};

		&sdhci {
		&mmc {
		status = "okay";
		};

arch/arm/boot/dts/moxart.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -93,8 +93,8 @@
		clock-names = "PCLK";
		};

		sdhci: sdhci@98e00000 {
		compatible = "moxa,moxart-sdhci";
		mmc: mmc@98e00000 {
		compatible = "moxa,moxart-mmc";
		reg = <0x98e00000 0x5C>;
		interrupts = <5 IRQ_TYPE_LEVEL_HIGH>;
		clocks = <&clk_apb>;