git.openwrt.org Git - openwrt/staging/linusw.git/blob

   1 From 8ee4a5f4f40da60bb85e13d9dd218a3c9197e3e3 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Marek=20Beh=C3=BAn?= <kabel@kernel.org>
   3 Date: Sun, 15 Nov 2020 14:59:22 +0100
   4 Subject: ARM: dts: turris-omnia: update ethernet-phy node and handle name
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 Use property name `phy-handle` instead of the deprecated `phy` to
  10 connect eth2 to the PHY.
  11 Rename the node from "phy@1" to "ethernet-phy@1", since "phy@1" is
  12 incorrect according to device-tree bindings documentation.
  13 Also remove the "ethernet-phy-id0141.0DD1" compatible string, it is not
  14 needed. Kernel can read the PHY identifier itself.
  15
  16 Signed-off-by: Marek Behún <kabel@kernel.org>
  17 Reviewed-by: Andrew Lunn <andrew@lunn.ch>
  18 Cc: linux-arm-kernel@lists.infradead.org
  19 Cc: Uwe Kleine-König <uwe@kleine-koenig.org>
  20 Cc: Jason Cooper <jason@lakedaemon.net>
  21 Cc: Gregory CLEMENT <gregory.clement@bootlin.com>
  22 Cc: Andreas Färber <afaerber@suse.de>
  23 Cc: Rob Herring <robh+dt@kernel.org>
  24 Cc: devicetree@vger.kernel.org
  25 Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
  26 ---
  27  arch/arm/boot/dts/armada-385-turris-omnia.dts | 6 +++---
  28  1 file changed, 3 insertions(+), 3 deletions(-)
  29
  30 --- a/arch/arm/boot/dts/armada-385-turris-omnia.dts
  31 +++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts
  32 @@ -155,7 +155,7 @@
  33          */
  34         status = "okay";
  35         phy-mode = "sgmii";
  36 -       phy = <&phy1>;
  37 +       phy-handle = <&phy1>;
  38         phys = <&comphy5 2>;
  39         sfp = <&sfp>;
  40         buffer-manager = <&bm>;
  41 @@ -278,9 +278,9 @@
  42         pinctrl-0 = <&mdio_pins>;
  43         status = "okay";
  44
  45 -       phy1: phy@1 {
  46 +       phy1: ethernet-phy@1 {
  47                 status = "okay";
  48 -               compatible = "ethernet-phy-id0141.0DD1", "ethernet-phy-ieee802.3-c22";
  49 +               compatible = "ethernet-phy-ieee802.3-c22";
  50                 reg = <1>;
  51                 marvell,reg-init = <3 18 0 0x4985>;
  52