From patchwork Mon Jun 19 08:35:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Qiu X-Patchwork-Id: 109826 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2857702vqr; Mon, 19 Jun 2023 01:54:27 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5MBvIfL+iuZ74xAqPPViLg4fn/QilQv92FfWI85vFS9X04P2M2h3huka2nicJ6qgVa24oE X-Received: by 2002:a17:90a:1f82:b0:250:6c76:fd9b with SMTP id x2-20020a17090a1f8200b002506c76fd9bmr4485876pja.38.1687164867409; Mon, 19 Jun 2023 01:54:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687164867; cv=none; d=google.com; s=arc-20160816; b=nwol2B1LiEMNSn2c8Vo07GCxNYQq2RJv+mtMM5vTY/GQ2VgxYLwPWnGQ7y9SfE9Qz6 DmZ4UIBieWwRs2X3rVhVD+kecKlFkXBG4EkAkNZ6/p2vtB/TaH/Zj3ue6ioQAFTOk5UX u81fYkdtl4U1a60LC8pTLkZm1S8ma+YmmNKAVnTSez858oDFsOMmSCftHZ8vkpIM6weC eZ/Hj+zhuaQNd+JiPWaqNem+n4jW1kOxFhE+grFA4piUP3JAzVUatSUz3RzwtaU8pygv CdZ4YjqOA1rI+eT6hALx9KicSUAGBiwdzd9x/bLduOHTsWktQIum5JNCTX49Q8XWNXPD CAEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=njOiDHKfItv3SKxReRsg1d1cR6/mw8YB6g5TwSxcPxc=; b=rQRf5Z9NGg2dOYDMAVf9RIqR/QgbtxKAec/yUSrpZ4HF0ch1sl6HZcoVFFmN9WOBql zqbm+x0D9GizqfIEV5nPQ+y2wiQXiwogXTUX2wmyRSyKi7Hin5YI5/SdxSFBpNOp4mgL pvFJ0AAYq+phmMUZKEGTxfYnsWUZIkKjLD1HrEu+UPhVk0YinHZdqIAH/PSW6sfOxP3D BzNsj64gQlsAp1FzUF/ZVR4X7tQNjSh+ZStwqxl90w44qR7vmMor+C1ox/SLI0HBf247 kfdPhirADpzsi8ZPovhk7pplg2OpQD/HBJvDH/LrmjsEcGdnqD1E6SxKGzqE12GfRUja Jf4A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p10-20020a17090a4f0a00b002565804077bsi7136642pjh.32.2023.06.19.01.54.14; Mon, 19 Jun 2023 01:54:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230480AbjFSIsW convert rfc822-to-8bit (ORCPT + 99 others); Mon, 19 Jun 2023 04:48:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47658 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231322AbjFSIr7 (ORCPT ); Mon, 19 Jun 2023 04:47:59 -0400 Received: from fd01.gateway.ufhost.com (fd01.gateway.ufhost.com [61.152.239.71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1524610C0; Mon, 19 Jun 2023 01:46:19 -0700 (PDT) Received: from EXMBX166.cuchost.com (unknown [175.102.18.54]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "EXMBX166", Issuer "EXMBX166" (not verified)) by fd01.gateway.ufhost.com (Postfix) with ESMTP id 6561C8480; Mon, 19 Jun 2023 16:35:19 +0800 (CST) Received: from EXMBX068.cuchost.com (172.16.6.68) by EXMBX166.cuchost.com (172.16.6.76) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Mon, 19 Jun 2023 16:35:19 +0800 Received: from williamqiu-virtual-machine.starfivetech.com (171.223.208.138) by EXMBX068.cuchost.com (172.16.6.68) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Mon, 19 Jun 2023 16:35:18 +0800 From: William Qiu To: , , , CC: Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Emil Renner Berthing , Ziv Xu , William Qiu Subject: [PATCH v3 1/3] dt-bindings: qspi: cdns,qspi-nor: Add clocks for StarFive JH7110 SoC Date: Mon, 19 Jun 2023 16:35:15 +0800 Message-ID: <20230619083517.415597-2-william.qiu@starfivetech.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230619083517.415597-1-william.qiu@starfivetech.com> References: <20230619083517.415597-1-william.qiu@starfivetech.com> MIME-Version: 1.0 X-Originating-IP: [171.223.208.138] X-ClientProxiedBy: EXCAS062.cuchost.com (172.16.6.22) To EXMBX068.cuchost.com (172.16.6.68) X-YovoleRuleAgent: yovoleflag X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_PASS, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769120587714527954?= X-GMAIL-MSGID: =?utf-8?q?1769120587714527954?= The QSPI controller needs three clock items to work properly on StarFive JH7110 SoC, so there is need to change the maxItems's value to 3. Other platforms do not have this constraint. Signed-off-by: William Qiu Reviewed-by: Hal Feng Reviewed-by: Conor Dooley --- .../bindings/spi/cdns,qspi-nor.yaml | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml b/Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml index b310069762dd..1b83cbb9a086 100644 --- a/Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml +++ b/Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml @@ -26,6 +26,15 @@ allOf: const: starfive,jh7110-qspi then: properties: + clocks: + maxItems: 3 + + clock-names: + items: + - const: ref + - const: ahb + - const: apb + resets: minItems: 2 maxItems: 3 @@ -38,6 +47,9 @@ allOf: else: properties: + clocks: + maxItems: 1 + resets: maxItems: 2 @@ -70,7 +82,13 @@ properties: maxItems: 1 clocks: - maxItems: 1 + maxItems: 3 + + clock-names: + items: + - const: ref + - const: ahb + - const: apb cdns,fifo-depth: description: From patchwork Mon Jun 19 08:35:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Qiu X-Patchwork-Id: 109824 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2856491vqr; Mon, 19 Jun 2023 01:50:35 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7YX7uxL05RxUPjS1bgUiXIqSMlRDMJwI2zdxuK8UnGigz0DywotNzi+cUZ1cIYzUDdGYHQ X-Received: by 2002:a05:6808:2182:b0:39e:dd33:3593 with SMTP id be2-20020a056808218200b0039edd333593mr2848154oib.39.1687164635450; Mon, 19 Jun 2023 01:50:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687164635; cv=none; d=google.com; s=arc-20160816; b=e5Bf9dWnM7VjkeEQrvRLvLQOv6+/1neMk+zrDmmsJMuCoxxWkHyXvY2DrsDHQkFeNC y+RUoED5XRBv9yBHxrn/94RH/aSpm2tl/wwBubHJnmMgG73F43vlQG8v3jfXRwsJjtMF t0GGcFIkIv7E5VZLsQBlDIVTqtE+OIyjmkrkitmT9H2qJc+gOiM4pVZkvdOtoqeh3HWQ kxIa55M+wV4tBuSS3/TesLxRlW2xqQvwltmQQMSPYM/lFgvofSydoVF2IBa4sVVoJayc wA0VoI8PLLsQd1EVi6n6zqTRPyEBvUsU42eVJWQDq6iOX5lXKcvCqjTgn/yTYThrD96r 1K2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=xluEhI4EKcS6Ela8oCzsYF8MRp2x8idCGb6vy/ZteSc=; b=Bd1aHGqF3VGb13aOwvKQIFoh00rHKVadYnfwpgyWBPAvrrD+I5U0JynMfTWALpNSgJ 1Y1DvQ+I2z46QqvcjqpHikigHAbcvPHb93lVuadpQ35fPfaBz0RBQOf5i6q4rnguMpTI 9nVxSWhtSlu0btiPGJdY3xiPf83pLYUiBO3dMYfpkLu5U2Sw4z9+CMBRERU+yv2vfxRg wW+LwCZwbyke9/g3g+JYNXuJv0Q9ltMp6MAX+9UWocag8bmNggxkSlXzWWJxQMxbyVY5 Jnh9F8hZt6WcwL5/9QCuB+gQCig1MtC8vpVpwH5TXElnD3UsJT+V3A5gZfpgVys8nc3E 70xg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g6-20020a17090adac600b00246a5991cc6si7032644pjx.162.2023.06.19.01.50.23; Mon, 19 Jun 2023 01:50:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229998AbjFSIqK convert rfc822-to-8bit (ORCPT + 99 others); Mon, 19 Jun 2023 04:46:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47970 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229648AbjFSIpq (ORCPT ); Mon, 19 Jun 2023 04:45:46 -0400 Received: from fd01.gateway.ufhost.com (fd01.gateway.ufhost.com [61.152.239.71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 575CB1991; Mon, 19 Jun 2023 01:44:05 -0700 (PDT) Received: from EXMBX165.cuchost.com (unknown [175.102.18.54]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "EXMBX165", Issuer "EXMBX165" (not verified)) by fd01.gateway.ufhost.com (Postfix) with ESMTP id D8A338485; Mon, 19 Jun 2023 16:35:19 +0800 (CST) Received: from EXMBX068.cuchost.com (172.16.6.68) by EXMBX165.cuchost.com (172.16.6.75) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Mon, 19 Jun 2023 16:35:19 +0800 Received: from williamqiu-virtual-machine.starfivetech.com (171.223.208.138) by EXMBX068.cuchost.com (172.16.6.68) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Mon, 19 Jun 2023 16:35:19 +0800 From: William Qiu To: , , , CC: Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Emil Renner Berthing , Ziv Xu , William Qiu Subject: [PATCH v3 2/3] spi: cadence-quadspi: Add clock configuration for StarFive JH7110 QSPI Date: Mon, 19 Jun 2023 16:35:16 +0800 Message-ID: <20230619083517.415597-3-william.qiu@starfivetech.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230619083517.415597-1-william.qiu@starfivetech.com> References: <20230619083517.415597-1-william.qiu@starfivetech.com> MIME-Version: 1.0 X-Originating-IP: [171.223.208.138] X-ClientProxiedBy: EXCAS062.cuchost.com (172.16.6.22) To EXMBX068.cuchost.com (172.16.6.68) X-YovoleRuleAgent: yovoleflag X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_PASS, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769120344509129758?= X-GMAIL-MSGID: =?utf-8?q?1769120344509129758?= Add QSPI clock operation in device probe. Signed-off-by: William Qiu Reviewed-by: Hal Feng Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202306022017.UbwjjWRN-lkp@intel.com/ Reported-by: Julia Lawall Closes: https://lore.kernel.org/r/202306040644.6ZHs55x4-lkp@intel.com/ --- drivers/spi/spi-cadence-quadspi.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/spi/spi-cadence-quadspi.c b/drivers/spi/spi-cadence-quadspi.c index 6ddb2dfc0f00..8774f9aaff61 100644 --- a/drivers/spi/spi-cadence-quadspi.c +++ b/drivers/spi/spi-cadence-quadspi.c @@ -63,6 +63,8 @@ struct cqspi_st { struct platform_device *pdev; struct spi_master *master; struct clk *clk; + struct clk_bulk_data *clks; + int num_clks; unsigned int sclk; void __iomem *iobase; @@ -1715,6 +1717,16 @@ static int cqspi_probe(struct platform_device *pdev) } if (of_device_is_compatible(pdev->dev.of_node, "starfive,jh7110-qspi")) { + cqspi->num_clks = devm_clk_bulk_get_all(dev, &cqspi->clks); + if (cqspi->num_clks < 0) { + dev_err(dev, "Cannot claim clock: %u\n", cqspi->num_clks); + return -EINVAL; + } + + ret = clk_bulk_prepare_enable(cqspi->num_clks, cqspi->clks); + if (ret) + dev_err(dev, "Cannot enable clock clks\n"); + rstc_ref = devm_reset_control_get_optional_exclusive(dev, "rstc_ref"); if (IS_ERR(rstc_ref)) { ret = PTR_ERR(rstc_ref); @@ -1816,6 +1828,9 @@ static void cqspi_remove(struct platform_device *pdev) clk_disable_unprepare(cqspi->clk); + if (of_device_is_compatible(pdev->dev.of_node, "starfive,jh7110-qspi")) + clk_bulk_disable_unprepare(cqspi->num_clks, cqspi->clks); + pm_runtime_put_sync(&pdev->dev); pm_runtime_disable(&pdev->dev); } @@ -1831,6 +1846,9 @@ static int cqspi_suspend(struct device *dev) clk_disable_unprepare(cqspi->clk); + if (of_device_is_compatible(dev->of_node, "starfive,jh7110-qspi")) + clk_bulk_disable_unprepare(cqspi->num_clks, cqspi->clks); + return ret; } @@ -1840,6 +1858,8 @@ static int cqspi_resume(struct device *dev) struct spi_master *master = dev_get_drvdata(dev); clk_prepare_enable(cqspi->clk); + if (of_device_is_compatible(dev->of_node, "starfive,jh7110-qspi")) + clk_bulk_prepare_enable(cqspi->num_clks, cqspi->clks); cqspi_wait_idle(cqspi); cqspi_controller_init(cqspi); From patchwork Mon Jun 19 08:35:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Qiu X-Patchwork-Id: 109828 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2858468vqr; Mon, 19 Jun 2023 01:56:36 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5vMKKuOSgbEVowon5mqbc9BJ0CFReH2Pv8wJBqSyv27tbiH6uJ60xGH+L4tDEiNssZZwCA X-Received: by 2002:a05:6808:2393:b0:397:fbe7:a0fb with SMTP id bp19-20020a056808239300b00397fbe7a0fbmr11783752oib.18.1687164996206; Mon, 19 Jun 2023 01:56:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687164996; cv=none; d=google.com; s=arc-20160816; b=YxMRwkG3u9q3blO8LJvl8ylaUVDxv0Vm/yfMMpHeYXstdepSvBa9SoQ6KHZkAo5zLW MKh2Gbo9Ki5Tdd+QF1rgE1y4r9QasOFbNg0+HbzM406aNz1Uz/0/5rk0KgDhHeTOku0e dpOuMRL6xdnranA5Y1WkiP1pFWwZiJEdEhQwZqjtHjzBXwkok1MY0vMmFQNRJeyIWNWL lFZY1kgQIkK4ALEB702kJRpweLtidm7eLlIrvBUfzIhmTgOlpx2ffzk1507mvfhn/Et8 M9hoJCIYROqjfe1azrWqRyufKe2J4cvGYnUp/YgiIYPfGeP1UvhS1Fo63/sIvJiR/UMX 6n7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=HSCxdE12ddC4UlhzHQcRmw1j5DX5w8+mEZl5FdhsXIo=; b=jyqUwIUdkHyahk7GNsI83TpnSqBX2Jc/ahnMSVWoZrOjqexVhQ1Q3LR5i1WhxkuSsE F+RJUewyjwZzTo98xHXdF/poQ/Va/IPQWT9fR1ixJ2baYX0aKVyM0UGl1FOFp9REQf8L HAsiA13uiWyM1q4gbNcM8+ru+ZSqZHB71om+Ojeb3iLJc6nyvAOohXkp9lmoxaWQAl2E gaqZi5M33RYJXyvCipyQArHzwSebRaSrGueis2VaeRoywQiQSiM3ecPkFOREqudmrrFg kzQQQPet45uZpUcSkx99q8Z5Og74qpgbsOfB3jbY0Pn25VwVHMswBokazx3Owc4NvGTe QfOA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p12-20020a17090a348c00b0025ea380f868si7002532pjb.2.2023.06.19.01.56.22; Mon, 19 Jun 2023 01:56:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231178AbjFSIsZ convert rfc822-to-8bit (ORCPT + 99 others); Mon, 19 Jun 2023 04:48:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47860 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231324AbjFSIr7 (ORCPT ); Mon, 19 Jun 2023 04:47:59 -0400 Received: from ex01.ufhost.com (ex01.ufhost.com [61.152.239.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 62F3910C7; Mon, 19 Jun 2023 01:46:23 -0700 (PDT) Received: from EXMBX166.cuchost.com (unknown [175.102.18.54]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "EXMBX166", Issuer "EXMBX166" (not verified)) by ex01.ufhost.com (Postfix) with ESMTP id 8CF0424E2B2; Mon, 19 Jun 2023 16:35:20 +0800 (CST) Received: from EXMBX068.cuchost.com (172.16.6.68) by EXMBX166.cuchost.com (172.16.6.76) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Mon, 19 Jun 2023 16:35:20 +0800 Received: from williamqiu-virtual-machine.starfivetech.com (171.223.208.138) by EXMBX068.cuchost.com (172.16.6.68) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Mon, 19 Jun 2023 16:35:19 +0800 From: William Qiu To: , , , CC: Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Emil Renner Berthing , Ziv Xu , William Qiu Subject: [PATCH v3 3/3] riscv: dts: starfive: Add QSPI controller node for StarFive JH7110 SoC Date: Mon, 19 Jun 2023 16:35:17 +0800 Message-ID: <20230619083517.415597-4-william.qiu@starfivetech.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230619083517.415597-1-william.qiu@starfivetech.com> References: <20230619083517.415597-1-william.qiu@starfivetech.com> MIME-Version: 1.0 X-Originating-IP: [171.223.208.138] X-ClientProxiedBy: EXCAS062.cuchost.com (172.16.6.22) To EXMBX068.cuchost.com (172.16.6.68) X-YovoleRuleAgent: yovoleflag X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769120723415990831?= X-GMAIL-MSGID: =?utf-8?q?1769120723415990831?= Add the quad spi controller node for the StarFive JH7110 SoC. Co-developed-by: Ziv Xu Signed-off-by: Ziv Xu Signed-off-by: William Qiu Reviewed-by: Hal Feng --- .../jh7110-starfive-visionfive-2.dtsi | 32 +++++++++++++++++++ arch/riscv/boot/dts/starfive/jh7110.dtsi | 18 +++++++++++ 2 files changed, 50 insertions(+) diff --git a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi index 2a6d81609284..22212c1150f9 100644 --- a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi @@ -126,6 +126,38 @@ &i2c6 { status = "okay"; }; +&qspi { + #address-cells = <1>; + #size-cells = <0>; + + nor_flash: flash@0 { + compatible = "jedec,spi-nor"; + reg=<0>; + cdns,read-delay = <5>; + spi-max-frequency = <12000000>; + cdns,tshsl-ns = <1>; + cdns,tsd2d-ns = <1>; + cdns,tchsh-ns = <1>; + cdns,tslch-ns = <1>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + spl@0 { + reg = <0x0 0x20000>; + }; + uboot@100000 { + reg = <0x100000 0x300000>; + }; + data@f00000 { + reg = <0xf00000 0x100000>; + }; + }; + }; +}; + &sysgpio { i2c0_pins: i2c0-0 { i2c-pins { diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi index 4c5fdb905da8..0b24f9e66e67 100644 --- a/arch/riscv/boot/dts/starfive/jh7110.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi @@ -440,6 +440,24 @@ i2c6: i2c@12060000 { status = "disabled"; }; + qspi: spi@13010000 { + compatible = "starfive,jh7110-qspi", "cdns,qspi-nor"; + reg = <0x0 0x13010000 0x0 0x10000 + 0x0 0x21000000 0x0 0x400000>; + interrupts = <25>; + clocks = <&syscrg JH7110_SYSCLK_QSPI_REF>, + <&syscrg JH7110_SYSCLK_QSPI_AHB>, + <&syscrg JH7110_SYSCLK_QSPI_APB>; + clock-names = "ref", "ahb", "apb"; + resets = <&syscrg JH7110_SYSRST_QSPI_APB>, + <&syscrg JH7110_SYSRST_QSPI_AHB>, + <&syscrg JH7110_SYSRST_QSPI_REF>; + reset-names = "qspi", "qspi-ocp", "rstc_ref"; + cdns,fifo-depth = <256>; + cdns,fifo-width = <4>; + cdns,trigger-address = <0x0>; + }; + syscrg: clock-controller@13020000 { compatible = "starfive,jh7110-syscrg"; reg = <0x0 0x13020000 0x0 0x10000>;