From patchwork Tue Mar 9 01:21:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Boger X-Patchwork-Id: 1449498 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=devicetree-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=wirenboard-com.20150623.gappssmtp.com header.i=@wirenboard-com.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=T64RNAeJ; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4DvcsQ27sPz9sWc for ; Tue, 9 Mar 2021 12:23:06 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229793AbhCIBWd (ORCPT ); Mon, 8 Mar 2021 20:22:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230445AbhCIBWT (ORCPT ); Mon, 8 Mar 2021 20:22:19 -0500 Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5FFC7C06174A for ; Mon, 8 Mar 2021 17:22:08 -0800 (PST) Received: by mail-lj1-x234.google.com with SMTP id i26so6932100ljn.1 for ; Mon, 08 Mar 2021 17:22:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wirenboard-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=sv6Vbw1Oc2G6knz+M18/XZuiOqYFlQF9/Df8eSYIEM0=; b=T64RNAeJlRAxUpzgT4lP3yq50zSgt3tfmpgYNXesFoK0QMlJNs1J0Iue41seiMiv/n rD+9zBz0hQDcu77ixWDutGpv6gzTMIOWxEFBlwj1enK7N6B9lsy1vWXOQyoyPjY355Y0 ZDXosS3+StW9f9ERv0ILtI9UI6pOU754QlehGtbS9f786IUvx8FjMqjLTtnPm4Aq3lv7 QMwk/KW0f1nPwoV3nSSrniA+nQr7038CYuAmzi9ZmUSrs8WW9oleiUOFW7U9Qro6lnQD lbRHJ38dxAxgxwbc/sIkF88jzKqpRljvsaW78TT0hiMDvk4Kes6Mr1Z3aQR5WyoatW/D Fz6w== 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=sv6Vbw1Oc2G6knz+M18/XZuiOqYFlQF9/Df8eSYIEM0=; b=W4InakFo0ZQFgBtDfRHXzRSSqicVBTjYIkXZEEXw/ow1/Q+bEzg+HllGXrMA+sANau Gb3Mq+lxFZgkMmF/EAzrvj4iXi/ZFQvgGDMV0d/hBFcxAsGVCKbQXIlV9cOjme7s5y9Z TeDze+Jy1puShUvXwTUVdFcSgORzAaePtaRQwZxprEDWMTHFs6WcSdJC2LvI+BMF6rfV 1H7kI9KESaUfMofba16wlu6+Ohr7cY/U+1M+svsiJaDdGBCNViSAiS+ktS5L4Kq68Dtx ZnFV7SalTocor2VRP3XcI7wT4SSZSRLALvm1xPVSjPSdZOdwEgcH2DXSWqnMT5A+dG+A DNRQ== X-Gm-Message-State: AOAM531bjcf/gDU9g3RaAS+nh+yZpaYsAYFqcJnzwh6CXLKa3PhhQ4SX eTd1966ziSrkbo93t8aeOQtxXQ== X-Google-Smtp-Source: ABdhPJyvu02BnKVXFC5Nrg6sS6wCrwvVmzwrb8hK5C+TR9wc0kMXLFIsw9OlLSJmzCzwA3Mx0ZzKUQ== X-Received: by 2002:a2e:b895:: with SMTP id r21mr15630176ljp.506.1615252926882; Mon, 08 Mar 2021 17:22:06 -0800 (PST) Received: from boger-laptop.lan (81.5.99.6.dhcp.mipt-telecom.ru. [81.5.99.6]) by smtp.gmail.com with ESMTPSA id o11sm1538395lfu.157.2021.03.08.17.22.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 17:22:06 -0800 (PST) From: Evgeny Boger To: Maxime Ripard , Chen-Yu Tsai , linux-arm-kernel@lists.infradead.org Cc: Evgeny Boger , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Rob Herring Subject: [PATCH v2 1/2] net: allwinner: reset control support Date: Tue, 9 Mar 2021 04:21:15 +0300 Message-Id: <20210309012116.2944-2-boger@wirenboard.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210309012116.2944-1-boger@wirenboard.com> References: <20210309012116.2944-1-boger@wirenboard.com> Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org R40 (aka V40/A40i/T3) and A10/A20 share the same EMAC IP. However, on R40 the EMAC is gated by default. Signed-off-by: Evgeny Boger --- .../net/allwinner,sun4i-a10-emac.yaml | 11 +++- drivers/net/ethernet/allwinner/sun4i-emac.c | 65 +++++++++++++++++-- 2 files changed, 70 insertions(+), 6 deletions(-) diff --git a/Documentation/devicetree/bindings/net/allwinner,sun4i-a10-emac.yaml b/Documentation/devicetree/bindings/net/allwinner,sun4i-a10-emac.yaml index 8d8560a67abf..27f99372d153 100644 --- a/Documentation/devicetree/bindings/net/allwinner,sun4i-a10-emac.yaml +++ b/Documentation/devicetree/bindings/net/allwinner,sun4i-a10-emac.yaml @@ -15,7 +15,12 @@ maintainers: properties: compatible: - const: allwinner,sun4i-a10-emac + oneOf: + - const: allwinner,sun4i-a10-emac + - const: allwinner,sun4i-r40-emac + - items: + - const: allwinner,sun4i-r40-emac + - const: allwinner,sun4i-a10-emac reg: maxItems: 1 @@ -30,6 +35,9 @@ properties: description: Phandle to the device SRAM $ref: /schemas/types.yaml#/definitions/phandle-array + resets: + maxItems: 1 + required: - compatible - reg @@ -47,6 +55,7 @@ examples: reg = <0x01c0b000 0x1000>; interrupts = <55>; clocks = <&ahb_gates 17>; + resets = <&ccu RST_BUS_EMAC>; phy-handle = <&phy0>; allwinner,sram = <&emac_sram 1>; }; diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c index 5ed80d9a6b9f..b26913610a38 100644 --- a/drivers/net/ethernet/allwinner/sun4i-emac.c +++ b/drivers/net/ethernet/allwinner/sun4i-emac.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include "sun4i-emac.h" @@ -68,6 +69,15 @@ MODULE_PARM_DESC(watchdog, "transmit timeout in milliseconds"); * devices, EMACA and EMACB. */ +/** + * struct emac_quirks - Differences between SoC variants. + * + * @has_reset: SoC needs reset deasserted. + */ +struct emac_quirks { + bool has_reset; +}; + struct emac_board_info { struct clk *clk; struct device *dev; @@ -85,6 +95,7 @@ struct emac_board_info { unsigned int link; unsigned int speed; unsigned int duplex; + struct reset_control *reset; phy_interface_t phy_interface; }; @@ -791,6 +802,7 @@ static int emac_probe(struct platform_device *pdev) struct net_device *ndev; int ret = 0; const char *mac_addr; + const struct emac_quirks *quirks; ndev = alloc_etherdev(sizeof(struct emac_board_info)); if (!ndev) { @@ -809,6 +821,13 @@ static int emac_probe(struct platform_device *pdev) spin_lock_init(&db->lock); + quirks = of_device_get_match_data(&pdev->dev); + if (!quirks) { + dev_err(&pdev->dev, "Failed to determine the quirks to use\n"); + ret = -ENODEV; + goto out; + } + db->membase = of_iomap(np, 0); if (!db->membase) { dev_err(&pdev->dev, "failed to remap registers\n"); @@ -825,16 +844,31 @@ static int emac_probe(struct platform_device *pdev) goto out_iounmap; } + if (quirks->has_reset) { + db->reset = devm_reset_control_get_exclusive(&pdev->dev, NULL); + if (IS_ERR(db->reset)) { + dev_err(&pdev->dev, "unable to request reset\n"); + ret = PTR_ERR(db->reset); + goto out_dispose_mapping; + } + + ret = reset_control_deassert(db->reset); + if (ret) { + dev_err(&pdev->dev, "could not deassert EMAC reset\n"); + goto out_dispose_mapping; + } + } + db->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(db->clk)) { ret = PTR_ERR(db->clk); - goto out_dispose_mapping; + goto out_assert_reset; } ret = clk_prepare_enable(db->clk); if (ret) { dev_err(&pdev->dev, "Error couldn't enable clock (%d)\n", ret); - goto out_dispose_mapping; + goto out_assert_reset; } ret = sunxi_sram_claim(&pdev->dev); @@ -852,6 +886,7 @@ static int emac_probe(struct platform_device *pdev) goto out_release_sram; } + /* Read MAC-address from DT */ mac_addr = of_get_mac_address(np); if (!IS_ERR(mac_addr)) @@ -893,6 +928,8 @@ static int emac_probe(struct platform_device *pdev) sunxi_sram_release(&pdev->dev); out_clk_disable_unprepare: clk_disable_unprepare(db->clk); +out_assert_reset: + reset_control_assert(db->reset); out_dispose_mapping: irq_dispose_mapping(ndev->irq); out_iounmap: @@ -913,6 +950,7 @@ static int emac_remove(struct platform_device *pdev) unregister_netdev(ndev); sunxi_sram_release(&pdev->dev); clk_disable_unprepare(db->clk); + reset_control_assert(db->reset); irq_dispose_mapping(ndev->irq); iounmap(db->membase); free_netdev(ndev); @@ -944,11 +982,28 @@ static int emac_resume(struct platform_device *dev) return 0; } -static const struct of_device_id emac_of_match[] = { - {.compatible = "allwinner,sun4i-a10-emac",}, +static const struct emac_quirks sun4i_a10_emac_quirks = { + .has_reset = false, +}; +static const struct emac_quirks sun4i_r40_emac_quirks = { + .has_reset = true, +}; + +static const struct of_device_id emac_of_match[] = { + { + .compatible = "allwinner,sun4i-a10-emac", + .data = &sun4i_a10_emac_quirks + }, + { + .compatible = "allwinner,sun4i-r40-emac", + .data = &sun4i_r40_emac_quirks + }, /* Deprecated */ - {.compatible = "allwinner,sun4i-emac",}, + { + .compatible = "allwinner,sun4i-emac", + .data = &sun4i_a10_emac_quirks + }, {}, };