From patchwork Thu Jan 16 23:21:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 13942468 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 A55BEC02183 for ; Thu, 16 Jan 2025 23:24:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=7PJS6kM+DJ2GGwqhWw1shA8+yZPnGkjZF8pz2SUSzfI=; b=v025CuElX6ypXPg8MtoMhmp1cF IuqxZE1fPc5znpiqs675lpm60BL2LB9zW3RJvbAiN7ClEjAY0wsQpPEruF21F6CLcS8usMB10Q9X6 Sbtr9pcZEQEIg3YONGwTx5BVDHFEE5eyNOnI0Xvg9agXFMdIBVVjarKBMiZFm7UAQHan8NikbKS88 IZXVmagaC4l9WrOet/K3Gddb8hMWLTLK6+nkcPTJHAW1zyNxKAoF7ar1c4ilJamFqYHA/Yc2Zta5B T1UvxqE7WMp4L5+lKVFPneXDWOELgo25Vkhe+tREOywy4InXwZ3mix+iOwo6/BngoiP6FtyQdgPi/ jAYY4Jtw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tYZDb-0000000GQ7O-1f7q; Thu, 16 Jan 2025 23:24:07 +0000 Received: from out-188.mta1.migadu.com ([2001:41d0:203:375::bc]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tYZB7-0000000GOxp-3402 for linux-arm-kernel@lists.infradead.org; Thu, 16 Jan 2025 23:21:35 +0000 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1737069691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7PJS6kM+DJ2GGwqhWw1shA8+yZPnGkjZF8pz2SUSzfI=; b=uZ29omjNcU4UbYfhIsF0VAP9GJd018ZmYttfHmmZNzR1FIOC3X6U+Ii7BkAzAI1EUTCAJW MCcAyP7yvKL6rQ6AjEcLJNvDpRI0AdQQF4CEnS9BddjgAETgDn5wrADuaE/4/xCo51+h7P nBy/dHyVn8tBKSr5Tgr/U6a/Hru5OxM= From: Sean Anderson To: Mark Brown , Michal Simek , linux-spi@vger.kernel.org Cc: Jinjie Ruan , linux-arm-kernel@lists.infradead.org, Amit Kumar Mahapatra , linux-kernel@vger.kernel.org, Miquel Raynal , Sean Anderson , Conor Dooley , Krzysztof Kozlowski , Rob Herring , devicetree@vger.kernel.org Subject: [PATCH 1/7] dt-bindings: spi: zynqmp-qspi: Split the bus Date: Thu, 16 Jan 2025 18:21:11 -0500 Message-Id: <20250116232118.2694169-2-sean.anderson@linux.dev> In-Reply-To: <20250116232118.2694169-1-sean.anderson@linux.dev> References: <20250116232118.2694169-1-sean.anderson@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250116_152133_906435_6BF7778C X-CRM114-Status: GOOD ( 10.53 ) 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 This device supports two separate SPI busses: "lower" (SPI0) and "upper" (SPI1). Each SPI bus has separate clock and data lines, as well as a hardware-controlled chip select. The current binding does not model this situation. It exposes one bus, where CS 0 uses the lower bus and the lower chip select, and CS 1 uses the upper bus and the upper chip select. It is not possible to use the upper chip select with the lower bus (or vice versa). GPIO chip selects are unsupported, and there would be no way to specify which bus to use if they were. Split the "merged" bus into an upper and lower bus, each with their own subnodes. Signed-off-by: Sean Anderson Signed-off-by: David Lechner --- .../bindings/spi/spi-zynqmp-qspi.yaml | 43 +++++++++++++++++-- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/spi/spi-zynqmp-qspi.yaml b/Documentation/devicetree/bindings/spi/spi-zynqmp-qspi.yaml index 901e15fcce2d..12c547c4f1ba 100644 --- a/Documentation/devicetree/bindings/spi/spi-zynqmp-qspi.yaml +++ b/Documentation/devicetree/bindings/spi/spi-zynqmp-qspi.yaml @@ -39,6 +39,18 @@ properties: resets: maxItems: 1 + spi-lower: + type: object + $ref: spi-controller.yaml# + unevaluatedProperties: false + description: The "lower" bus (SPI0). On the ZynqMP this uses MIO pins 0-5. + + spi-upper: + type: object + $ref: spi-controller.yaml# + unevaluatedProperties: false + description: The "upper" bus (SPI1). On the ZynqMP this uses MIO pins 7-12. + required: - compatible - reg @@ -50,8 +62,6 @@ required: unevaluatedProperties: false allOf: - - $ref: spi-controller.yaml# - - if: properties: compatible: @@ -75,7 +85,7 @@ examples: #address-cells = <2>; #size-cells = <2>; - qspi: spi@ff0f0000 { + qspi: spi-controller@ff0f0000 { compatible = "xlnx,zynqmp-qspi-1.0"; clocks = <&zynqmp_clk QSPI_REF>, <&zynqmp_clk LPD_LSBUS>; clock-names = "ref_clk", "pclk"; @@ -84,5 +94,32 @@ examples: resets = <&zynqmp_reset ZYNQMP_RESET_QSPI>; reg = <0x0 0xff0f0000 0x0 0x1000>, <0x0 0xc0000000 0x0 0x8000000>; + + spi-lower { + #address-cells = <1>; + #size-cells = <0>; + num-cs = <2>; + cs-gpios = <0>, <&gpio 5>; + + flash@0 { + reg = <0>; + compatible = "jedec,spi-nor"; + }; + + flash@1 { + reg = <1>; + compatible = "jedec,spi-nor"; + }; + }; + + spi-upper { + #address-cells = <1>; + #size-cells = <0>; + + flash@0 { + reg = <0>; + compatible = "jedec,spi-nor"; + }; + }; }; }; From patchwork Thu Jan 16 23:21:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 13942675 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 B193CC02183 for ; Thu, 16 Jan 2025 23:30:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=f3kAvIiPvuDbscly1USvzOsklcOMjk05ZoOBm2Yut2w=; b=EojkAbV0/TXRoXZQrPNi7bo2Ne O46XS01LzXhVxVoJ1vDB9NFydiWC/R99uMi+eDCRt3krdoJtQNmLYhpkv3g8kCB3Lf8668+xEScAC Ex/NebxdzuoaK0i84MB3h+vjlpxjoYM6BY7vo1AwFedIqJ19Z5LTgN4P2AjFwpqOVmbjY3anLIvEt RBJlUdy4MpUPBE0PEmRvn5cOiZ8mBzI8QmKpnJ/YZwT2cgkYsteeUj/GQaGTPHtPIunLqN/N74MDq 6uj/CYAu7dgr8TRu6yPuccpQ6+1RZP3py2xhRWf6KIYkAD+tFaqfh4yY6SyDLS6gJz1IjdzDLoZf1 7YYHqjqw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tYZJp-0000000GTHO-2yTS; Thu, 16 Jan 2025 23:30:33 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tYZBR-0000000GP8d-1gPd for linux-arm-kernel@bombadil.infradead.org; Thu, 16 Jan 2025 23:21:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=f3kAvIiPvuDbscly1USvzOsklcOMjk05ZoOBm2Yut2w=; b=D/cim++ARxUyB7emLE2li+4UwF ADujawxbBPJLXSDy+OCNId43ozIeFK/vxOCN5TPB48gRJNRGGEsBQ34SswZfXATDuOoxeBLntXOeF DlUCO3CgSPYNITS52Oa/wPMcguWJ7EM+C7lF2MWbt/PtOz5IQ2eT6qy+uxlRHFeAdV3AFZq6bS6te 1YUCoTJOe1kdvj8/lAqGj8Uc0YU9f6WL9VL61hjFuihFDu8Q2qaxZIid3q0kaBm9lm2jg2Mcra+Uv cwHzXv2ziOID/AISWyvIUnLOf1hHnkk5/VhKgON07XEmdkATh6A93TrskSlv2eTzOuzaBV4sOh9zy pRq9zdqA==; Received: from out-189.mta1.migadu.com ([2001:41d0:203:375::bd]) by desiato.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tYZBL-0000000BKbm-3yM1 for linux-arm-kernel@lists.infradead.org; Thu, 16 Jan 2025 23:21:52 +0000 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1737069692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=f3kAvIiPvuDbscly1USvzOsklcOMjk05ZoOBm2Yut2w=; b=OZHlBT2EInsgKHaSkHw4Zp/mu/U8KYfBsgR4roeno+oDlFuiQYLIY+Noe2l/rde4Wuidmb bL9U8Dq/8IkbRrP3mXDLK1JcJyKPvpqyhSkeg0dUGrVOwPBgNw7k8EJp91Q6LVN+uVG91h of0+hZ4S9RHUXh/QZ+BL20EnQoVPhQ4= From: Sean Anderson To: Mark Brown , Michal Simek , linux-spi@vger.kernel.org Cc: Jinjie Ruan , linux-arm-kernel@lists.infradead.org, Amit Kumar Mahapatra , linux-kernel@vger.kernel.org, Miquel Raynal , Sean Anderson Subject: [PATCH 2/7] spi: zynqmp-gqspi: Pass speed/mode directly to config_op Date: Thu, 16 Jan 2025 18:21:12 -0500 Message-Id: <20250116232118.2694169-3-sean.anderson@linux.dev> In-Reply-To: <20250116232118.2694169-1-sean.anderson@linux.dev> References: <20250116232118.2694169-1-sean.anderson@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250116_232150_370964_F6EF17CB X-CRM114-Status: GOOD ( 11.04 ) 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 In preparation for supporting transfer_one, which supplies the speed from the spi_transfer instead of the spi_device, convert config_op to take the speed and mode directly. Signed-off-by: Sean Anderson --- drivers/spi/spi-zynqmp-gqspi.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/spi/spi-zynqmp-gqspi.c b/drivers/spi/spi-zynqmp-gqspi.c index 95eea7d75f71..ba12adec8632 100644 --- a/drivers/spi/spi-zynqmp-gqspi.c +++ b/drivers/spi/spi-zynqmp-gqspi.c @@ -545,8 +545,8 @@ static inline u32 zynqmp_qspi_selectspimode(struct zynqmp_qspi *xqspi, /** * zynqmp_qspi_config_op - Configure QSPI controller for specified * transfer - * @xqspi: Pointer to the zynqmp_qspi structure - * @qspi: Pointer to the spi_device structure + * @xqspi: Pointer to the zynqmp_qspi structure + * @req_speed_hz: Requested frequency * * Sets the operational mode of QSPI controller for the next QSPI transfer and * sets the requested clock frequency. @@ -563,13 +563,10 @@ static inline u32 zynqmp_qspi_selectspimode(struct zynqmp_qspi *xqspi, * by the QSPI controller the driver will set the highest or lowest * frequency supported by controller. */ -static int zynqmp_qspi_config_op(struct zynqmp_qspi *xqspi, - struct spi_device *qspi) +static int zynqmp_qspi_config_op(struct zynqmp_qspi *xqspi, u32 req_speed_hz) { ulong clk_rate; - u32 config_reg, req_speed_hz, baud_rate_val = 0; - - req_speed_hz = qspi->max_speed_hz; + u32 config_reg, baud_rate_val = 0; if (xqspi->speed_hz != req_speed_hz) { xqspi->speed_hz = req_speed_hz; @@ -1094,7 +1091,7 @@ static int zynqmp_qspi_exec_op(struct spi_mem *mem, op->dummy.buswidth, op->data.buswidth); mutex_lock(&xqspi->op_lock); - zynqmp_qspi_config_op(xqspi, mem->spi); + zynqmp_qspi_config_op(xqspi, mem->spi->max_speed_hz); zynqmp_qspi_chipselect(mem->spi, false); genfifoentry |= xqspi->genfifocs; genfifoentry |= xqspi->genfifobus; From patchwork Thu Jan 16 23:21:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 13942534 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 4496AC02187 for ; Thu, 16 Jan 2025 23:25:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=tR7y50rU9pbEgmCCWcpvtHmGNRcuzBMssivVLFdASTM=; b=gSmyXM3V7z0isjsN74A51SP2/9 OCHm1HxEwfEE+R1h3CTFKCRYnFfB8eeeTOMaMTwP3rb5g2pqWUqxfPCLZ2ZC+SQGULez7TmULjZ92 qaEATtBtK5c5uLv5Ahs3mog3HyBKzAj9VmaoCXoRmdKLp1wpb3JkF94bczYMhQrOBvI0rgAR2mZsC quLHz7b+935TRg/2l+cJ27d9VGYeEPB1w1W32i86jWGDvT9nWMkKrtoWWtwZTZgZwBhAmvyT+KmFg gKU23fQH5E74nEqwnt8E89VqPaMrF7jzJeiw2myDAsY1CrCg67yfM3QS0Qv174tQRe+gaf5rv74PP r0+eThWQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tYZEr-0000000GQde-08uD; Thu, 16 Jan 2025 23:25:25 +0000 Received: from out-179.mta1.migadu.com ([95.215.58.179]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tYZBA-0000000GOz8-0khG for linux-arm-kernel@lists.infradead.org; Thu, 16 Jan 2025 23:21:37 +0000 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1737069694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tR7y50rU9pbEgmCCWcpvtHmGNRcuzBMssivVLFdASTM=; b=Jh8CpEMOdwgu6Pnxq6Tet2VsuOjmAyePO/p+VNLWKjABgzvL3GoB5J3dnw7d+pGa15dY7k S5bmlvFxriK1IFnsBAEETSMU66FWKCV5JGzYlVxaZm6Wm0r/gAyWaPfX387I8VOl3zrlj3 v0NQ8XVoezZsntJrgtUCD6hgn6XMByw= From: Sean Anderson To: Mark Brown , Michal Simek , linux-spi@vger.kernel.org Cc: Jinjie Ruan , linux-arm-kernel@lists.infradead.org, Amit Kumar Mahapatra , linux-kernel@vger.kernel.org, Miquel Raynal , Sean Anderson Subject: [PATCH 3/7] spi: zynqmp-gqspi: Configure SPI mode dynamically Date: Thu, 16 Jan 2025 18:21:13 -0500 Message-Id: <20250116232118.2694169-4-sean.anderson@linux.dev> In-Reply-To: <20250116232118.2694169-1-sean.anderson@linux.dev> References: <20250116232118.2694169-1-sean.anderson@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250116_152136_370683_51E34A14 X-CRM114-Status: GOOD ( 11.88 ) 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 The SPI mode (phase /polarity) can change between spi_transfers. In preparation for transfer_one support, program the SPI mode on every operation instead of once during init. Signed-off-by: Sean Anderson --- drivers/spi/spi-zynqmp-gqspi.c | 43 +++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/drivers/spi/spi-zynqmp-gqspi.c b/drivers/spi/spi-zynqmp-gqspi.c index ba12adec8632..a1233897dc88 100644 --- a/drivers/spi/spi-zynqmp-gqspi.c +++ b/drivers/spi/spi-zynqmp-gqspi.c @@ -186,7 +186,8 @@ struct qspi_platform_data { * @mode: Defines the mode in which QSPI is operating * @data_completion: completion structure * @op_lock: Operational lock - * @speed_hz: Current SPI bus clock speed in hz + * @speed_hz: Current SPI bus clock speed in hz + * @spi_mode: Current SPI bus mode * @has_tapdelay: Used for tapdelay register available in qspi */ struct zynqmp_qspi { @@ -210,6 +211,7 @@ struct zynqmp_qspi { struct completion data_completion; struct mutex op_lock; u32 speed_hz; + u32 spi_mode; bool has_tapdelay; }; @@ -397,16 +399,11 @@ static int zynqmp_qspi_init_hw(struct zynqmp_qspi *xqspi) config_reg |= GQSPI_CFG_WP_HOLD_MASK; /* Clear pre-scalar by default */ config_reg &= ~GQSPI_CFG_BAUD_RATE_DIV_MASK; - /* Set CPHA */ - if (xqspi->ctlr->mode_bits & SPI_CPHA) - config_reg |= GQSPI_CFG_CLK_PHA_MASK; - else - config_reg &= ~GQSPI_CFG_CLK_PHA_MASK; - /* Set CPOL */ - if (xqspi->ctlr->mode_bits & SPI_CPOL) - config_reg |= GQSPI_CFG_CLK_POL_MASK; - else - config_reg &= ~GQSPI_CFG_CLK_POL_MASK; + + /* Set default mode */ + xqspi->spi_mode = SPI_MODE_3; + config_reg |= GQSPI_CFG_CLK_PHA_MASK; + config_reg |= GQSPI_CFG_CLK_POL_MASK; /* Set the clock frequency */ clk_rate = clk_get_rate(xqspi->refclk); @@ -547,6 +544,7 @@ static inline u32 zynqmp_qspi_selectspimode(struct zynqmp_qspi *xqspi, * transfer * @xqspi: Pointer to the zynqmp_qspi structure * @req_speed_hz: Requested frequency + * @mode: Requested SPI mode * * Sets the operational mode of QSPI controller for the next QSPI transfer and * sets the requested clock frequency. @@ -563,7 +561,8 @@ static inline u32 zynqmp_qspi_selectspimode(struct zynqmp_qspi *xqspi, * by the QSPI controller the driver will set the highest or lowest * frequency supported by controller. */ -static int zynqmp_qspi_config_op(struct zynqmp_qspi *xqspi, u32 req_speed_hz) +static int zynqmp_qspi_config_op(struct zynqmp_qspi *xqspi, u32 req_speed_hz, + u32 mode) { ulong clk_rate; u32 config_reg, baud_rate_val = 0; @@ -589,7 +588,23 @@ static int zynqmp_qspi_config_op(struct zynqmp_qspi *xqspi, u32 req_speed_hz) zynqmp_qspi_set_tapdelay(xqspi, baud_rate_val); } - dev_dbg(xqspi->dev, "config speed %u\n", req_speed_hz); + mode &= SPI_MODE_X_MASK; + if (xqspi->spi_mode != mode) { + xqspi->spi_mode = mode; + + config_reg = zynqmp_gqspi_read(xqspi, GQSPI_CONFIG_OFST); + if (mode & SPI_CPHA) + config_reg |= GQSPI_CFG_CLK_PHA_MASK; + else + config_reg &= ~GQSPI_CFG_CLK_PHA_MASK; + if (mode & SPI_CPOL) + config_reg |= GQSPI_CFG_CLK_POL_MASK; + else + config_reg &= ~GQSPI_CFG_CLK_POL_MASK; + zynqmp_gqspi_write(xqspi, GQSPI_CONFIG_OFST, config_reg); + } + + dev_dbg(xqspi->dev, "config speed %u mode %x\n", req_speed_hz, mode); return 0; } @@ -1091,7 +1106,7 @@ static int zynqmp_qspi_exec_op(struct spi_mem *mem, op->dummy.buswidth, op->data.buswidth); mutex_lock(&xqspi->op_lock); - zynqmp_qspi_config_op(xqspi, mem->spi->max_speed_hz); + zynqmp_qspi_config_op(xqspi, mem->spi->max_speed_hz, mem->spi->mode); zynqmp_qspi_chipselect(mem->spi, false); genfifoentry |= xqspi->genfifocs; genfifoentry |= xqspi->genfifobus; From patchwork Thu Jan 16 23:21:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 13942535 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 6E016C02183 for ; Thu, 16 Jan 2025 23:26:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=fStIbrCOb/5ColUxilUsQxP712qLdfKYYHDEiYij27w=; b=LKQ2joCTtuQbeg23XRAGEiY+VO EGHOC6iwak87dLNQjTp9SzdO0Y3d2qtrKnmd4oarRZyoygp56XeLuCFnrfS17jgVIJU9hWm6RSuG8 sjqIoIsdd/EoE0nTsSRiLM4jXq2icMiZ8Rz3PXJgaFViam4yGM9VAeHsIHE9puabEaOvPAA3Ehg9o BBvpbFQg2PsnMaKvM3tdkscqatI8hg4gULKLMu6N6Jo9yR9Y+GZTx51LZycbl9mAKW6J16mnngLLq fltt29jXJA4p8ij5lMWsbSwSbOwKr58CXmMiscXm91DeByr29/be+8EfOF1EHnaA6Lk59+LtPZryM CC5eZeAQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tYZG5-0000000GRBY-2hWu; Thu, 16 Jan 2025 23:26:41 +0000 Received: from out-185.mta1.migadu.com ([95.215.58.185]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tYZBC-0000000GP00-0ULW for linux-arm-kernel@lists.infradead.org; Thu, 16 Jan 2025 23:21:39 +0000 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1737069696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fStIbrCOb/5ColUxilUsQxP712qLdfKYYHDEiYij27w=; b=ThjwuswfDNPcj2UE4dP0vdjjWbWAYcdXs2jMVU1jT+42ZK8CguBj+r51yWDkZtt6SNPocY uq6JTjleQaOmNDEM6GilRXNXu+lpqzziHkkZ0CRwOPmgLqGihk+FvJxlzmrBqqURYVM9n5 9TXbQ2KWJ39SCpmjBnJ0f7UclKrYQso= From: Sean Anderson To: Mark Brown , Michal Simek , linux-spi@vger.kernel.org Cc: Jinjie Ruan , linux-arm-kernel@lists.infradead.org, Amit Kumar Mahapatra , linux-kernel@vger.kernel.org, Miquel Raynal , Sean Anderson Subject: [PATCH 4/7] spi: zynqmp-gqspi: Refactor out controller initialization Date: Thu, 16 Jan 2025 18:21:14 -0500 Message-Id: <20250116232118.2694169-5-sean.anderson@linux.dev> In-Reply-To: <20250116232118.2694169-1-sean.anderson@linux.dev> References: <20250116232118.2694169-1-sean.anderson@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250116_152138_303011_D886757B X-CRM114-Status: GOOD ( 12.45 ) 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 In preparation for having multiple SPI busses, refactor out the controller initialization into a separate function. No functional change intended. Signed-off-by: Sean Anderson --- drivers/spi/spi-zynqmp-gqspi.c | 42 +++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/drivers/spi/spi-zynqmp-gqspi.c b/drivers/spi/spi-zynqmp-gqspi.c index a1233897dc88..d78e114e17e0 100644 --- a/drivers/spi/spi-zynqmp-gqspi.c +++ b/drivers/spi/spi-zynqmp-gqspi.c @@ -1253,6 +1253,29 @@ static const struct spi_controller_mem_ops zynqmp_qspi_mem_ops = { .exec_op = zynqmp_qspi_exec_op, }; +static int zynqmp_qspi_register_ctlr(struct zynqmp_qspi *xqspi, + struct spi_controller *ctlr) +{ + int ret; + + if (!ctlr) + return 0; + + ctlr->mode_bits = SPI_CPOL | SPI_CPHA | SPI_RX_DUAL | SPI_RX_QUAD | + SPI_TX_DUAL | SPI_TX_QUAD; + ctlr->max_speed_hz = xqspi->speed_hz; + ctlr->bits_per_word_mask = SPI_BPW_MASK(8); + ctlr->mem_ops = &zynqmp_qspi_mem_ops; + ctlr->setup = zynqmp_qspi_setup_op; + ctlr->auto_runtime_pm = true; + + ret = devm_spi_register_controller(xqspi->dev, ctlr); + if (ret) + dev_err_probe(xqspi->dev, ret, "could not register %pOF\n", + ctlr->dev.of_node); + return ret; +} + /** * zynqmp_qspi_probe - Probe method for the QSPI driver * @pdev: Pointer to the platform_device structure @@ -1329,12 +1352,8 @@ static int zynqmp_qspi_probe(struct platform_device *pdev) goto clk_dis_all; } - ctlr->mode_bits = SPI_CPOL | SPI_CPHA | SPI_RX_DUAL | SPI_RX_QUAD | - SPI_TX_DUAL | SPI_TX_QUAD; - ctlr->max_speed_hz = clk_get_rate(xqspi->refclk) / 2; - xqspi->speed_hz = ctlr->max_speed_hz; - /* QSPI controller initializations */ + xqspi->speed_hz = clk_get_rate(xqspi->refclk) / 2; ret = zynqmp_qspi_init_hw(xqspi); if (ret) goto clk_dis_all; @@ -1368,18 +1387,9 @@ static int zynqmp_qspi_probe(struct platform_device *pdev) ctlr->num_chipselect = num_cs; } - ctlr->bits_per_word_mask = SPI_BPW_MASK(8); - ctlr->mem_ops = &zynqmp_qspi_mem_ops; - ctlr->setup = zynqmp_qspi_setup_op; - ctlr->bits_per_word_mask = SPI_BPW_MASK(8); - ctlr->dev.of_node = np; - ctlr->auto_runtime_pm = true; - - ret = devm_spi_register_controller(&pdev->dev, ctlr); - if (ret) { - dev_err(&pdev->dev, "spi_register_controller failed\n"); + ret = zynqmp_qspi_register_ctlr(xqspi, ctlr); + if (ret) goto clk_dis_all; - } pm_runtime_mark_last_busy(&pdev->dev); pm_runtime_put_autosuspend(&pdev->dev); From patchwork Thu Jan 16 23:21:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 13942676 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 5D573C02187 for ; Thu, 16 Jan 2025 23:32:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=WWociCl4bVfAjOOY4p6sldW8VifVxjxPHAFfPT85y74=; b=WtxMHIj5AxLt69nya2k+GJouKC 1Wvbg5OTJWfd/wB/AMqw6t14KDrUnxZFkOgyp/Wmtqa+IF5qRz6nlcYYKbXMJUjcHRcvrwZKDAINS ZhHlxNoPdgW0VDSI+jMB+ymAQQXQd6tiGDbSL+D7aYRDfrKZqvIQx6IIbXym4IL6uPo0szr9dyQ8A d0GYo4PG5x1DuxbxLHkzmJ2zvOaa0PqolqJ/kf/K36KWkLVPfeISaLGTV//6G6eu+ajkN89BVFHNR uIGrPxIdnrp0AnpNmWhkZwMQODnLiAknLv/BAUUOPVTh4yItZU2zOxYQafiAoIHc/kQPTy1SB8Kok LrNyqoFQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tYZL5-0000000GU8V-1VKU; Thu, 16 Jan 2025 23:31:51 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tYZBR-0000000GP8b-1glN for linux-arm-kernel@bombadil.infradead.org; Thu, 16 Jan 2025 23:21:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=WWociCl4bVfAjOOY4p6sldW8VifVxjxPHAFfPT85y74=; b=h4SCZeewJtv8dyUdKZaKPCPy+s lhjPtcBNQ5BvSTj7R6Ik4CETq8Le/5HK/GfzECs7/X62+mksynFyxJ8zcQ50wnWWDIiYPO4kWl2Lf CLaNuuoruVuJEtLoWMmUQM+19XDI6xhAwNUtofikawTcRms/EwVGbtCmnocwZPGBnteaRDxuANq83 SYEn2RXMEP3YZF9vuQh93BDtin+wAl8ojgKECIqpxHQX7LuXi1NATef4KUO1IiL3Zm+rcmRQwwxAn UE8fftkDPO4hBSknitzpZ4914pikRTkrF2AQpIPcHTa3qEApqZQvaAFhx4WNw6ZFPDuT+UVj82goA zOtQrrfA==; Received: from out-181.mta1.migadu.com ([95.215.58.181]) by desiato.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tYZBM-0000000BKbo-25bI for linux-arm-kernel@lists.infradead.org; Thu, 16 Jan 2025 23:21:52 +0000 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1737069698; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WWociCl4bVfAjOOY4p6sldW8VifVxjxPHAFfPT85y74=; b=tcPnw3UZ2J0b92pJLokBFDODxVsw+0vMfWPLiEUFE/LQfXGgrs6i2KG+8BMGu944i4IN+o mKC1M9buWhD5qpqjnHr3cpn7qWHk30w+dDUDcqt+HLBrA957RXEg52OLynMam0eA6SS8Xt mOz4colEOoTkvmPXElTMNtUXrAzz7t8= From: Sean Anderson To: Mark Brown , Michal Simek , linux-spi@vger.kernel.org Cc: Jinjie Ruan , linux-arm-kernel@lists.infradead.org, Amit Kumar Mahapatra , linux-kernel@vger.kernel.org, Miquel Raynal , Sean Anderson Subject: [PATCH 5/7] spi: zynqmp-gqspi: Split the bus Date: Thu, 16 Jan 2025 18:21:15 -0500 Message-Id: <20250116232118.2694169-6-sean.anderson@linux.dev> In-Reply-To: <20250116232118.2694169-1-sean.anderson@linux.dev> References: <20250116232118.2694169-1-sean.anderson@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250116_232150_238928_BF32D317 X-CRM114-Status: GOOD ( 24.12 ) 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 This device supports two separate SPI busses: "lower" (SPI0) and "upper" (SPI1). Each SPI bus has separate clock and data lines, as well as a hardware-controlled chip select. The busses may be driven independently, with only one bus active at a time, or in concert, with both busses active. If both busses are driven at once, data may either be duplicated on each bus or striped (bitwise) across both busses. The current driver does not model this situation. It exposes one bus, where CS 0 uses the lower bus and the lower chip select, and CS 1 uses the upper bus and the upper chip select. It is not possible to use the upper chip select with the lower bus (or vice versa). GPIO chip selects are unsupported, and there would be no way to specify which bus to use if they were. To conserve pins, designers may wish to place multiple devices on a single SPI bus. Add support for this by splitting the "merged" bus into an upper and lower bus. Each bus uses a separate devicetree node and has a single native chipselect 0. If "lower" and "upper" nodes are absent from the devicetree, we register the merged bus instead, which maintains the current behavior. Signed-off-by: Sean Anderson --- drivers/spi/spi-zynqmp-gqspi.c | 155 ++++++++++++++++++++++++++------- 1 file changed, 125 insertions(+), 30 deletions(-) diff --git a/drivers/spi/spi-zynqmp-gqspi.c b/drivers/spi/spi-zynqmp-gqspi.c index d78e114e17e0..9823d710c4d6 100644 --- a/drivers/spi/spi-zynqmp-gqspi.c +++ b/drivers/spi/spi-zynqmp-gqspi.c @@ -167,6 +167,10 @@ struct qspi_platform_data { /** * struct zynqmp_qspi - Defines qspi driver instance + * @lower Pointer to "lower" SPI bus + * @upper Pointer to "upper" SPI bus + * @merged Pointer to legacy SPI bus which is a combination of + * @lower and @upper * @ctlr: Pointer to the spi controller information * @regs: Virtual address of the QSPI controller registers * @refclk: Pointer to the peripheral clock @@ -191,7 +195,7 @@ struct qspi_platform_data { * @has_tapdelay: Used for tapdelay register available in qspi */ struct zynqmp_qspi { - struct spi_controller *ctlr; + struct spi_controller *lower, *upper, *merged; void __iomem *regs; struct clk *refclk; struct clk *pclk; @@ -467,20 +471,33 @@ static void zynqmp_qspi_copy_read_data(struct zynqmp_qspi *xqspi, */ static void zynqmp_qspi_chipselect(struct spi_device *qspi, bool is_high) { - struct zynqmp_qspi *xqspi = spi_controller_get_devdata(qspi->controller); + struct spi_controller *ctlr = qspi->controller; + struct zynqmp_qspi *xqspi = spi_controller_get_devdata(ctlr); ulong timeout; u32 genfifoentry = 0, statusreg; genfifoentry |= GQSPI_GENFIFO_MODE_SPI; if (!is_high) { - if (!spi_get_chipselect(qspi, 0)) { - xqspi->genfifobus = GQSPI_GENFIFO_BUS_LOWER; - xqspi->genfifocs = GQSPI_GENFIFO_CS_LOWER; + bool upper; + + if (ctlr == xqspi->lower) { + upper = false; + } else if (ctlr == xqspi->upper) { + upper = true; } else { + WARN_ON_ONCE(ctlr != xqspi->merged); + upper = spi_get_chipselect(qspi, 0); + } + + if (upper) { xqspi->genfifobus = GQSPI_GENFIFO_BUS_UPPER; xqspi->genfifocs = GQSPI_GENFIFO_CS_UPPER; + } else { + xqspi->genfifobus = GQSPI_GENFIFO_BUS_LOWER; + xqspi->genfifocs = GQSPI_GENFIFO_CS_LOWER; } + genfifoentry |= xqspi->genfifobus; genfifoentry |= xqspi->genfifocs; genfifoentry |= GQSPI_GENFIFO_CS_SETUP; @@ -962,12 +979,28 @@ static int zynqmp_qspi_read_op(struct zynqmp_qspi *xqspi, u8 rx_nbits, static int __maybe_unused zynqmp_qspi_suspend(struct device *dev) { struct zynqmp_qspi *xqspi = dev_get_drvdata(dev); - struct spi_controller *ctlr = xqspi->ctlr; int ret; - ret = spi_controller_suspend(ctlr); - if (ret) - return ret; + if (xqspi->merged) { + ret = spi_controller_suspend(xqspi->merged); + if (ret) + return ret; + } else { + if (xqspi->lower) { + ret = spi_controller_suspend(xqspi->lower); + if (ret) + return ret; + } + + if (xqspi->upper) { + ret = spi_controller_suspend(xqspi->upper); + if (ret) { + if (xqspi->lower) + spi_controller_resume(xqspi->lower); + return ret; + } + } + } zynqmp_gqspi_write(xqspi, GQSPI_EN_OFST, 0x0); @@ -986,13 +1019,18 @@ static int __maybe_unused zynqmp_qspi_suspend(struct device *dev) static int __maybe_unused zynqmp_qspi_resume(struct device *dev) { struct zynqmp_qspi *xqspi = dev_get_drvdata(dev); - struct spi_controller *ctlr = xqspi->ctlr; + int ret = 0; zynqmp_gqspi_write(xqspi, GQSPI_EN_OFST, GQSPI_EN_MASK); - spi_controller_resume(ctlr); + if (xqspi->merged) + ret = spi_controller_resume(xqspi->merged); + if (xqspi->lower) + ret = spi_controller_resume(xqspi->lower) ?: ret; + if (xqspi->upper) + ret = spi_controller_resume(xqspi->upper) ?: ret; - return 0; + return ret; } /** @@ -1253,6 +1291,41 @@ static const struct spi_controller_mem_ops zynqmp_qspi_mem_ops = { .exec_op = zynqmp_qspi_exec_op, }; +static void zynqmp_qspi_release_node(void *of_node) +{ + of_node_put(of_node); +} + +static struct spi_controller * +zynqmp_qspi_alloc_split(struct zynqmp_qspi *xqspi, const char *name) +{ + struct spi_controller *ctlr; + struct device_node *np; + u32 num_cs; + int err; + + np = of_get_child_by_name(xqspi->dev->of_node, name); + if (!np) + return NULL; + + err = devm_add_action_or_reset(xqspi->dev, zynqmp_qspi_release_node, + np); + if (err) + return ERR_PTR(err); + + ctlr = devm_spi_alloc_host(xqspi->dev, 0); + if (!ctlr) + return ERR_PTR(-ENOMEM); + + ctlr->dev.of_node = np; + if (of_property_read_u32(np, "num-cs", &num_cs)) + ctlr->num_chipselect = GQSPI_DEFAULT_NUM_CS; + else + ctlr->num_chipselect = num_cs; + + return ctlr; +} + static int zynqmp_qspi_register_ctlr(struct zynqmp_qspi *xqspi, struct spi_controller *ctlr) { @@ -1261,6 +1334,7 @@ static int zynqmp_qspi_register_ctlr(struct zynqmp_qspi *xqspi, if (!ctlr) return 0; + spi_controller_set_devdata(ctlr, xqspi); ctlr->mode_bits = SPI_CPOL | SPI_CPHA | SPI_RX_DUAL | SPI_RX_QUAD | SPI_TX_DUAL | SPI_TX_QUAD; ctlr->max_speed_hz = xqspi->speed_hz; @@ -1287,22 +1361,47 @@ static int zynqmp_qspi_register_ctlr(struct zynqmp_qspi *xqspi, static int zynqmp_qspi_probe(struct platform_device *pdev) { int ret = 0; - struct spi_controller *ctlr; struct zynqmp_qspi *xqspi; struct device *dev = &pdev->dev; - struct device_node *np = dev->of_node; - u32 num_cs; const struct qspi_platform_data *p_data; - ctlr = devm_spi_alloc_host(&pdev->dev, sizeof(*xqspi)); - if (!ctlr) + xqspi = devm_kzalloc(dev, sizeof(*xqspi), GFP_KERNEL); + if (!xqspi) return -ENOMEM; - xqspi = spi_controller_get_devdata(ctlr); xqspi->dev = dev; - xqspi->ctlr = ctlr; platform_set_drvdata(pdev, xqspi); + xqspi->lower = zynqmp_qspi_alloc_split(xqspi, "spi-lower"); + if (IS_ERR(xqspi->lower)) + return PTR_ERR(xqspi->lower); + + xqspi->upper = zynqmp_qspi_alloc_split(xqspi, "spi-upper"); + if (IS_ERR(xqspi->upper)) + return PTR_ERR(xqspi->upper); + + if (!xqspi->lower && !xqspi->upper) { + struct spi_controller *ctlr = devm_spi_alloc_host(dev, 0); + u32 num_cs; + + if (!ctlr) + return -ENOMEM; + + ret = of_property_read_u32(dev->of_node, "num-cs", &num_cs); + if (ret < 0) { + ctlr->num_chipselect = GQSPI_DEFAULT_NUM_CS; + } else if (num_cs > GQSPI_MAX_NUM_CS) { + dev_err(dev, "only %d chip selects are available\n", + GQSPI_MAX_NUM_CS); + return -EINVAL; + } else { + ctlr->num_chipselect = num_cs; + } + + ctlr->dev.of_node = dev->of_node; + xqspi->merged = ctlr; + } + p_data = of_device_get_match_data(&pdev->dev); if (p_data && (p_data->quirks & QSPI_QUIRK_HAS_TAPDELAY)) xqspi->has_tapdelay = true; @@ -1375,19 +1474,15 @@ static int zynqmp_qspi_probe(struct platform_device *pdev) if (ret) goto clk_dis_all; - ret = of_property_read_u32(np, "num-cs", &num_cs); - if (ret < 0) { - ctlr->num_chipselect = GQSPI_DEFAULT_NUM_CS; - } else if (num_cs > GQSPI_MAX_NUM_CS) { - ret = -EINVAL; - dev_err(&pdev->dev, "only %d chip selects are available\n", - GQSPI_MAX_NUM_CS); + ret = zynqmp_qspi_register_ctlr(xqspi, xqspi->lower); + if (ret) goto clk_dis_all; - } else { - ctlr->num_chipselect = num_cs; - } - ret = zynqmp_qspi_register_ctlr(xqspi, ctlr); + ret = zynqmp_qspi_register_ctlr(xqspi, xqspi->upper); + if (ret) + goto clk_dis_all; + + ret = zynqmp_qspi_register_ctlr(xqspi, xqspi->merged); if (ret) goto clk_dis_all; From patchwork Thu Jan 16 23:21:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 13942536 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 29BC0C02183 for ; Thu, 16 Jan 2025 23:28:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=iHGW05zMsRoR73u/6yei3oxj4qrZbmDsPW4oXB+eZkU=; b=v7E80EjAHN7zDy9aH9fjlGzsKY LFJ88IVkx2/KWyNKl7/Qa5Zd2WzN3ee80+CBTCOaG38b0IOliXPL3pfI8l7fnPYv6MINKChVSqAiu kZlGwzXIKObhqg+s8TbK7zQm1fhjaTHsD79iFzjc5hLTkhPBCUedB3TtYiY5eDEdnK1sMcD4d9t54 4RFIzTKVudIrcSSAVTIt5MJsMFFOJcRiO4HLxlKjoMuUxl+SxriqCXj6FmxhfLBob0naXKTToK7Mn P3KeP5OIv1DWJH/ie0bvZ4sij9Jw5bvP/pSt9w0bTFl+E7wLrLuB0n1cXnCenRCO3oJGs/yr0C/dT uy3PKynw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tYZHL-0000000GRok-1G6F; Thu, 16 Jan 2025 23:27:59 +0000 Received: from out-177.mta1.migadu.com ([2001:41d0:203:375::b1]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tYZBG-0000000GP2A-2EYo for linux-arm-kernel@lists.infradead.org; Thu, 16 Jan 2025 23:21:43 +0000 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1737069700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iHGW05zMsRoR73u/6yei3oxj4qrZbmDsPW4oXB+eZkU=; b=FC8PcUCx4FLk+kJ5dUK5PmZ4kNCi7FHBtSOZdcTd1NI9Cv+mzt3FYqh/GEDIQAJplr2LTH +CB0MonTZo3qbrYkTjhmYQ+MJi4fEyQvvGxfpkgZDbrZGPv7+x6WldnxUDrN/3AQR2rY+B g9rKRJZXgpZvbq+Te/7nPRvzt3Y89cM= From: Sean Anderson To: Mark Brown , Michal Simek , linux-spi@vger.kernel.org Cc: Jinjie Ruan , linux-arm-kernel@lists.infradead.org, Amit Kumar Mahapatra , linux-kernel@vger.kernel.org, Miquel Raynal , Sean Anderson Subject: [PATCH 6/7] spi: zynqmp-gqspi: Support GPIO chip selects Date: Thu, 16 Jan 2025 18:21:16 -0500 Message-Id: <20250116232118.2694169-7-sean.anderson@linux.dev> In-Reply-To: <20250116232118.2694169-1-sean.anderson@linux.dev> References: <20250116232118.2694169-1-sean.anderson@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250116_152142_859897_4901FFA1 X-CRM114-Status: GOOD ( 13.27 ) 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 GPIO chipselects use the traditional SPU API instead of the SPIMEM API. Implement it with transfer_one and set_cs (for non-GPIO chipselects). At the moment we only support half-duplex transfers, which is good enough to access SPI flashes. Signed-off-by: Sean Anderson --- drivers/spi/spi-zynqmp-gqspi.c | 83 ++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/drivers/spi/spi-zynqmp-gqspi.c b/drivers/spi/spi-zynqmp-gqspi.c index 9823d710c4d6..efd01e06b77a 100644 --- a/drivers/spi/spi-zynqmp-gqspi.c +++ b/drivers/spi/spi-zynqmp-gqspi.c @@ -528,6 +528,15 @@ static void zynqmp_qspi_chipselect(struct spi_device *qspi, bool is_high) dev_err(xqspi->dev, "Chip select timed out\n"); } +static void zynqmp_qspi_set_cs(struct spi_device *qspi, bool is_high) +{ + struct zynqmp_qspi *xqspi = spi_controller_get_devdata(qspi->controller); + + mutex_lock(&xqspi->op_lock); + zynqmp_qspi_chipselect(qspi, is_high); + mutex_unlock(&xqspi->op_lock); +} + /** * zynqmp_qspi_selectspimode - Selects SPI mode - x1 or x2 or x4. * @xqspi: xqspi is a pointer to the GQSPI instance @@ -1271,6 +1280,75 @@ static int zynqmp_qspi_exec_op(struct spi_mem *mem, return err; } +static int zynqmp_qspi_transfer_one(struct spi_controller *ctlr, + struct spi_device *spi, + struct spi_transfer *transfer) +{ + struct zynqmp_qspi *xqspi = spi_controller_get_devdata(ctlr); + unsigned long timeout; + u32 genfifoentry; + u32 mask = 0; + int ret; + + dev_dbg(xqspi->dev, "xfer %u/%u %u\n", transfer->tx_nbits, + transfer->rx_nbits, transfer->len); + + if (transfer->tx_nbits && transfer->rx_nbits) + return -EOPNOTSUPP; + + guard(mutex)(&xqspi->op_lock); + zynqmp_qspi_config_op(xqspi, transfer->speed_hz, spi->mode); + if (spi_get_csgpiod(spi, 0)) { + if (ctlr == xqspi->lower) { + xqspi->genfifobus = GQSPI_GENFIFO_BUS_LOWER; + } else { + WARN_ON_ONCE(ctlr != xqspi->upper); + xqspi->genfifobus = GQSPI_GENFIFO_BUS_UPPER; + } + xqspi->genfifocs = 0; + } + genfifoentry = xqspi->genfifocs | xqspi->genfifobus; + + reinit_completion(&xqspi->data_completion); + if (transfer->tx_nbits) { + xqspi->txbuf = transfer->tx_buf; + xqspi->rxbuf = NULL; + xqspi->bytes_to_transfer = transfer->len; + xqspi->bytes_to_receive = 0; + zynqmp_qspi_write_op(xqspi, transfer->tx_nbits, genfifoentry); + mask = GQSPI_IER_TXEMPTY_MASK | GQSPI_IER_GENFIFOEMPTY_MASK | + GQSPI_IER_TXNOT_FULL_MASK; + timeout = zynqmp_qspi_timeout(xqspi, transfer->tx_nbits, + transfer->len); + } else { + xqspi->txbuf = NULL; + xqspi->rxbuf = transfer->rx_buf; + xqspi->bytes_to_transfer = 0; + xqspi->bytes_to_receive = transfer->len; + ret = zynqmp_qspi_read_op(xqspi, transfer->rx_nbits, + genfifoentry); + if (ret) + return ret; + + if (xqspi->mode != GQSPI_MODE_DMA) + mask = GQSPI_IER_GENFIFOEMPTY_MASK | + GQSPI_IER_RXNEMPTY_MASK | GQSPI_IER_RXEMPTY_MASK; + timeout = zynqmp_qspi_timeout(xqspi, transfer->rx_nbits, + transfer->len); + } + + zynqmp_gqspi_write(xqspi, GQSPI_CONFIG_OFST, + zynqmp_gqspi_read(xqspi, GQSPI_CONFIG_OFST) | + GQSPI_CFG_START_GEN_FIFO_MASK); + if (mask) + zynqmp_gqspi_write(xqspi, GQSPI_IER_OFST, mask); + else + zynqmp_gqspi_write(xqspi, GQSPI_QSPIDMA_DST_I_EN_OFST, + GQSPI_QSPIDMA_DST_I_EN_DONE_MASK); + + return zynqmp_qspi_wait(xqspi, timeout); +} + static const struct dev_pm_ops zynqmp_qspi_dev_pm_ops = { SET_RUNTIME_PM_OPS(zynqmp_runtime_suspend, zynqmp_runtime_resume, NULL) @@ -1318,6 +1396,7 @@ zynqmp_qspi_alloc_split(struct zynqmp_qspi *xqspi, const char *name) return ERR_PTR(-ENOMEM); ctlr->dev.of_node = np; + ctlr->max_native_cs = 1; if (of_property_read_u32(np, "num-cs", &num_cs)) ctlr->num_chipselect = GQSPI_DEFAULT_NUM_CS; else @@ -1337,11 +1416,15 @@ static int zynqmp_qspi_register_ctlr(struct zynqmp_qspi *xqspi, spi_controller_set_devdata(ctlr, xqspi); ctlr->mode_bits = SPI_CPOL | SPI_CPHA | SPI_RX_DUAL | SPI_RX_QUAD | SPI_TX_DUAL | SPI_TX_QUAD; + ctlr->flags = SPI_CONTROLLER_HALF_DUPLEX; ctlr->max_speed_hz = xqspi->speed_hz; ctlr->bits_per_word_mask = SPI_BPW_MASK(8); ctlr->mem_ops = &zynqmp_qspi_mem_ops; ctlr->setup = zynqmp_qspi_setup_op; + ctlr->set_cs = zynqmp_qspi_set_cs; + ctlr->transfer_one = zynqmp_qspi_transfer_one; ctlr->auto_runtime_pm = true; + ctlr->use_gpio_descriptors = true; ret = devm_spi_register_controller(xqspi->dev, ctlr); if (ret) From patchwork Thu Jan 16 23:21:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 13942537 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 56D18C02187 for ; Thu, 16 Jan 2025 23:29:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=6Y9p6ibc/bj3AV8FXwHT1h+AI01HJG79MMwLbgeY3aY=; b=fJxZGXbtmMK2KSShXbm0BHXv9x M1Iy8ZAU2n8/9kCDo9ENZGHeTXPqRuwtkxByjbtVx5Ob91Qedbhr1k60/a3cZRVELLEPDKvm9ZQ6d DZ2nGSrXP4M6Op4BfUEABTkfUs9cND0AvsOS4RkAzVOfkR/mOJQ+GfmjlH7n1kolkc3tUWdnZyq0N 4xWqXJ9GBSriebR4iugshS+Ch4UskNhtoIPmfEJvGoG5yPArpCkjKG/AQjrb0OOVWy2+ct0YmXjbL bEYuzmdh+h2qkXfCOTNb0xpG4V7ERYopNrZCpjR0Wi03YBnEuFgOGJUc8wDKyzsJQDPakEiMWsfyg PO4SFD2g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tYZIa-0000000GSSq-00UO; Thu, 16 Jan 2025 23:29:16 +0000 Received: from out-170.mta1.migadu.com ([2001:41d0:203:375::aa]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tYZBK-0000000GP4H-09DI for linux-arm-kernel@lists.infradead.org; Thu, 16 Jan 2025 23:21:47 +0000 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1737069703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6Y9p6ibc/bj3AV8FXwHT1h+AI01HJG79MMwLbgeY3aY=; b=I5ESkJp7jccj+p7MTg/3SaqOFMdzqlC543kNhuKXyIO5ET2tSkUSKe4SclpJmgArTud0qH rVfVlL921C/RGjRtFB+PYcyrGq5sPHZbegg5CffrVDVyF1PVBsKx2d5Zk19i9Sa6UGtjgy 8xPc/CE0qvORpLcVkAYDDRHzUhMCkZQ= From: Sean Anderson To: Mark Brown , Michal Simek , linux-spi@vger.kernel.org Cc: Jinjie Ruan , linux-arm-kernel@lists.infradead.org, Amit Kumar Mahapatra , linux-kernel@vger.kernel.org, Miquel Raynal , Sean Anderson , Conor Dooley , Krzysztof Kozlowski , Rob Herring , devicetree@vger.kernel.org Subject: [PATCH 7/7] ARM64: xilinx: zynqmp: Convert to split QSPI bus Date: Thu, 16 Jan 2025 18:21:17 -0500 Message-Id: <20250116232118.2694169-8-sean.anderson@linux.dev> In-Reply-To: <20250116232118.2694169-1-sean.anderson@linux.dev> References: <20250116232118.2694169-1-sean.anderson@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250116_152146_213845_A2A92DC3 X-CRM114-Status: UNSURE ( 9.61 ) X-CRM114-Notice: Please train this message. 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 Convert the ZynqMP devicetrees to use the split QSPI bus binding. This is pretty simple, since all boards use only CS0. Signed-off-by: Sean Anderson --- arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts | 5 ++++- arch/arm64/boot/dts/xilinx/zynqmp-zc1232-revA.dts | 5 ++++- arch/arm64/boot/dts/xilinx/zynqmp-zc1254-revA.dts | 5 ++++- .../boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 5 ++++- .../boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts | 5 ++++- arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 5 ++++- arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 5 ++++- arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts | 5 ++++- arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 5 ++++- arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 5 ++++- .../arm64/boot/dts/xilinx/zynqmp-zcu1275-revA.dts | 5 ++++- arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 15 +++++++++++---- 12 files changed, 55 insertions(+), 15 deletions(-) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts index bfa7ea6b9224..64b90de5b4ce 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts @@ -35,7 +35,7 @@ aliases { serial0 = &uart0; serial1 = &uart1; serial2 = &dcc; - spi0 = &qspi; + spi0 = &qspi_lower; spi1 = &spi0; spi2 = &spi1; usb0 = &usb0; @@ -129,6 +129,9 @@ mux { &qspi { /* MIO 0-5 - U143 */ status = "okay"; +}; + +&qspi_lower { spi_flash: flash@0 { /* MT25QU512A */ compatible = "jedec,spi-nor"; /* 64MB */ reg = <0>; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1232-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1232-revA.dts index 04079d1704f1..8927e0463cf4 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zc1232-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1232-revA.dts @@ -19,7 +19,7 @@ / { aliases { serial0 = &uart0; serial1 = &dcc; - spi0 = &qspi; + spi0 = &qspi_lower; }; chosen { @@ -39,6 +39,9 @@ &dcc { &qspi { status = "okay"; +}; + +&qspi_lower { flash@0 { compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ #address-cells = <1>; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1254-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1254-revA.dts index 3dec57cf18be..da07b58706f0 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zc1254-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1254-revA.dts @@ -20,7 +20,7 @@ / { aliases { serial0 = &uart0; serial1 = &dcc; - spi0 = &qspi; + spi0 = &qspi_lower; }; chosen { @@ -40,6 +40,9 @@ &dcc { &qspi { status = "okay"; +}; + +&qspi_lower { flash@0 { compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ #address-cells = <1>; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts index 6aff22d43361..ec570d68a4ae 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts @@ -27,7 +27,7 @@ aliases { mmc1 = &sdhci1; rtc0 = &rtc; serial0 = &uart0; - spi0 = &qspi; + spi0 = &qspi_lower; usb0 = &usb0; }; @@ -354,6 +354,9 @@ &psgtr { &qspi { status = "okay"; +}; + +&qspi_lower { flash@0 { compatible = "m25p80", "jedec,spi-nor"; /* Micron MT25QU512ABB8ESF */ #address-cells = <1>; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts index 6ec1d9813973..e1cfdc0db51e 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts @@ -26,7 +26,7 @@ aliases { rtc0 = &rtc; serial0 = &uart0; serial1 = &uart1; - spi0 = &qspi; + spi0 = &qspi_lower; }; chosen { @@ -172,6 +172,9 @@ &i2c1 { &qspi { status = "okay"; +}; + +&qspi_lower { flash@0 { compatible = "m25p80", "jedec,spi-nor"; /* 32MB */ #address-cells = <1>; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts index 7e26489a1539..18e323e2aad7 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts @@ -31,7 +31,7 @@ aliases { serial0 = &uart0; serial1 = &uart1; serial2 = &dcc; - spi0 = &qspi; + spi0 = &qspi_lower; usb0 = &usb0; }; @@ -953,6 +953,9 @@ &psgtr { &qspi { status = "okay"; +}; + +&qspi_lower { flash@0 { compatible = "m25p80", "jedec,spi-nor"; /* 16MB + 16MB */ #address-cells = <1>; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts index eb2090673ec1..026053c4116a 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts @@ -29,7 +29,7 @@ aliases { serial0 = &uart0; serial1 = &uart1; serial2 = &dcc; - spi0 = &qspi; + spi0 = &qspi_lower; usb0 = &usb0; }; @@ -439,6 +439,9 @@ &psgtr { &qspi { status = "okay"; +}; + +&qspi_lower { flash@0 { compatible = "m25p80", "jedec,spi-nor"; /* n25q512a 128MiB */ #address-cells = <1>; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts index 4694d0a841f1..da56e532dc2b 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts @@ -29,7 +29,7 @@ aliases { serial0 = &uart0; serial1 = &uart1; serial2 = &dcc; - spi0 = &qspi; + spi0 = &qspi_lower; usb0 = &usb0; }; @@ -451,6 +451,9 @@ &psgtr { &qspi { status = "okay"; +}; + +&qspi_lower { flash@0 { compatible = "m25p80", "jedec,spi-nor"; /* n25q512a 128MiB */ #address-cells = <1>; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts index 7beedd730f94..8dd73b035969 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts @@ -31,7 +31,7 @@ aliases { serial0 = &uart0; serial1 = &uart1; serial2 = &dcc; - spi0 = &qspi; + spi0 = &qspi_lower; usb0 = &usb0; }; @@ -959,6 +959,9 @@ &psgtr { &qspi { status = "okay"; +}; + +&qspi_lower { flash@0 { compatible = "m25p80", "jedec,spi-nor"; /* 16MB + 16MB */ #address-cells = <1>; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts index b67ff7ecf3c3..9ed7972c3b4e 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts @@ -30,7 +30,7 @@ aliases { rtc0 = &rtc; serial0 = &uart0; serial1 = &dcc; - spi0 = &qspi; + spi0 = &qspi_lower; usb0 = &usb0; }; @@ -789,6 +789,9 @@ &psgtr { &qspi { status = "okay"; +}; + +&qspi_lower { flash@0 { compatible = "m25p80", "jedec,spi-nor"; /* 16MB + 16MB */ #address-cells = <1>; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu1275-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu1275-revA.dts index a38c2baeba6c..99d007b3bfae 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu1275-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu1275-revA.dts @@ -20,7 +20,7 @@ / { aliases { serial0 = &uart0; serial1 = &dcc; - spi0 = &qspi; + spi0 = &qspi_lower; }; chosen { @@ -44,6 +44,9 @@ &gpio { &qspi { status = "okay"; +}; + +&qspi_lower { flash@0 { compatible = "m25p80", "jedec,spi-nor"; reg = <0x0>; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi index 5dac0542a48d..470e0b90382f 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi @@ -972,21 +972,28 @@ pcie_intc: legacy-interrupt-controller { }; }; - qspi: spi@ff0f0000 { + qspi: spi-controller@ff0f0000 { bootph-all; compatible = "xlnx,zynqmp-qspi-1.0"; status = "disabled"; clock-names = "ref_clk", "pclk"; interrupts = ; interrupt-parent = <&gic>; - num-cs = <1>; reg = <0x0 0xff0f0000 0x0 0x1000>, <0x0 0xc0000000 0x0 0x8000000>; - #address-cells = <1>; - #size-cells = <0>; /* iommus = <&smmu 0x873>; */ power-domains = <&zynqmp_firmware PD_QSPI>; resets = <&zynqmp_reset ZYNQMP_RESET_QSPI>; + + qspi_lower: spi-lower { + #address-cells = <1>; + #size-cells = <0>; + }; + + qspi_upper: spi-upper { + #address-cells = <1>; + #size-cells = <0>; + }; }; psgtr: phy@fd400000 {