Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0AB44C4338F for ; Sat, 31 Jul 2021 07:42:07 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6145F60F35 for ; Sat, 31 Jul 2021 07:42:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 6145F60F35 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 140C482BB2; Sat, 31 Jul 2021 09:42:03 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1627717323; bh=CiwxD0Q+A4YBaXrVHY1bRfkIoHJ8iF/VN1YtM+3FHZo=; h=Subject:To:Cc:References:From:Date:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=UxbSOVnI1I29r63VKc/LkokzgPTBbWWHMwEEKvY51TPNrd6tIpco9A0TAwvwN4tfQ lrOciT2icr0PsheG8co/pjZBopmCyx2a5pJIjHGCXW6ldwHNvrdM9PGXtq3Cx4Xxf1 FJSMssHmMnjMKeiFbe5+YqhDYxQJgW+XaWwHKegVBTp6DsDqLngJKLnndt05UEYIxa qt9/1Kspaq4WZ9e1Hb3fwdi0MKui2Ugb3r7fE1E06fJ4bAeADxM9qnnd9/vuIkA7OY oVQjy4RjtESVPpdxt7mGd5286bB8Yg6lrdewHUJ0h7SJFxrrNUcEFJG6+auo4UQiuq HkQH5WLWnQTag== Received: by phobos.denx.de (Postfix, from userid 109) id 56FD08322C; Sat, 31 Jul 2021 09:41:59 +0200 (CEST) Received: from mout-u-107.mailbox.org (mout-u-107.mailbox.org [91.198.250.252]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id DDC9F82BB2 for ; Sat, 31 Jul 2021 09:41:55 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=sr@denx.de Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-u-107.mailbox.org (Postfix) with ESMTPS id 4GcGS34dNwzQk93; Sat, 31 Jul 2021 09:41:55 +0200 (CEST) Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter02.heinlein-hosting.de (spamfilter02.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id 36s4-gmobkV5; Sat, 31 Jul 2021 09:41:52 +0200 (CEST) Subject: Re: [PATCH 2/3] arm: kirkwood: Dreamplug: Use Ethernet PHY name and address from device tree To: Tony Dinh , U-Boot Mailing List , Jason Cooper Cc: Chris Packham , Tom Rini , Simon Glass References: <20210726060121.7253-1-mibodhi@gmail.com> <20210726060121.7253-3-mibodhi@gmail.com> From: Stefan Roese Message-ID: <64fd303b-ca30-b2b3-92ef-d31e99299fed@denx.de> Date: Sat, 31 Jul 2021 09:41:52 +0200 MIME-Version: 1.0 In-Reply-To: <20210726060121.7253-3-mibodhi@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: AF50522F X-Rspamd-UID: 877ec6 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean On 26.07.21 08:01, Tony Dinh wrote: > In DM Ethernet, the old "egiga0" and 'egiga1" names are no longer valid, > so replace these with Ethernet PHY names from device tree. Also, read > Ethernet PHY address for each port from device tree. > > Signed-off-by: Tony Dinh > --- > > board/Marvell/dreamplug/dreamplug.c | 62 ++++++++++++++++++++++------- > 1 file changed, 48 insertions(+), 14 deletions(-) > > diff --git a/board/Marvell/dreamplug/dreamplug.c b/board/Marvell/dreamplug/dreamplug.c > index e1c64b5224..d5b6b22ddf 100644 > --- a/board/Marvell/dreamplug/dreamplug.c > +++ b/board/Marvell/dreamplug/dreamplug.c > @@ -1,5 +1,6 @@ > // SPDX-License-Identifier: GPL-2.0+ > /* > + * Copyright (C) 2021 Tony Dinh > * (C) Copyright 2011 > * Jason Cooper > * > @@ -97,42 +98,75 @@ int board_init(void) > return 0; > } > > +static int fdt_get_phy_addr(const char *path) > +{ > + const void *fdt = gd->fdt_blob; > + const u32 *reg; > + const u32 *val; > + int node, phandle, addr; > + > + /* Find the node by its full path */ > + node = fdt_path_offset(fdt, path); > + if (node >= 0) { > + /* Look up phy-handle */ > + val = fdt_getprop(fdt, node, "phy-handle", NULL); > + if (val) { > + phandle = fdt32_to_cpu(*val); > + if (!phandle) > + return -1; > + /* Follow it to its node */ > + node = fdt_node_offset_by_phandle(fdt, phandle); > + if (node) { > + /* Look up reg */ > + reg = fdt_getprop(fdt, node, "reg", NULL); > + if (reg) { > + addr = fdt32_to_cpu(*reg); > + return addr; > + } > + } > + } > + } > + return -1; > +} You've added this exact some function now for the 3rd time IIRC. Could please please consolidate this function into one of the fdt / dt common functions instead? Perhaps there is already something similar for reading PHY addresses? Please do this in a follow-up patch, after I've pulled this one. Other that this: Reviewed-by: Stefan Roese Thanks, Stefan > + > #ifdef CONFIG_RESET_PHY_R > -void mv_phy_88e1116_init(char *name) > +void mv_phy_88e1116_init(const char *name, const char *path) > { > u16 reg; > - u16 devadr; > + int phyaddr; > > if (miiphy_set_current_dev(name)) > return; > > - /* command to read PHY dev address */ > - if (miiphy_read(name, 0xEE, 0xEE, (u16 *) &devadr)) { > - printf("Err..%s could not read PHY dev address\n", > - __func__); > + phyaddr = fdt_get_phy_addr(path); > + if (phyaddr < 0) > return; > - } > > /* > * Enable RGMII delay on Tx and Rx for CPU port > * Ref: sec 4.7.2 of chip datasheet > */ > - miiphy_write(name, devadr, MV88E1116_PGADR_REG, 2); > - miiphy_read(name, devadr, MV88E1116_MAC_CTRL2_REG, ®); > + miiphy_write(name, phyaddr, MV88E1116_PGADR_REG, 2); > + miiphy_read(name, phyaddr, MV88E1116_MAC_CTRL2_REG, ®); > reg |= (MV88E1116_RGMII_RXTM_CTRL | MV88E1116_RGMII_TXTM_CTRL); > - miiphy_write(name, devadr, MV88E1116_MAC_CTRL2_REG, reg); > - miiphy_write(name, devadr, MV88E1116_PGADR_REG, 0); > + miiphy_write(name, phyaddr, MV88E1116_MAC_CTRL2_REG, reg); > + miiphy_write(name, phyaddr, MV88E1116_PGADR_REG, 0); > > /* reset the phy */ > - miiphy_reset(name, devadr); > + miiphy_reset(name, phyaddr); > > printf("88E1116 Initialized on %s\n", name); > } > > void reset_phy(void) > { > + char *eth0_name = "ethernet-controller@72000"; > + char *eth0_path = "/ocp@f1000000/ethernet-controller@72000/ethernet0-port@0"; > + char *eth1_name = "ethernet-controller@76000"; > + char *eth1_path = "/ocp@f1000000/ethernet-controller@72000/ethernet1-port@0"; > + > /* configure and initialize both PHY's */ > - mv_phy_88e1116_init("egiga0"); > - mv_phy_88e1116_init("egiga1"); > + mv_phy_88e1116_init(eth0_name, eth0_path); > + mv_phy_88e1116_init(eth1_name, eth1_path); > } > #endif /* CONFIG_RESET_PHY_R */ > Viele Grüße, Stefan -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de