Commit a2f5ea9e authored Dec 09, 2020 by Linus Torvalds

Merge tag 'arm-soc-fixes-v5.10-4b' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Pull ARM SoC fixes from Arnd Bergmann:
 "There are a few more PHY mode changes for allwinner SoC based boards
  with a Realtek PHY after the driver changed its behavior, I assume
  there will be more of these in the future. Also on for Allwinner, the
  Banana Pi M2 board had a regression that led to some devices not
  working because of a slightly incorrect voltage being applied.

  By popular demand, I picked up a change from Krzysztof Kozlowski to
  actually list the SoC tree in the MAINTAINERS file. We don't want to
  get Cc'd on normal patches that are picked up by platform maintainers,
  but the lack of an entry has led to confusion in the past.

  All the other changes are fairly benign, fixing boot-time or
  compile-time warning messages in various places:

   - A dtc warning on the OLPC XO-1.75

   - A boot-time warning on i.MX6 wandboard

   - A harmless compile-time warning

   - A regression causing one of the i.MX6 SoCs to be identified as
     another

   - Missing SoC identification of Allwinner V3 and S3"

* tag 'arm-soc-fixes-v5.10-4b' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  firmware: xilinx: Mark pm_api_features_map with static keyword
  ARM: dts: mmp2-olpc-xo-1-75: clear the warnings when make dtbs
  MAINTAINERS: add a limited ARM and ARM64 SoC entry
  MAINTAINERS: correct SoC Git address (formerly: arm-soc)
  ARM: keystone: remove SECTION_SIZE_BITS/MAX_PHYSMEM_BITS
  arm64: dts: allwinner: H5: NanoPi Neo Plus2: phy-mode rgmii-id
  arm64: dts: allwinner: A64 Sopine: phy-mode rgmii-id
  ARM: dts: imx6qdl-kontron-samx6i: fix I2C_PM scl pin
  ARM: dts: imx6qdl-wandboard-revd1: Remove PAD_GPIO_6 from enetgrp
  ARM: imx: Use correct SRC base address
  ARM: dts: sun7i: pcduino3-nano: enable RGMII RX/TX delay on PHY
  ARM: dts: sun8i: v3s: fix GIC node memory range
  ARM: dts: sun8i: v40: bananapi-m2-berry: Fix ethernet node
  ARM: dts: sun8i: r40: bananapi-m2-berry: Fix dcdc1 regulator
  ARM: dts: sun7i: bananapi: Enable RGMII RX/TX delay on Ethernet PHY
  ARM: dts: s3: pinecube: align compatible property to other S3 boards
  ARM: sunxi: Add machine match for the Allwinner V3 SoC
  arm64: dts: allwinner: h6: orangepi-one-plus: Fix ethernet

parents ca4bbdaf 69fe24d1

MAINTAINERS

+11 −1

Original line number	Diff line number	Diff line
		@@ -1486,10 +1486,20 @@ F: Documentation/devicetree/bindings/iommu/arm,smmu*
		F: drivers/iommu/arm/
		F: drivers/iommu/io-pgtable-arm*

		ARM AND ARM64 SoC SUB-ARCHITECTURES (COMMON PARTS)
		M: Arnd Bergmann <arnd@arndb.de>
		M: Olof Johansson <olof@lixom.net>
		M: soc@kernel.org
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		S: Maintained
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
		F: arch/arm/boot/dts/Makefile
		F: arch/arm64/boot/dts/Makefile

		ARM SUB-ARCHITECTURES
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		S: Maintained
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
		F: arch/arm/mach-*/
		F: arch/arm/plat-*/

arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -551,7 +551,7 @@

		pinctrl_i2c3: i2c3grp {
		fsl,pins = <
		MX6QDL_PAD_GPIO_3__I2C3_SCL 0x4001b8b1
		MX6QDL_PAD_GPIO_5__I2C3_SCL 0x4001b8b1
		MX6QDL_PAD_GPIO_16__I2C3_SDA 0x4001b8b1
		>;
		};

arch/arm/boot/dts/imx6qdl-wandboard-revd1.dtsi

+0 −1

Original line number	Diff line number	Diff line
		@@ -166,7 +166,6 @@
		MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b030
		MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b030
		MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b030
		MX6QDL_PAD_GPIO_6__ENET_IRQ 0x000b1
		>;
		};

arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts

+1 −2

Original line number	Diff line number	Diff line
		@@ -223,8 +223,7 @@
		};

		&ssp3 {
		/delete-property/ #address-cells;
		/delete-property/ #size-cells;
		#address-cells = <0>;
		spi-slave;
		status = "okay";
		ready-gpios = <&gpio 125 GPIO_ACTIVE_HIGH>;

arch/arm/boot/dts/sun7i-a20-bananapi.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -132,7 +132,7 @@
		pinctrl-names = "default";
		pinctrl-0 = <&gmac_rgmii_pins>;
		phy-handle = <&phy1>;
		phy-mode = "rgmii";
		phy-mode = "rgmii-id";
		phy-supply = <&reg_gmac_3v3>;
		status = "okay";
		};

Admin message