From mboxrd@z Thu Jan 1 00:00:00 1970 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,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 2BA72C4338F for ; Thu, 12 Aug 2021 05:20: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 DB4F460FD7 for ; Thu, 12 Aug 2021 05:20:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org DB4F460FD7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com 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 D72F082D90; Thu, 12 Aug 2021 07:19:59 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="N03ERrIp"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 44C3882D81; Thu, 12 Aug 2021 07:19:58 +0200 (CEST) Received: from mail-qk1-x730.google.com (mail-qk1-x730.google.com [IPv6:2607:f8b0:4864:20::730]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0931082D90 for ; Thu, 12 Aug 2021 07:19:54 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=mibodhi@gmail.com Received: by mail-qk1-x730.google.com with SMTP id f23so5165955qkk.13 for ; Wed, 11 Aug 2021 22:19:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SGzFSpzDswgYowAR6dvdQOvsUH9wcfwHftZ3GNrTTvA=; b=N03ERrIpMuPYr7btNsh0AA01YTwAmCxv9+TE+GvQUXjp+NDdSd/VXktdr6oya9KJe5 kPVNKe+6XwodWIqoOU/T2s9Rc/96QiesP/xAcG/S9moY+zoRl3Uhud56OtQaP20h2XLq JXUFdnjlOTgRA2Tpx6pQgWEKg3OIdGrU9crzWiP3QeYWgSC1MGIDPFs2ynnmWdnt0rN1 s87sIRC7bocdoYNrknl0XVY6M7G6BJSHivTp/xYsGHlBSCNiqEPOPk0Py9vCaLX5rOSf pWLQXBfI73UM37vi7JiXduWCjzA3lqjyguMOUt/RrapF9bXDouWrl6Om3dNmYgZo61h9 XNAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SGzFSpzDswgYowAR6dvdQOvsUH9wcfwHftZ3GNrTTvA=; b=qCe1RTx2HqK/U7XEn1BsGDB49U+35vyx4OcNNvsAf8Mo/78Q0qdMt+lAU6GL7u4N/w 74LhQHvS28Jh3B1E856A0DPmfN36u/14UigYYoX5Jtv899OkhSBMULsRCfPHnbw3SwlN UQjuYWAVuzYzLZ0X8EubS+ZNazPAK8xEs1hxbdwuOkTaGcIAc7759mjwQoC5bGvZKqsi /adkxBw41sISMvGFiR6jfovlgR00q6Jyv6+65m1USLECK8Lg46c2mqkitk+PaNOjywMC alfU8bBEQscu08F/hT9UQmWEWE3A43tQkxGTld6AqmsVEJp2yB/wgI2R67EX06y2po11 Ks6w== X-Gm-Message-State: AOAM530WdBU3+wd3egjnFsIH/cwAB0s/Og6Z7nhJswGOLQhss14ziO69 Ep2svMVHtc6zlK9JMdIeJrUrEcHBxoY= X-Google-Smtp-Source: ABdhPJyuMM+u6FjcL5jLOdlHEqdqvbgrbrTulqy79+Desq5pzGUK7f2uCcKXHXA9Oq4JzdN4ZZdnyQ== X-Received: by 2002:a05:620a:a04:: with SMTP id i4mr2774766qka.236.1628745592265; Wed, 11 Aug 2021 22:19:52 -0700 (PDT) Received: from localhost.localdomain ([66.218.48.244]) by smtp.gmail.com with ESMTPSA id h14sm620802qth.69.2021.08.11.22.19.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Aug 2021 22:19:52 -0700 (PDT) From: Tony Dinh To: U-Boot Mailing List , Stefan Roese Cc: Chris Packham , Tom Rini , Tony Dinh , Simon Glass Subject: [PATCH 2/2] arm: kirkwood: Dockstar: Use Ethernet PHY name and address from device tree Date: Wed, 11 Aug 2021 22:18:54 -0700 Message-Id: <20210812051854.1340-3-mibodhi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210812051854.1340-1-mibodhi@gmail.com> References: <20210812051854.1340-1-mibodhi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 In DM Ethernet, the old "egiga0" name is no longer valid, so replace with Ethernet PHY name from device tree. Also, read Ethernet PHY address from device tree. Signed-off-by: Tony Dinh --- board/Seagate/dockstar/dockstar.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/board/Seagate/dockstar/dockstar.c b/board/Seagate/dockstar/dockstar.c index fb69193158..e853f942cf 100644 --- a/board/Seagate/dockstar/dockstar.c +++ b/board/Seagate/dockstar/dockstar.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* + * Copyright (C) 2021 Tony Dinh * Copyright (C) 2010 Eric C. Cooper * * Based on sheevaplug.c originally written by @@ -19,6 +20,7 @@ #include #include #include +#include #include "dockstar.h" DECLARE_GLOBAL_DATA_PTR; @@ -110,31 +112,30 @@ int board_init(void) void reset_phy(void) { u16 reg; - u16 devadr; - char *name = "egiga0"; + int phyaddr; + char *name = "ethernet-controller@72000"; + char *eth0_path = "/ocp@f1000000/ethernet-controller@72000/ethernet0-port@0"; 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", - __FUNCTION__); + /* Look up PHY addr */ + phyaddr = fdt_get_phy_addr(eth0_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_CTRL_REG, ®); + miiphy_write(name, phyaddr, MV88E1116_PGADR_REG, 2); + miiphy_read(name, phyaddr, MV88E1116_MAC_CTRL_REG, ®); reg |= (MV88E1116_RGMII_RXTM_CTRL | MV88E1116_RGMII_TXTM_CTRL); - miiphy_write(name, devadr, MV88E1116_MAC_CTRL_REG, reg); - miiphy_write(name, devadr, MV88E1116_PGADR_REG, 0); + miiphy_write(name, phyaddr, MV88E1116_MAC_CTRL_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); } -- 2.20.1