From patchwork Tue Jan 11 15:57:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Boger X-Patchwork-Id: 12709989 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C7462C433EF for ; Tue, 11 Jan 2022 15:59:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Ifkhn47Hpkwn6OSI5hFlFhMqPME/eh13L6kDe/OAiNM=; b=uxZze1BL2u7lB5 qqn+SRv00UkRY2V6wgH9VYpqx6k7Jz3Ufk46Fb66q3NbREyZzMcPIQ1fb+wm2HUCK3z3Hpd0S2zK/ d34OJfkSIt5nCvueRfFnYTkOWe+h6nrEiUZulXHGZdXa6rHTkUwMrv0MIRsVx7FkCa0I/QxdAy4Yq OSTPyZJEj8hi1vFZt82RwBPGIs6FVaHkUE2w9FNL06zg3QNZIjrI3wbsXvgNAYBFodG9d+vOX7knN 8wAFXszcc3eeZqu5We+ZEdjF7TzEPcbkUi4CFhgnkNmJRCaw2lz5JGM2SaBMg/1nlZnEaDA92XutE T7YCVtYDzsyMc15yvGbA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n7JX4-00Gouz-VR; Tue, 11 Jan 2022 15:57:59 +0000 Received: from mail-lf1-x12b.google.com ([2a00:1450:4864:20::12b]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n7JWl-00Good-JM for linux-arm-kernel@lists.infradead.org; Tue, 11 Jan 2022 15:57:41 +0000 Received: by mail-lf1-x12b.google.com with SMTP id m1so24737915lfq.4 for ; Tue, 11 Jan 2022 07:57:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wirenboard-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xWB86lLShMOvVXpcj6liSWQMqibhlefo7YzIyCndAFs=; b=54T92PiCKERDXo2MK7DNMmul3FC9HVF7xNWVf/6uPh+X2Cd/4EPq8pq94BgSZ6T30V iNE/waUixYUh889slgqB+y6qdIizEKuc2sSdTpcF5rpswUPBvxrQpH3DNtmkjbBLBSaN IPrXjff5Q8rltcml9n+oiP8/UlUttOnBHA6xa92ogN79xSCZ96xyJiDFSfmp1QITdNwV 6CT3Y3Z8/wtauUFlI+Z5gs+bRgN00sEawN5xqj9ykrYtAqlHqajjiyOD+qO16fazbu96 IH3oQPLVnv9D8uCTQ+GcAFqbUhc+XJJ8uDYAuhrN/HCs9n1zFXoriNYisEy7Sob7bqM+ Xdkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xWB86lLShMOvVXpcj6liSWQMqibhlefo7YzIyCndAFs=; b=5YgjZCBj1sttmcQA3bCqbbkuBdPjDorSamXCp/ei98rNKMFrgFKx+JcctGu58j0E7A mixAtM3l0p0N9hzlXhxNdOUxx8idWVyq96rh/oUCVLeeqFYqv0S1lvhRnyC33MlmFp1G Ca8r7NOLFaY2GQERyxkPD60EFVK16Xf5q0c29ofGIV0jQiOuf+Q2cBCHdgU/fXdteXW2 jNxVIoMzt1VVn/soqTIviL+KAADfeKaUBvBobJqNzVF/FrAZ+uVFmahs6AHDCQ8jSQ/A wSUZsYFtrbwMFaWe14bo/qOwscltrB6reMgcDN9HBLkeKac1pCF0AERFmDMTu4fBn+xm 6VVQ== X-Gm-Message-State: AOAM53384D/HuoZ0Mey2JafVHHS42Sx91h37VXHwA/18GkdQ2rgQgkf1 snfTQfTualgS8bVQNyhEwjEgKg== X-Google-Smtp-Source: ABdhPJzGSdWUsXwj8CndEAqmmbfMMV8gzQB7VszCY9/t9/9SDBOZurgzAsIGXesOHh8ZFFHpLIBI0g== X-Received: by 2002:a2e:868c:: with SMTP id l12mr3552087lji.416.1641916655985; Tue, 11 Jan 2022 07:57:35 -0800 (PST) Received: from boger-laptop.lan (81.5.110.253.dhcp.mipt-telecom.ru. [81.5.110.253]) by smtp.gmail.com with ESMTPSA id y7sm1370706lfa.92.2022.01.11.07.57.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jan 2022 07:57:35 -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-sunxi@lists.linux.dev, linux-can@vger.kernel.org, Wolfgang Grandegger , Marc Kleine-Budde , "David S . Miller" , Jeroen Hofstee , Gerhard Bertelsmann Subject: [PATCH v2 2/3] can: sun4i_can: add support for R40 CAN controller Date: Tue, 11 Jan 2022 18:57:08 +0300 Message-Id: <20220111155709.56501-3-boger@wirenboard.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220111155709.56501-1-boger@wirenboard.com> References: <20220111155709.56501-1-boger@wirenboard.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220111_075739_669275_83A03ABC X-CRM114-Status: GOOD ( 21.36 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Allwinner R40 (also known as A40i, T3, V40) has a CAN controller. The controller is the same as in earlier A10 and A20 SoCs, but needs reset line to be deasserted before use. This patch adds a new compatible for R40 CAN controller. Depending on the compatible, reset line can be requested from DT. Signed-off-by: Evgeny Boger --- drivers/net/can/sun4i_can.c | 61 ++++++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/drivers/net/can/sun4i_can.c b/drivers/net/can/sun4i_can.c index 54aa7c25c4de..24a61326915e 100644 --- a/drivers/net/can/sun4i_can.c +++ b/drivers/net/can/sun4i_can.c @@ -61,6 +61,7 @@ #include #include #include +#include #define DRV_NAME "sun4i_can" @@ -200,10 +201,20 @@ #define SUN4I_CAN_MAX_IRQ 20 #define SUN4I_MODE_MAX_RETRIES 100 +/** + * struct sun4ican_quirks - Differences between SoC variants. + * + * @has_reset: SoC needs reset deasserted. + */ +struct sun4ican_quirks { + bool has_reset; +}; + struct sun4ican_priv { struct can_priv can; void __iomem *base; struct clk *clk; + struct reset_control *reset; spinlock_t cmdreg_lock; /* lock for concurrent cmd register writes */ }; @@ -702,6 +713,13 @@ static int sun4ican_open(struct net_device *dev) goto exit_irq; } + /* software reset deassert */ + err = reset_control_deassert(priv->reset); + if (err) { + netdev_err(dev, "could not deassert CAN reset\n"); + goto exit_soft_reset; + } + /* turn on clocking for CAN peripheral block */ err = clk_prepare_enable(priv->clk); if (err) { @@ -723,6 +741,8 @@ static int sun4ican_open(struct net_device *dev) exit_can_start: clk_disable_unprepare(priv->clk); exit_clock: + reset_control_assert(priv->reset); +exit_soft_reset: free_irq(dev->irq, dev); exit_irq: close_candev(dev); @@ -736,6 +756,7 @@ static int sun4ican_close(struct net_device *dev) netif_stop_queue(dev); sun4i_can_stop(dev); clk_disable_unprepare(priv->clk); + reset_control_assert(priv->reset); free_irq(dev->irq, dev); close_candev(dev); @@ -750,8 +771,27 @@ static const struct net_device_ops sun4ican_netdev_ops = { .ndo_start_xmit = sun4ican_start_xmit, }; +static const struct sun4ican_quirks sun4ican_quirks_a10 = { + .has_reset = false, +}; + +static const struct sun4ican_quirks sun4ican_quirks_r40 = { + .has_reset = true, +}; + static const struct of_device_id sun4ican_of_match[] = { - {.compatible = "allwinner,sun4i-a10-can"}, + { + .compatible = "allwinner,sun4i-a10-can", + .data = &sun4ican_quirks_a10 + }, + { + .compatible = "allwinner,sun7i-a20-can", + .data = &sun4ican_quirks_a10 + }, + { + .compatible = "allwinner,sun8i-r40-can", + .data = &sun4ican_quirks_r40 + }, {}, }; @@ -771,10 +811,28 @@ static int sun4ican_probe(struct platform_device *pdev) { struct device_node *np = pdev->dev.of_node; struct clk *clk; + struct reset_control *reset = NULL; void __iomem *addr; int err, irq; struct net_device *dev; struct sun4ican_priv *priv; + const struct sun4ican_quirks *quirks; + + quirks = of_device_get_match_data(&pdev->dev); + if (!quirks) { + dev_err(&pdev->dev, "failed to determine the quirks to use\n"); + err = -ENODEV; + goto exit; + } + + if (quirks->has_reset) { + reset = devm_reset_control_get_exclusive(&pdev->dev, NULL); + if (IS_ERR(reset)) { + dev_err(&pdev->dev, "unable to request reset\n"); + err = PTR_ERR(reset); + goto exit; + } + } clk = of_clk_get(np, 0); if (IS_ERR(clk)) { @@ -818,6 +876,7 @@ static int sun4ican_probe(struct platform_device *pdev) CAN_CTRLMODE_3_SAMPLES; priv->base = addr; priv->clk = clk; + priv->reset = reset; spin_lock_init(&priv->cmdreg_lock); platform_set_drvdata(pdev, dev);