Commit b57d5437 authored Nov 13, 2020 by Arnd Bergmann

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

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

Mostly some fixes for a fallout in a PHY driver that pointed out errors
in our DTs. Along with that, Jernej agreed to be a reviewer!

* tag 'sunxi-fixes-for-5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
arm64: dts: allwinner: h5: OrangePi Prime: Fix ethernet node
arm64: dts: allwinner: a64: bananapi-m64: Enable RGMII RX/TX delay on PHY
arm64: dts: allwinner: h5: libretech-all-h5-cc: Enable RGMII RX/TX delay on PHY
ARM: dts: sunxi: bananapi-m2-plus: Enable RGMII RX/TX delay on Ethernet PHY
ARM: dts: sun9i: Enable both RGMII RX/TX delay on Ethernet PHY
ARM: dts: sun8i: a83t: Enable both RGMII RX/TX delay on Ethernet PHY
ARM: dts: sun8i: h3: orangepi-plus2e: Enable RGMII RX/TX delay on Ethernet PHY
ARM: dts: sun7i: bananapi-m1-plus: Enable RGMII RX/TX delay on Ethernet PHY
ARM: dts: sun7i: cubietruck: Enable RGMII RX/TX delay on Ethernet PHY
ARM: dts: sun6i: a31-hummingbird: Enable RGMII RX/TX delay on Ethernet PHY
Revert "arm: sun8i: orangepi-pc-plus: Set EMAC activity LEDs to active high"
ARM: dts: sun8i: r40: bananapi-m2-ultra: Fix ethernet node
arm64: dts: allwinner: h5: OrangePi PC2: Fix ethernet node
arm64: dts: allwinner: a64: Pine64 Plus: Fix ethernet node
arm64: dts: allwinner: a64: OrangePi Win: Fix ethernet node
arm64: dts: allwinner: Pine H64: Enable both RGMII RX/TX delay
arm64: dts: allwinner: beelink-gs1: Enable both RGMII RX/TX delay
arm64: dts: allwinner: pinetab: Drop unnecessary address/size-cells information
MAINTAINERS: Add Jernej Škrabec as a reviewer for Allwinner SoCs support

Link: https://lore.kernel.org/r/d1a1a6a6-fca4-4f1b-93b3-f2f6963b4e04.lettre@localhost

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 7e47a750 107954af

MAINTAINERS

+1 −0

Original line number	Diff line number	Diff line
		@@ -1546,6 +1546,7 @@ F: drivers/clk/sunxi/
		ARM/Allwinner sunXi SoC support
		M: Maxime Ripard <mripard@kernel.org>
		M: Chen-Yu Tsai <wens@csie.org>
		R: Jernej Skrabec <jernej.skrabec@siol.net>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		S: Maintained
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git

arch/arm/boot/dts/sun6i-a31-hummingbird.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -154,7 +154,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/sun7i-a20-bananapi-m1-plus.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -130,7 +130,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-cubietruck.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -151,7 +151,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-a83t-bananapi-m3.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -131,7 +131,7 @@
		pinctrl-0 = <&emac_rgmii_pins>;
		phy-supply = <&reg_sw>;
		phy-handle = <&rgmii_phy>;
		phy-mode = "rgmii";
		phy-mode = "rgmii-id";
		allwinner,rx-delay-ps = <700>;
		allwinner,tx-delay-ps = <700>;
		status = "okay";

Admin message