From patchwork Wed May 5 07:55:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 1474137 X-Patchwork-Delegate: narmstrong@baylibre.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=WGPlWmPp; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FZptD11Tjz9sRR for ; Wed, 5 May 2021 17:55:44 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 47F0982C9B; Wed, 5 May 2021 09:55:34 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.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=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="WGPlWmPp"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0592E82CB0; Wed, 5 May 2021 09:55:32 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) (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 6C5FF82B1F for ; Wed, 5 May 2021 09:55:29 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=narmstrong@baylibre.com Received: by mail-wr1-x429.google.com with SMTP id n2so764672wrm.0 for ; Wed, 05 May 2021 00:55:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=zAPn2NgYZwoHilGE4P4M0ZJ34sdcPcsp6Mem7ihXxd8=; b=WGPlWmPpmFVJrO/oUDjRpLMQhATb6sYeC7oJ85jolgKD2uPggzQblNLfRa0E7XzOdP nZs8iToCNx7Q2o9xD+DuWjvbv0C+naHQMohRuwvoHnB6cKRFCm1tFathaFd28Yv8PzaU /My5NZKqOri+q5+vabYbRB7Vd2dBaH9kny1Zv4LvQg+n5EqOHliuZqySl7oluF2inEuw TmB3O3R8SGLLowySU0dpEHwAe8cn5eoRK8c/XdzvqlUaUUQ3PXLljlByY7zwIwiEZatn vl5X32WYlPUiclR2iiPK/1RO0CN+Rl2u85ciWdB1QTEaAUJ1r7WXUbgplLLLtHNeu/kt SJzA== 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=zAPn2NgYZwoHilGE4P4M0ZJ34sdcPcsp6Mem7ihXxd8=; b=kPF+WvsBYuOr7NZKgsg15+ffCWm7ldBpMAsIHoobR++4lItIodFkRfO6ZWwHyJ6PhL lUEmR8TJ2/Sw/hBR1BaNmMMMnomv7jW0GYTV0WzKcrBmEJuJcVLyV0hPM2TlVwgdunbQ NevWT4u2osXj+lJmoOKp3zWn7Z9iczviCLp1up7hTZ2Y5sPG20le4QG41RvoqhJfEv+l LXj+6+3DGRhQle995yJKmpNEb9emlCkBANQNAP8p7PGIoptahdacyDY+lUrQgvJ4oJlr 3v5n2hh7YnolorxsArENzhBPZhhyP1MaqJ4vvYsRh8rqKtzTL9uMWJlkK9hyUKCDbeLs 7BHQ== X-Gm-Message-State: AOAM531PPN7Ll0NeyZx/b0q5/FJpwqYuvlUijPV9BueDpUeaWZN7KXdO C/jJjFUzmZngF+2aj8yYpnDicA== X-Google-Smtp-Source: ABdhPJwA2r0ewZ3LvXdA4cX++e4rERIt3RNVvaOxTTXSVHemYTUPznS8duaY82v0i39MXffPySeCRw== X-Received: by 2002:a5d:58e1:: with SMTP id f1mr35448536wrd.375.1620201328898; Wed, 05 May 2021 00:55:28 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:90c:e290:6eb3:66ab:cb1e:ef0]) by smtp.gmail.com with ESMTPSA id j13sm24672184wrd.81.2021.05.05.00.55.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 May 2021 00:55:28 -0700 (PDT) From: Neil Armstrong To: joe.hershberger@ni.com, rfried.dev@gmail.com Cc: u-boot-amlogic@groups.io, u-boot@lists.denx.de, martin.blumenstingl@googlemail.com, Neil Armstrong Subject: [PATCH] net: dwmac_meson8b: do not set TX delay in TXID & RXID Date: Wed, 5 May 2021 09:55:26 +0200 Message-Id: <20210505075526.3838291-1-narmstrong@baylibre.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 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.102.4 at phobos.denx.de X-Virus-Status: Clean When the PHY interface is set as TXID & RXID, the delays should be taken from DT, but first they should not be hardcoded since the PHY driver will set them. Fixes: 798424e857 ("net: designware: add Amlogic Meson8b & later glue driver") Signed-off-by: Neil Armstrong Reviewed-by: Ramon Fried --- drivers/net/dwmac_meson8b.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/drivers/net/dwmac_meson8b.c b/drivers/net/dwmac_meson8b.c index c0b6ef4994..40cd8370b0 100644 --- a/drivers/net/dwmac_meson8b.c +++ b/drivers/net/dwmac_meson8b.c @@ -59,8 +59,6 @@ static int dwmac_setup_axg(struct udevice *dev, struct eth_pdata *edata) switch (edata->phy_interface) { case PHY_INTERFACE_MODE_RGMII: case PHY_INTERFACE_MODE_RGMII_ID: - case PHY_INTERFACE_MODE_RGMII_RXID: - case PHY_INTERFACE_MODE_RGMII_TXID: /* Set RGMII mode */ setbits_le32(plat->regs + ETH_REG_0, AXG_ETH_REG_0_PHY_INTF_RGMII | AXG_ETH_REG_0_TX_PHASE(1) | @@ -69,6 +67,15 @@ static int dwmac_setup_axg(struct udevice *dev, struct eth_pdata *edata) AXG_ETH_REG_0_CLK_EN); break; + case PHY_INTERFACE_MODE_RGMII_RXID: + case PHY_INTERFACE_MODE_RGMII_TXID: + /* TOFIX: handle amlogic,tx-delay-ns & rx-internal-delay-ps from DT */ + setbits_le32(plat->regs + ETH_REG_0, AXG_ETH_REG_0_PHY_INTF_RGMII | + AXG_ETH_REG_0_TX_RATIO(4) | + AXG_ETH_REG_0_PHY_CLK_EN | + AXG_ETH_REG_0_CLK_EN); + break; + case PHY_INTERFACE_MODE_RMII: /* Set RMII mode */ out_le32(plat->regs + ETH_REG_0, AXG_ETH_REG_0_PHY_INTF_RMII | @@ -90,8 +97,6 @@ static int dwmac_setup_gx(struct udevice *dev, struct eth_pdata *edata) switch (edata->phy_interface) { case PHY_INTERFACE_MODE_RGMII: case PHY_INTERFACE_MODE_RGMII_ID: - case PHY_INTERFACE_MODE_RGMII_RXID: - case PHY_INTERFACE_MODE_RGMII_TXID: /* Set RGMII mode */ setbits_le32(plat->regs + ETH_REG_0, GX_ETH_REG_0_PHY_INTF | GX_ETH_REG_0_TX_PHASE(1) | @@ -101,6 +106,16 @@ static int dwmac_setup_gx(struct udevice *dev, struct eth_pdata *edata) break; + case PHY_INTERFACE_MODE_RGMII_RXID: + case PHY_INTERFACE_MODE_RGMII_TXID: + /* TOFIX: handle amlogic,tx-delay-ns & rx-internal-delay-ps from DT */ + setbits_le32(plat->regs + ETH_REG_0, GX_ETH_REG_0_PHY_INTF | + GX_ETH_REG_0_TX_RATIO(4) | + GX_ETH_REG_0_PHY_CLK_EN | + GX_ETH_REG_0_CLK_EN); + + break; + case PHY_INTERFACE_MODE_RMII: /* Set RMII mode */ out_le32(plat->regs + ETH_REG_0, GX_ETH_REG_0_INVERT_RMII_CLK |