From patchwork Fri Jul 13 08:45:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lothar Felten X-Patchwork-Id: 943353 X-Patchwork-Delegate: jagannadh.teki@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="dxNTYkK0"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41RmgG2BTWz9s2M for ; Fri, 13 Jul 2018 18:48:42 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 032B9C21EF1; Fri, 13 Jul 2018 08:46:49 +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, RCVD_IN_MSPIKE_H2, 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 EFAEEC21FEF; Fri, 13 Jul 2018 08:46:10 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 85463C21FD9; Fri, 13 Jul 2018 08:45:58 +0000 (UTC) Received: from mail-ed1-f66.google.com (mail-ed1-f66.google.com [209.85.208.66]) by lists.denx.de (Postfix) with ESMTPS id 275FFC21E1D for ; Fri, 13 Jul 2018 08:45:55 +0000 (UTC) Received: by mail-ed1-f66.google.com with SMTP id s24-v6so7795207edr.8 for ; Fri, 13 Jul 2018 01:45:55 -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; bh=DowfOz4Ssu5c1jCDocTZ42u6I19aYQIU/o8kQCQJSJg=; b=dxNTYkK0QwRkOnxy9v08J2VLyUGNaoaOgQzM52Vr8mlhj6rfaaPy+mFHTfGLT8CRl9 j4as4mSEiiUa3ZuYEyceMxa0Qe2kGfP6ICB/G8vkJQZ4s/99dxcFj8DZ7TT4KeGwRmrp ykwVatR2faUh0CnDftAcWgjCCQYrE1iEUc1EralQWWL67l5VnfGUrRRtqo5LHzRK3Re3 6MD4pTwvy1TXl5kOmGXdB/pxSLmNwpHzxDuqoZqAhsID8aDPCRBruFQzF31DimoABLUz hZxtDKQxUEpx9dJGxZ5JJYnKay1BAgWXpt+ZPT9G2xZyOEKsx6+hep9kDX8XqDxH5aKp DeVA== 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; bh=DowfOz4Ssu5c1jCDocTZ42u6I19aYQIU/o8kQCQJSJg=; b=XrOk51fPUwN5TBBwrx9YpkjK7W+7cWCvBhPbCxm70rosTncD3IbVCVpqaDqvFYR5NZ 1MPXStQTXxT2Gi6r13tX3FVpXb0mGItjQeSqobzzFotsRMHQDQget/V7sUV+pKvuBXfn Fyy/tRGPNxo+WZ82Ue7gNrKpIdC/HzBwo38yy47z1a9qsfSBROo3CGB+uL2h9UfYtu6r T3nqxGuQP0YmYw5Rk0u1LYAxYZTx3Ai+PdwoohaTtLB8nrKRenjSr3fOZ/y0qbXP60EC kpn+iOiF2ljfhtFOT33EVhfMDdyyoAJwAneetyjPf6C7QzklUqkPpNMylsS3KSIF71HZ w+uw== X-Gm-Message-State: AOUpUlFHnRHRrrswNkVsR+Dd2fH4cfakNe5rBhwW4eui5T2r88nOp84+ kHoLx11VYjbyPEJAUz7u52fl1VzM X-Google-Smtp-Source: AAOMgpex3gCXpgNYoiv/AkBZ0EzTrkqeqZ/2jc8bIGIcPUYXVBrnJeNuDwf6l/ByifoVXABb9ijIww== X-Received: by 2002:a50:bb41:: with SMTP id y59-v6mr6366821ede.10.1531471554661; Fri, 13 Jul 2018 01:45:54 -0700 (PDT) Received: from z620.fritz.box (94-139-43-201.dsl.billi.be. [94.139.43.201]) by smtp.googlemail.com with ESMTPSA id b9-v6sm13259034edk.28.2018.07.13.01.45.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Jul 2018 01:45:53 -0700 (PDT) From: Lothar Felten To: u-boot@lists.denx.de Date: Fri, 13 Jul 2018 10:45:28 +0200 Message-Id: <20180713084530.13029-4-lothar.felten@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180713084530.13029-1-lothar.felten@gmail.com> References: <20180713084530.13029-1-lothar.felten@gmail.com> Cc: hdegoede@redhat.com, maxime.ripard@bootlin.com, joe.hershberger@ni.com, jagan@openedev.com Subject: [U-Boot] [PATCH v6 4/6] net: sun8i-emac: support R40 GMAC 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" Add support for the GMAC found in the Allwinner R40/V40 SoC. The R40 GMAC interface is not controlled by the syscon register but has a separate configuration register in the CCU. The clock gate and reset bits are in a different register compared to the other SoCs supported by this driver. The driver uses the -gmac suffix for the R40 because the R40 also has a different 100 MBit MAC (EMAC). Signed-off-by: Lothar Felten Reviewed-by: Jagan Teki Tested-by: Jagan Teki --- Changelog: new in v3 v3 -> v4 use driver data to distinguish between variants v4 -> v5 -> v6 none --- drivers/net/sun8i_emac.c | 79 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 53 insertions(+), 26 deletions(-) diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c index ee3b2aa7f4..3ba3a1ff8b 100644 --- a/drivers/net/sun8i_emac.c +++ b/drivers/net/sun8i_emac.c @@ -67,6 +67,7 @@ /* IO mux settings */ #define SUN8I_IOMUX_H3 2 +#define SUN8I_IOMUX_R40 5 #define SUN8I_IOMUX 4 /* H3/A64 EMAC Register's offset */ @@ -97,6 +98,7 @@ enum emac_variant { A83T_EMAC = 1, H3_EMAC, A64_EMAC, + R40_GMAC, }; struct emac_dma_desc { @@ -278,6 +280,9 @@ static int sun8i_emac_set_syscon(struct emac_eth_dev *priv) reg = readl(priv->sysctl_reg + 0x30); + if (priv->variant == R40_GMAC) + return 0; + if (priv->variant == H3_EMAC) { ret = sun8i_emac_set_syscon_ephy(priv, ®); if (ret) @@ -495,6 +500,8 @@ static int parse_phy_pins(struct udevice *dev) if (priv->variant == H3_EMAC) sunxi_gpio_set_cfgpin(pin, SUN8I_IOMUX_H3); + else if (priv->variant == R40_GMAC) + sunxi_gpio_set_cfgpin(pin, SUN8I_IOMUX_R40); else sunxi_gpio_set_cfgpin(pin, SUN8I_IOMUX); @@ -634,11 +641,26 @@ static void sun8i_emac_board_setup(struct emac_eth_dev *priv) } } - /* Set clock gating for emac */ - setbits_le32(&ccm->ahb_gate0, BIT(AHB_GATE_OFFSET_GMAC)); - - /* De-assert EMAC */ - setbits_le32(&ccm->ahb_reset0_cfg, BIT(AHB_RESET_OFFSET_GMAC)); + if (priv->variant == R40_GMAC) { + /* Set clock gating for emac */ + setbits_le32(&ccm->ahb_reset1_cfg, BIT(AHB_RESET_OFFSET_GMAC)); + + /* De-assert EMAC */ + setbits_le32(&ccm->ahb_gate1, BIT(AHB_GATE_OFFSET_GMAC)); + + /* Select RGMII for R40 */ + setbits_le32(&ccm->gmac_clk_cfg, + CCM_GMAC_CTRL_TX_CLK_SRC_INT_RGMII | + CCM_GMAC_CTRL_GPIT_RGMII); + setbits_le32(&ccm->gmac_clk_cfg, + CCM_GMAC_CTRL_TX_CLK_DELAY(CONFIG_GMAC_TX_DELAY)); + } else { + /* Set clock gating for emac */ + setbits_le32(&ccm->ahb_gate0, BIT(AHB_GATE_OFFSET_GMAC)); + + /* De-assert EMAC */ + setbits_le32(&ccm->ahb_reset0_cfg, BIT(AHB_RESET_OFFSET_GMAC)); + } } #if defined(CONFIG_DM_GPIO) @@ -805,22 +827,32 @@ static int sun8i_emac_eth_ofdata_to_platdata(struct udevice *dev) return -EINVAL; } - offset = fdtdec_lookup_phandle(gd->fdt_blob, node, "syscon"); - if (offset < 0) { - debug("%s: cannot find syscon node\n", __func__); - return -EINVAL; - } - reg = fdt_getprop(gd->fdt_blob, offset, "reg", NULL); - if (!reg) { - debug("%s: cannot find reg property in syscon node\n", - __func__); + priv->variant = dev_get_driver_data(dev); + + if (!priv->variant) { + printf("%s: Missing variant\n", __func__); return -EINVAL; } - priv->sysctl_reg = fdt_translate_address((void *)gd->fdt_blob, - offset, reg); - if (priv->sysctl_reg == FDT_ADDR_T_NONE) { - debug("%s: Cannot find syscon base address\n", __func__); - return -EINVAL; + + if (priv->variant != R40_GMAC) { + offset = fdtdec_lookup_phandle(gd->fdt_blob, node, "syscon"); + if (offset < 0) { + debug("%s: cannot find syscon node\n", __func__); + return -EINVAL; + } + reg = fdt_getprop(gd->fdt_blob, offset, "reg", NULL); + if (!reg) { + debug("%s: cannot find reg property in syscon node\n", + __func__); + return -EINVAL; + } + priv->sysctl_reg = fdt_translate_address((void *)gd->fdt_blob, + offset, reg); + if (priv->sysctl_reg == FDT_ADDR_T_NONE) { + debug("%s: Cannot find syscon base address\n", + __func__); + return -EINVAL; + } } pdata->phy_interface = -1; @@ -845,13 +877,6 @@ static int sun8i_emac_eth_ofdata_to_platdata(struct udevice *dev) return -EINVAL; } - priv->variant = dev_get_driver_data(dev); - - if (!priv->variant) { - printf("%s: Missing variant\n", __func__); - return -EINVAL; - } - if (priv->variant == H3_EMAC) { int parent = fdt_parent_offset(gd->fdt_blob, offset); @@ -892,6 +917,8 @@ static const struct udevice_id sun8i_emac_eth_ids[] = { .data = (uintptr_t)A64_EMAC }, {.compatible = "allwinner,sun8i-a83t-emac", .data = (uintptr_t)A83T_EMAC }, + {.compatible = "allwinner,sun8i-r40-gmac", + .data = (uintptr_t)R40_GMAC }, { } };