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,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 7EFB6C07E95 for ; Wed, 7 Jul 2021 09:07:46 +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 C3ACD61CBA for ; Wed, 7 Jul 2021 09:07:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C3ACD61CBA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DFB7182DE6; Wed, 7 Jul 2021 11:07:43 +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="jZckYxZF"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 44A1482DEA; Wed, 7 Jul 2021 11:07:42 +0200 (CEST) Received: from mail-qk1-x736.google.com (mail-qk1-x736.google.com [IPv6:2607:f8b0:4864:20::736]) (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 575F982BD7 for ; Wed, 7 Jul 2021 11:07:39 +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-x736.google.com with SMTP id i125so1198884qke.12 for ; Wed, 07 Jul 2021 02:07:39 -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:mime-version :content-transfer-encoding; bh=K1R5nvOhMkZXDd0snsGDoMbFalbgPq48XImshYl1tCY=; b=jZckYxZFNtFrsKfcXWDJjaqN5zMskjn13YmBIi67qXdkiFAhIqPh68AdsU/qMD8l7Z kyxFjh1s24IBmF+ClpGPXYaq+jQaehp41y3tvE/50mz6CHx5UviQ2xpQL2b4ahefqGAw CouUPejU4DcqB2InUu8UI7Rrhq99tZk3btl8hzpv5eZpqiSHmzaPvVg/le8tgNJRj1ME OWAhG+9XoCUmDRZ4TQo4g1hH/qj1NwiyNo0omPnXMa0n2rKE05Vbsp1I87O4YstK7yKr BUGo8/3ff5kzeUk8QG27FU23wfFsuSCCOSvsS8qPdTa9lnPXhOuyGx5bgENQd/BbLLQC O8Ig== 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:mime-version :content-transfer-encoding; bh=K1R5nvOhMkZXDd0snsGDoMbFalbgPq48XImshYl1tCY=; b=Y9sJqxB/L7xkMi5gEj1ye2yKHJA1QmB4+7PDspAazYe4wdR2uUMeJHw0XEQiYkZ1vu iOnzuZ1yBoxq5nWXA+QWejxkeXOhJUzQrQEN8i33A/Xq/l7LLPMWqNYZJfXaZnS9T7bD A8PrEGG5EMaBOmw/ca8ETJ05YWDdtySlJMlROM7RmBJwEo9J4poTEdvP0GtHEzuWunE/ RxPQLzSnJ0izPdWoeN3EWjUgthPDMlkZdfU/tmyqv4MNYgnma4TPpNAGgQZxhRUmT/QG vozDvbXTmMlr+xwsgeJxqlJ11SAf2fwgIE2jRMYrXzMr5Apw/pysE3l1S2NrFbFXhDHB ADcA== X-Gm-Message-State: AOAM532OYuoumRM2YIdyYusRa9hw5iNDJ+oeY8iZEH/w7c5ilzBrxhUc NNnKz2aT9mxXnYhoG6O66yA= X-Google-Smtp-Source: ABdhPJxY41HIgG6AKTySrGhrzKcRwH52mmCWCGS2BEZBrJVif+rhC5KuA+U5T0Waux1DaLBeseOhbw== X-Received: by 2002:a37:6553:: with SMTP id z80mr13735291qkb.263.1625648858148; Wed, 07 Jul 2021 02:07:38 -0700 (PDT) Received: from localhost.localdomain ([66.218.48.116]) by smtp.gmail.com with ESMTPSA id x125sm8150930qkd.8.2021.07.07.02.07.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jul 2021 02:07:37 -0700 (PDT) From: Tony Dinh To: Stefan Roese , U-Boot Mailing List Cc: Tom Rini , Chris Packham , Tony Dinh Subject: [PATCH v3 3/4] NSA310S : Use Ethernet PHY name from device tree Date: Wed, 7 Jul 2021 02:06:47 -0700 Message-Id: <20210707090647.11360-1-mibodhi@gmail.com> X-Mailer: git-send-email 2.20.1 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 it with Ethernet PHY name from device tree. Also, Ethernet PHY address is available so read it from device tree. Signed-off-by: Tony Dinh --- Changes in v3: - Get eth0 PHY address from device tree Changes in v2: - Correct copyright board/zyxel/nsa310s/nsa310s.c | 47 +++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/board/zyxel/nsa310s/nsa310s.c b/board/zyxel/nsa310s/nsa310s.c index cd4a7723b1..b71de4e11f 100644 --- a/board/zyxel/nsa310s/nsa310s.c +++ b/board/zyxel/nsa310s/nsa310s.c @@ -1,8 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright (C) 2015 - * Gerald Kerma - * Tony Dinh + * Copyright (C) 2015, 2021 Tony Dinh + * Copyright (C) 2015 Gerald Kerma */ #include @@ -81,21 +80,51 @@ 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; +} + #ifdef CONFIG_RESET_PHY_R void reset_phy(void) { u16 reg; u16 phyaddr; - char *name = "egiga0"; + char *name = "ethernet-controller@72000"; + char *eth0_path = "/ocp@f1000000/ethernet-controller@72000/ethernet0-port@0"; if (miiphy_set_current_dev(name)) return; - /* read PHY dev address */ - if (miiphy_read(name, 0xee, 0xee, (u16 *) &phyaddr)) { - printf("could not read PHY dev address\n"); + phyaddr = fdt_get_phy_addr(eth0_path); + if (phyaddr < 0) return; - } /* set RGMII delay */ miiphy_write(name, phyaddr, MV88E1318_PGADR_REG, MV88E1318_MAC_CTRL_PG); @@ -131,5 +160,7 @@ void reset_phy(void) /* downshift */ miiphy_write(name, phyaddr, 0x10, 0x3860); miiphy_write(name, phyaddr, 0x0, 0x9140); + + printf("MV88E1318 PHY initialized on %s\n", name); } #endif /* CONFIG_RESET_PHY_R */ -- 2.20.1