mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-10-30 21:44:27 -04:00
b3b855191b
Kernel 5.10 receives the complete set of improvements from 5.11/5.12. While we are at it, move the patches accepted upstream to the 0xx series. Signed-off-by: Klaus Kudielka <klaus.kudielka@gmail.com>
53 lines
1.8 KiB
Diff
53 lines
1.8 KiB
Diff
From 8ee4a5f4f40da60bb85e13d9dd218a3c9197e3e3 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Marek=20Beh=C3=BAn?= <kabel@kernel.org>
|
|
Date: Sun, 15 Nov 2020 14:59:22 +0100
|
|
Subject: ARM: dts: turris-omnia: update ethernet-phy node and handle name
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Use property name `phy-handle` instead of the deprecated `phy` to
|
|
connect eth2 to the PHY.
|
|
Rename the node from "phy@1" to "ethernet-phy@1", since "phy@1" is
|
|
incorrect according to device-tree bindings documentation.
|
|
Also remove the "ethernet-phy-id0141.0DD1" compatible string, it is not
|
|
needed. Kernel can read the PHY identifier itself.
|
|
|
|
Signed-off-by: Marek Behún <kabel@kernel.org>
|
|
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|
Cc: linux-arm-kernel@lists.infradead.org
|
|
Cc: Uwe Kleine-König <uwe@kleine-koenig.org>
|
|
Cc: Jason Cooper <jason@lakedaemon.net>
|
|
Cc: Gregory CLEMENT <gregory.clement@bootlin.com>
|
|
Cc: Andreas Färber <afaerber@suse.de>
|
|
Cc: Rob Herring <robh+dt@kernel.org>
|
|
Cc: devicetree@vger.kernel.org
|
|
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
|
|
---
|
|
arch/arm/boot/dts/armada-385-turris-omnia.dts | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/armada-385-turris-omnia.dts
|
|
+++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts
|
|
@@ -156,7 +156,7 @@
|
|
*/
|
|
status = "okay";
|
|
phy-mode = "sgmii";
|
|
- phy = <&phy1>;
|
|
+ phy-handle = <&phy1>;
|
|
phys = <&comphy5 2>;
|
|
sfp = <&sfp>;
|
|
buffer-manager = <&bm>;
|
|
@@ -387,9 +387,9 @@
|
|
pinctrl-0 = <&mdio_pins>;
|
|
status = "okay";
|
|
|
|
- phy1: phy@1 {
|
|
+ phy1: ethernet-phy@1 {
|
|
status = "okay";
|
|
- compatible = "ethernet-phy-id0141.0DD1", "ethernet-phy-ieee802.3-c22";
|
|
+ compatible = "ethernet-phy-ieee802.3-c22";
|
|
reg = <1>;
|
|
marvell,reg-init = <3 18 0 0x4985>;
|
|
|