Commit b11ddaac authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sunxi-fixes-for-5.10-2' of... 

Merge tag 'sunxi-fixes-for-5.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/fixes

A few more RGMII-ID fixes, and a bunch of other more random fixes

* tag 'sunxi-fixes-for-5.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  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

Link: https://lore.kernel.org/r/1280f1de-1b6d-4cc2-8448-e5a9096a41e8.lettre@localhost


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 0477e928 a7361b9c

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";

};

arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright 2015 Adam Sampson <ats@offog.org>

 * Copyright 2015-2020 Adam Sampson <ats@offog.org>

 *

 * This file is dual-licensed: you can use it either under the terms

 * of the GPL or the X11 license, at your option. Note that this dual
@@ -115,7 +115,7 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&gmac_rgmii_pins>;

	phy-handle = <&phy1>;

	phy-mode = "rgmii";

	phy-mode = "rgmii-id";

	status = "okay";

};

arch/arm/boot/dts/sun8i-s3-pinecube.dts

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 


/ {

	model = "PineCube IP Camera";

	compatible = "pine64,pinecube", "allwinner,sun8i-s3";

	compatible = "pine64,pinecube", "sochip,s3", "allwinner,sun8i-v3";



	aliases {

		serial0 = &uart2;

arch/arm/boot/dts/sun8i-v3s.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -539,7 +539,7 @@ 
		gic: interrupt-controller@1c81000 {

			compatible = "arm,gic-400";

			reg = <0x01c81000 0x1000>,

			      <0x01c82000 0x1000>,

			      <0x01c82000 0x2000>,

			      <0x01c84000 0x2000>,

			      <0x01c86000 0x2000>;

			interrupt-controller;

arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts

+6 −6
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&gmac_rgmii_pins>;

	phy-handle = <&phy1>;

	phy-mode = "rgmii";

	phy-mode = "rgmii-id";

	phy-supply = <&reg_dc1sw>;

	status = "okay";

};
@@ -198,16 +198,16 @@ 
};



&reg_dc1sw {

	regulator-min-microvolt = <3000000>;

	regulator-max-microvolt = <3000000>;

	regulator-min-microvolt = <3300000>;

	regulator-max-microvolt = <3300000>;

	regulator-name = "vcc-gmac-phy";

};



&reg_dcdc1 {

	regulator-always-on;

	regulator-min-microvolt = <3000000>;

	regulator-max-microvolt = <3000000>;

	regulator-name = "vcc-3v0";

	regulator-min-microvolt = <3300000>;

	regulator-max-microvolt = <3300000>;

	regulator-name = "vcc-3v3";

};



&reg_dcdc2 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE