From patchwork Thu May 16 09:12:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1100433 X-Patchwork-Delegate: joe.hershberger@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NkxRtQ+1"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 454QlL3RWmz9s9T for ; Thu, 16 May 2019 19:16:14 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 3BCEBC21D74; Thu, 16 May 2019 09:15:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 2D3C8C21DA6; Thu, 16 May 2019 09:12:27 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 3EFE7C21E18; Thu, 16 May 2019 09:12:18 +0000 (UTC) Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by lists.denx.de (Postfix) with ESMTPS id 5D803C21D72 for ; Thu, 16 May 2019 09:12:15 +0000 (UTC) Received: by mail-pg1-f195.google.com with SMTP id h17so1270838pgv.0 for ; Thu, 16 May 2019 02:12:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=GVddCXyFi/icSWuKsx+P53NfEyukJh6HHbgYXFJH+wI=; b=NkxRtQ+1i+cqKgrTIHEscX8VnZr3/qph2PI63vkU9tqnmdwHkmWDA+wrIKabbqU/6l pmQu9AKQcMnQ4ONZ1FnX4zWLQBgl/MNmBXZqwPtBZFR29L3IFsq8rANEM/iNLs/ogovi SHl4CQg9v7KcDbJA0A2+VGREURcl9CX0CYfk6RmDeomK26dqqtTheVuLrHf079R2/QVK kWktMHAcY3YBzOGCcsOlsCFm6njzUevXF82+xnCCNKIZxM3FUQ+GO3WcUFWHuqYYIv9h 3foYMpbCrOX67MPqUWCttmxH94iI8xhQ+Joh/Vu1dpVBuqYY+aAylV0T6Vx4yflMYtjg g7Mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=GVddCXyFi/icSWuKsx+P53NfEyukJh6HHbgYXFJH+wI=; b=i8tpxRSWoPJHZjJotbSeNlf2kO5il55lUMkzVXz+KYs2H/IVoLhdxwltA6ofwnufl+ s/oGcZXe5dul7DGebk7qEgi7/2dROSbJ/2s1H+tjrTiuobPXYrKwT1xKgi4AN8omThzF b1XX3nPzp74R6diKvhq5Mg0nckIxuK8/gQztum4iXuSyHtcp0tVSaT5HnS++zmAoExR8 j/pCLlUxz9vnmTJMg9If1hPpNS2A5z57cZhT5G0S88qjSZJ4apeyD8If0GnxqO2KY1D+ KqVQ02YcT0q5OXexvA1eAzuhBVlFe2mdD3S9fYqvhLB1zylh0cuApxbQmNx7Tkh6cwnc 5y+g== X-Gm-Message-State: APjAAAW5zlNA12DDnd61IeTTx1gB9Bj3jYmjVDqabSIoLR4wn6d3yn9r xYZUnbnD67iZ4+LUVQKAfbI= X-Google-Smtp-Source: APXvYqzQXfX4h08xtvSNQuRRb1c6h8Jq9KVtPmhshQn4U3/RsgSHtzcUvrH9kfbo7azGFP+luhYKYg== X-Received: by 2002:a65:4283:: with SMTP id j3mr1359019pgp.88.1557997934095; Thu, 16 May 2019 02:12:14 -0700 (PDT) Received: from localhost.localdomain (unknown-224-80.windriver.com. [147.11.224.80]) by smtp.gmail.com with ESMTPSA id n15sm7548882pfb.111.2019.05.16.02.12.12 (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 16 May 2019 02:12:13 -0700 (PDT) From: Bin Meng To: Rick Chen , Joe Hershberger , Lukas Auer , Anup Patel , Palmer Dabbelt , U-Boot Mailing List Date: Thu, 16 May 2019 02:12:04 -0700 Message-Id: <1557997926-4011-3-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1557997926-4011-1-git-send-email-bmeng.cn@gmail.com> References: <1557997926-4011-1-git-send-email-bmeng.cn@gmail.com> Subject: [U-Boot] [PATCH 2/4] dm: net: macb: Update macb_linkspd_cb() signature X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This updates DM version macb_linkspd_cb() signature for future expansion, eg: adding an implementation for link speed changes. Signed-off-by: Bin Meng Reviewed-by: Lukas Auer --- drivers/net/macb.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 7261416..b7f404e 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -488,15 +488,23 @@ static int macb_phy_find(struct macb_device *macb, const char *name) /** * macb_linkspd_cb - Linkspeed change callback function - * @regs: Base Register of MACB devices + * @dev/@regs: MACB udevice (DM version) or + * Base Register of MACB devices (non-DM version) * @speed: Linkspeed * Returns 0 when operation success and negative errno number * when operation failed. */ +#ifdef CONFIG_DM_ETH +int __weak macb_linkspd_cb(struct udevice *dev, unsigned int speed) +{ + return 0; +} +#else int __weak macb_linkspd_cb(void *regs, unsigned int speed) { return 0; } +#endif #ifdef CONFIG_DM_ETH static int macb_phy_init(struct udevice *dev, const char *name) @@ -589,7 +597,11 @@ static int macb_phy_init(struct macb_device *macb, const char *name) macb_writel(macb, NCFGR, ncfgr); +#ifdef CONFIG_DM_ETH + ret = macb_linkspd_cb(dev, _1000BASET); +#else ret = macb_linkspd_cb(macb->regs, _1000BASET); +#endif if (ret) return ret; @@ -614,9 +626,17 @@ static int macb_phy_init(struct macb_device *macb, const char *name) ncfgr &= ~(MACB_BIT(SPD) | MACB_BIT(FD) | GEM_BIT(GBE)); if (speed) { ncfgr |= MACB_BIT(SPD); +#ifdef CONFIG_DM_ETH + ret = macb_linkspd_cb(dev, _100BASET); +#else ret = macb_linkspd_cb(macb->regs, _100BASET); +#endif } else { +#ifdef CONFIG_DM_ETH + ret = macb_linkspd_cb(dev, _10BASET); +#else ret = macb_linkspd_cb(macb->regs, _10BASET); +#endif } if (ret)