From patchwork Tue Jun 16 17:32:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= X-Patchwork-Id: 11608395 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 56CAB13B6 for ; Tue, 16 Jun 2020 17:32:57 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 32E902078D for ; Tue, 16 Jun 2020 17:32:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Obs90gjm"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="UPCcaccH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 32E902078D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=kK4GXXSc9omkLSVOU2Z3HILE5S4/++Wio/e6axL7CTc=; b=Obs90gjmEImB7K SVam/HiJ4NuDLHQJoCL3fya0lhUlq8fnpns92lK++QHjwbaAZe8sHex7Y424k6JiqxniRPa/76XAP aFhAeDmooiblZPdEOCdvexEW7CMDff7E8rlqjaZqAf/MDg2nhT9cQkFFmAWjk+Yx+rZl0Y2DAGvKT trcaI177Wh7EHEvvxffOd69zfP3rA/VIkeWmwbW0X1dqVVB6F0M1Ean2bIUe8hUMti4fyPH7b+YXk //l+huEdhuLRNAmuoU225I3PuhewKJpF8V61mGLZlaridJtVS15R789Q0Fmuiym1+PuFvTiJ5M4Nb Tc3k5dDam+9STuH/bu/w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jlFSB-0001Nt-H6; Tue, 16 Jun 2020 17:32:55 +0000 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jlFRx-0001Bg-PH for linux-arm-kernel@lists.infradead.org; Tue, 16 Jun 2020 17:32:43 +0000 Received: by mail-wr1-x443.google.com with SMTP id x14so21647878wrp.2 for ; Tue, 16 Jun 2020 10:32:41 -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 :mime-version:content-transfer-encoding; bh=M4FwC0tS2PEwWfH1L/1mjQoscnZK9tIH6DB/QnDAvYw=; b=UPCcaccHoC730cubgO602KTX+ru6qHNRcUXjlQasKj/h4dn9MQb8yDIsBVziiPPCfA g5Tb+2i3K/2byUrVysBNmSUWuWmMepzJ7yqh5LqqsZB7R8o5uPXpAYNL8y6qhX/auMa0 iysdD3VU7/CX24psf0PwUQ243V3bzB9m4857g7bvO4f85HK1YFgfpfHCirSOdLI45Htw VtIZxRiMdnCabRwQb/6bONXHXwgRleq6oncLPLemh9s8ya9i3Aa4us7lLXse92/6rqs0 fdhRdgAqCSHQSqtOLA8mmb9uCrQ5eLc0T+brtmz+adUyJTGLPUAIUu/Rp9VhniDOZc42 Ix2w== 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:mime-version:content-transfer-encoding; bh=M4FwC0tS2PEwWfH1L/1mjQoscnZK9tIH6DB/QnDAvYw=; b=GqeOxph9hhvxnHLW6JZp5CJka3sAiX7fw8UP8iV7CeXsm5RtmM+cLqiKwcqts38ggc s0LXsfrvuovXkNE7G4R7drzdVvvLW9+FEXRTuebAxUkTajX/TAExdl5YdZxxeDeKQRCN ZwOxVACSVOG81Gv0ZcaTRMpKpApa+RB2W4g7NbazBZJW3ZOv6p+EIitA634/UAjxozyq 52hkTSGyM0EOmlU42+0Pwk3NWeKi+HWEVPZkwlzn4inNzrXutlxGTgDeMaea3JoCo3Wb VBnCKyseatsoOqdqOdxVMbMPqWyfdfuUGQKA7yT3od6Z5n7Y9Hp5b1B7jaQJuMT+4bu7 y4ZA== X-Gm-Message-State: AOAM531YiiTd+r2e52PiPSwjBLOHvIMhtD49ibNLFApruBdN+UBGAcLE Qy2xw0F8x+/C0zDZfL13I0I= X-Google-Smtp-Source: ABdhPJxvTnhoOvZGU81shEIy5Tfm8z+l9F2YHek8X7iqGR8tqtNnL5yw4dUJ8+qy1TgfWOogqSm7dQ== X-Received: by 2002:a5d:4d4d:: with SMTP id a13mr4238758wru.252.1592328759836; Tue, 16 Jun 2020 10:32:39 -0700 (PDT) Received: from skynet.lan (90.red-88-20-62.staticip.rima-tde.net. [88.20.62.90]) by smtp.gmail.com with ESMTPSA id f16sm5014402wmh.27.2020.06.16.10.32.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jun 2020 10:32:39 -0700 (PDT) From: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= To: broonie@kernel.org, f.fainelli@gmail.com, bcm-kernel-feedback-list@broadcom.com, p.zabel@pengutronix.de, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 1/2] spi: bcm63xx-spi: add reset support Date: Tue, 16 Jun 2020 19:32:34 +0200 Message-Id: <20200616173235.3473149-2-noltari@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200616173235.3473149-1-noltari@gmail.com> References: <20200616173235.3473149-1-noltari@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200616_103241_836379_92A75773 X-CRM114-Status: GOOD ( 11.80 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:443 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [noltari[at]gmail.com] -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org bcm63xx arch resets the SPI controller at early boot. However, bmips arch needs to perform a reset when probing the driver. Signed-off-by: Álvaro Fernández Rojas Reviewed-by: Philipp Zabel Reviewed-by: Florian Fainelli --- v4: simplify devm_reset_control_get_optional_exclusive return handling v3: use devm_reset_control_get_optional_exclusive v2: use devm_reset_control_get_exclusive drivers/spi/spi-bcm63xx.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c index 0f1b10a4ef0c..96d075e633f4 100644 --- a/drivers/spi/spi-bcm63xx.c +++ b/drivers/spi/spi-bcm63xx.c @@ -18,6 +18,7 @@ #include #include #include +#include /* BCM 6338/6348 SPI core */ #define SPI_6348_RSET_SIZE 64 @@ -493,6 +494,7 @@ static int bcm63xx_spi_probe(struct platform_device *pdev) struct bcm63xx_spi *bs; int ret; u32 num_cs = BCM63XX_SPI_MAX_CS; + struct reset_control *reset; if (dev->of_node) { const struct of_device_id *match; @@ -529,6 +531,10 @@ static int bcm63xx_spi_probe(struct platform_device *pdev) return PTR_ERR(clk); } + reset = devm_reset_control_get_optional_exclusive(dev, NULL); + if (IS_ERR(reset)) + return PTR_ERR(reset); + master = spi_alloc_master(dev, sizeof(*bs)); if (!master) { dev_err(dev, "out of memory\n"); @@ -579,6 +585,12 @@ static int bcm63xx_spi_probe(struct platform_device *pdev) if (ret) goto out_err; + ret = reset_control_reset(reset); + if (ret) { + dev_err(dev, "unable to reset device: %d\n", ret); + goto out_clk_disable; + } + bcm_spi_writeb(bs, SPI_INTR_CLEAR_ALL, SPI_INT_STATUS); /* register and we are done */ From patchwork Tue Jun 16 17:32:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= X-Patchwork-Id: 11608401 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8ADC192A for ; Tue, 16 Jun 2020 17:33:17 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 6A9A82067B for ; Tue, 16 Jun 2020 17:33:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="KufaH9dj"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="m8+w7OW6" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6A9A82067B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=1dr9icdw5NotsOoO9d656xXavOeVQm2LqcpaW18ZOuk=; b=KufaH9dj96EjXv PgusjN5+gTgDpU7c/y7ktVD4duqbW0KTH+nUOhhrt/6C46Ku4HcE+tstz7wdRCSBbL9s5CB4Vas3Y IrnBMH5MVwpmPsRexTdk+4PQL+zBkY0OK634SJZAza7RRjgfzPVQx08j6fUv1ShVomW23vgcyOTH1 rDILXZ3xqAi1JmfzfJyI2y/dUwWvrlxJ4xnkWHmIJGjc1lc/WqoPnTztAvZoFkhXxYH8f2edWB3Bd k5WdTIhJG1XAUcDjSvcRAVsqP6ybQZwMg5X0KJ+eB1pbS1W94dgBoribEoo5+7maoeG6Orf7SdgJW 7EElIPiyG6fe1xj6RIoQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jlFSO-0001bQ-BZ; Tue, 16 Jun 2020 17:33:08 +0000 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jlFRy-0001Bj-2x for linux-arm-kernel@lists.infradead.org; Tue, 16 Jun 2020 17:32:44 +0000 Received: by mail-wm1-x341.google.com with SMTP id y20so3956393wmi.2 for ; Tue, 16 Jun 2020 10:32:41 -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 :mime-version:content-transfer-encoding; bh=NXWT0XBDvfCeaNJqhvulIouNPW+S3KxeQ8adKa8xo70=; b=m8+w7OW6QX97DxbPYywNN319UsCFVqHFB1bt397I2B0wcYD7eJ7HYJ2TxQJb/L5Cv5 SuYjVYu1zS6zR/DGUJYciirVFQnPgQr8zUkAqyq38AAYG9zN5t9jSyms3x7ZUqr8TBiq Eelzd+BkxzyMfK3fDVBATI8jfhTWUiXOxu+15RcQxy4Lw1k3AJCXZLTvZJDj11dj5B7z pJUlpl9YQK8q66FejtIoYv/9JjWXQEpNLUpB517v51sNqWnpFCBJLPCQInPfUBBFACp3 0y7UeengdqAmizU2B/wSRhXRg6HMvnz9y4QBAfb9P8bcXI7OOfU9Lr2hQYCKMIpv0Ilg S8Rw== 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:mime-version:content-transfer-encoding; bh=NXWT0XBDvfCeaNJqhvulIouNPW+S3KxeQ8adKa8xo70=; b=aXuZnMo2dTuVyxzj+BmoD2BH+vi30bV+RYUPqwoA+/XOZpB24aBJJuMCKyMfAMVp2v 4L7YIQLIIbbiW6OsnBvjeS+bWeeLsDPeWaatdT1hiN/bE1IHcw8YII8/0F3ihoMTSU/Q cmNbxlyU7ZbeXOKNbKUru3taVkSLQVkjClsE4ivoKAZLdWCwM4Ut6vVE9TO2fQARFzA3 K56ApPmoKoVXQ69xLrCHMSzPSEej0hESo+0BMADgx1Jvqnf26INT/j9l+f+Hgo6noVw3 5BAEiDx8B79kebEyGQs56oceQpIl8ie/ZJp4dPY7wcx/YoL9yYt9uI9fs6Bx1yPTp7oK 6XuQ== X-Gm-Message-State: AOAM531mXw7fMaqd20OvXpjDLFSVdcr/AbgSAuwUxmlx5CCvhoswY8Au fwznDNuoI1N0E301xsGUYLc= X-Google-Smtp-Source: ABdhPJyqQgCtDv/pypP89GRXyglSLvJdg+YyNDVE2UIgLYu/pYE+pkfKqRd/5TuXWFtvbYYz8RJaMw== X-Received: by 2002:a1c:59c7:: with SMTP id n190mr4137654wmb.61.1592328760706; Tue, 16 Jun 2020 10:32:40 -0700 (PDT) Received: from skynet.lan (90.red-88-20-62.staticip.rima-tde.net. [88.20.62.90]) by smtp.gmail.com with ESMTPSA id f16sm5014402wmh.27.2020.06.16.10.32.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jun 2020 10:32:40 -0700 (PDT) From: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= To: broonie@kernel.org, f.fainelli@gmail.com, bcm-kernel-feedback-list@broadcom.com, p.zabel@pengutronix.de, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 2/2] spi: bcm63xx-hsspi: add reset support Date: Tue, 16 Jun 2020 19:32:35 +0200 Message-Id: <20200616173235.3473149-3-noltari@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200616173235.3473149-1-noltari@gmail.com> References: <20200616173235.3473149-1-noltari@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200616_103242_122883_0BF2F9A7 X-CRM114-Status: GOOD ( 11.96 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:341 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [noltari[at]gmail.com] -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org bcm63xx arch resets the HSSPI controller at early boot. However, bmips arch needs to perform a reset when probing the driver. Signed-off-by: Álvaro Fernández Rojas Reviewed-by: Philipp Zabel Reviewed-by: Florian Fainelli --- v4: simplify devm_reset_control_get_optional_exclusive return handling v3: use devm_reset_control_get_optional_exclusive v2: use devm_reset_control_get_exclusive drivers/spi/spi-bcm63xx-hsspi.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/spi/spi-bcm63xx-hsspi.c b/drivers/spi/spi-bcm63xx-hsspi.c index 6c235306c0e4..9909b18f3c5a 100644 --- a/drivers/spi/spi-bcm63xx-hsspi.c +++ b/drivers/spi/spi-bcm63xx-hsspi.c @@ -20,6 +20,7 @@ #include #include #include +#include #define HSSPI_GLOBAL_CTRL_REG 0x0 #define GLOBAL_CTRL_CS_POLARITY_SHIFT 0 @@ -334,6 +335,7 @@ static int bcm63xx_hsspi_probe(struct platform_device *pdev) struct clk *clk, *pll_clk = NULL; int irq, ret; u32 reg, rate, num_cs = HSSPI_SPI_MAX_CS; + struct reset_control *reset; irq = platform_get_irq(pdev, 0); if (irq < 0) @@ -348,10 +350,20 @@ static int bcm63xx_hsspi_probe(struct platform_device *pdev) if (IS_ERR(clk)) return PTR_ERR(clk); + reset = devm_reset_control_get_optional_exclusive(dev, NULL); + if (IS_ERR(reset)) + return PTR_ERR(reset); + ret = clk_prepare_enable(clk); if (ret) return ret; + ret = reset_control_reset(reset); + if (ret) { + dev_err(dev, "unable to reset device: %d\n", ret); + goto out_disable_clk; + } + rate = clk_get_rate(clk); if (!rate) { pll_clk = devm_clk_get(dev, "pll");