From patchwork Tue May 26 15:12:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dinh Nguyen X-Patchwork-Id: 11570685 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 54359913 for ; Tue, 26 May 2020 15:12:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2AB162078C for ; Tue, 26 May 2020 15:12:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590505954; bh=a2UmATCEGkPccI7kZvMXYrJC+peopdphgNXcACi5eT8=; h=From:To:Cc:Subject:Date:List-ID:From; b=Jr1RiB2e7r66RM3McbnggRC3gLcTkxRmdeYVZ7T/HSup7ypGEQpMkhDNIN6bV5Pth ojttQlGZgnjW9ZSoaKrcxWv5nNnOGA7mCL0msIXwpWBQWayAJP85Me7tNrXe6xEy1N VBY85fZWzt9BeVveGctDgdZC/ughfhCSpDEhFex4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728888AbgEZPMd (ORCPT ); Tue, 26 May 2020 11:12:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:33258 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728442AbgEZPMd (ORCPT ); Tue, 26 May 2020 11:12:33 -0400 Received: from localhost.localdomain (cpe-70-114-128-244.austin.res.rr.com [70.114.128.244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EE3392070A; Tue, 26 May 2020 15:12:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590505953; bh=a2UmATCEGkPccI7kZvMXYrJC+peopdphgNXcACi5eT8=; h=From:To:Cc:Subject:Date:From; b=Os3x/pdMeuvMGeLDe2z/CJvKVmSM9loLzmaswaVOzP8AM5JQvs1JfM1S0sEWUvqE7 5YmUEYCWSy7vQz4evVmtiTZerm4hpO6I/Z8vngVD2S3rWLqR/0VMWJL4XLz83SUwea YL5Y4NJYxVoZt+E02QfS7I/zUheh7f0RwA3eIeQ8= From: Dinh Nguyen To: linux-kernel@vger.kernel.org Cc: dinguyen@kernel.org, devicetree@vger.kernel.org, broonie@kernel.org, robh+dt@kernel.org, linux-spi@vger.kernel.org, Sergey.Semin@baikalelectronics.ru, fancer.lancer@gmail.com, andriy.shevchenko@linux.intel.com, lars.povlsen@microchip.com, Liang Jin J Subject: [PATCHv2 1/2] spi: dw: add reset control Date: Tue, 26 May 2020 10:12:17 -0500 Message-Id: <20200526151218.6186-1-dinguyen@kernel.org> X-Mailer: git-send-email 2.17.1 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org Add mechanism to get the reset control and deassert it in order to bring the IP out of reset. Signed-off-by: Liang Jin J Signed-off-by: Dinh Nguyen --- v2: use _get_optional_exclusive put IP back into reset if there was an error in probe function --- drivers/spi/spi-dw-mmio.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/spi/spi-dw-mmio.c b/drivers/spi/spi-dw-mmio.c index 384a3ab6dc2d..07e015b6d03d 100644 --- a/drivers/spi/spi-dw-mmio.c +++ b/drivers/spi/spi-dw-mmio.c @@ -20,6 +20,7 @@ #include #include #include +#include #include "spi-dw.h" @@ -30,6 +31,7 @@ struct dw_spi_mmio { struct clk *clk; struct clk *pclk; void *priv; + struct reset_control *rstc; }; #define MSCC_CPU_SYSTEM_CTRL_GENERAL_CTRL 0x24 @@ -175,6 +177,14 @@ static int dw_spi_mmio_probe(struct platform_device *pdev) if (ret) goto out_clk; + /* find an optional reset controller */ + dwsmmio->rstc = devm_reset_control_get_optional_exclusive(&pdev->dev, "spi"); + if (IS_ERR(dwsmmio->rstc)) { + if (PTR_ERR(dwsmmio->rstc) == -EPROBE_DEFER) + return PTR_ERR(dwsmmio->rstc); + } + reset_control_deassert(dwsmmio->rstc); + dws->bus_num = pdev->id; dws->max_freq = clk_get_rate(dwsmmio->clk); @@ -208,6 +218,8 @@ static int dw_spi_mmio_probe(struct platform_device *pdev) clk_disable_unprepare(dwsmmio->pclk); out_clk: clk_disable_unprepare(dwsmmio->clk); + reset_control_assert(dwsmmio->rstc); + return ret; } @@ -219,6 +231,7 @@ static int dw_spi_mmio_remove(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); clk_disable_unprepare(dwsmmio->pclk); clk_disable_unprepare(dwsmmio->clk); + reset_control_assert(dwsmmio->rstc); return 0; } From patchwork Tue May 26 15:12:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dinh Nguyen X-Patchwork-Id: 11570687 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 4ECB5739 for ; Tue, 26 May 2020 15:12:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 375242078C for ; Tue, 26 May 2020 15:12:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590505960; bh=Z9bdFnz1pD08lYT+ADDGs4FNE+dhk4zct/gTLKdD2e8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=A0Z1MkNnTnn11Gmot1kMZKOsf+FUN1jOkXjNaworfjf91AXefKLOxO1XPg7v9pCL5 3exMQLmTYclnfYKODF6Un+e9t387iYa4vxaHKb+hf9t6aEMRA0+9hHYyCIhmnFYmFX bg4dD1zWXsjISf3MBJ3Nv64jU2sb2dQKGlGXy0tw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729473AbgEZPMg (ORCPT ); Tue, 26 May 2020 11:12:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:33270 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728205AbgEZPMe (ORCPT ); Tue, 26 May 2020 11:12:34 -0400 Received: from localhost.localdomain (cpe-70-114-128-244.austin.res.rr.com [70.114.128.244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 48A062084C; Tue, 26 May 2020 15:12:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590505954; bh=Z9bdFnz1pD08lYT+ADDGs4FNE+dhk4zct/gTLKdD2e8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YquJWBRw4fUGZ1351dAw9Kiwg7K3Hl4o4UTHmz1qJ4evIGudXDEQpoNbAYvnM3N3r F3D0VnkftoawaVL+SuakWnWVjfz3S0iyBaHWdwpOgt8uUcXB0gHCmNdvT2qiJu2tUq uuCEU7rcfGkmPMlRIRVyBuif6y03NTU2n6u29f4k= From: Dinh Nguyen To: linux-kernel@vger.kernel.org Cc: dinguyen@kernel.org, devicetree@vger.kernel.org, broonie@kernel.org, robh+dt@kernel.org, linux-spi@vger.kernel.org, Sergey.Semin@baikalelectronics.ru, fancer.lancer@gmail.com, andriy.shevchenko@linux.intel.com, lars.povlsen@microchip.com Subject: [PATCHv2 2/2] dt-bindings: snps,dw-apb-ssi: add optional reset property Date: Tue, 26 May 2020 10:12:18 -0500 Message-Id: <20200526151218.6186-2-dinguyen@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200526151218.6186-1-dinguyen@kernel.org> References: <20200526151218.6186-1-dinguyen@kernel.org> Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org Add optional reset property. Signed-off-by: Dinh Nguyen --- v2: actually document the "resets" and "reset-names" optional properties --- Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.txt b/Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.txt index 3ed08ee9feba..c679778612f3 100644 --- a/Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.txt +++ b/Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.txt @@ -22,6 +22,9 @@ Optional properties: - num-cs : The number of chipselects. If omitted, this will default to 4. - reg-io-width : The I/O register width (in bytes) implemented by this device. Supported values are 2 or 4 (the default). +- resets : contains an entry for each entry in reset-names. + See ../reset/reset.txt for details. +- reset-names : must contain "spi" Child nodes as per the generic SPI binding. @@ -37,5 +40,7 @@ Example: num-cs = <2>; cs-gpios = <&gpio0 13 0>, <&gpio0 14 0>; + resets = <&rst SPIM0_RST>; + reset-names = "spi"; };