From patchwork Thu Sep 22 10:04:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bert Vermeulen X-Patchwork-Id: 12984938 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB952C6FA82 for ; Thu, 22 Sep 2022 10:30:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231535AbiIVKab (ORCPT ); Thu, 22 Sep 2022 06:30:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231515AbiIVKa1 (ORCPT ); Thu, 22 Sep 2022 06:30:27 -0400 X-Greylist: delayed 1552 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Thu, 22 Sep 2022 03:30:24 PDT Received: from yawp.biot.com (yawp.biot.com [IPv6:2a01:4f8:10a:8e::fce2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF958D0784 for ; Thu, 22 Sep 2022 03:30:24 -0700 (PDT) Received: from debian-spamd by yawp.biot.com with sa-checked (Exim 4.93) (envelope-from ) id 1obJ4I-00Bx19-Ag for linux-spi@vger.kernel.org; Thu, 22 Sep 2022 12:04:30 +0200 Received: from [2a02:578:460c:1:ae1f:6bff:fed1:9ca8] (helo=sumner.biot.com) by yawp.biot.com with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1obJ4I-00Bx15-6C; Thu, 22 Sep 2022 12:04:30 +0200 Received: from bert by sumner.biot.com with local (Exim 4.93) (envelope-from ) id 1obJ4H-004cfJ-JM; Thu, 22 Sep 2022 12:04:29 +0200 From: Bert Vermeulen To: linux-spi@vger.kernel.org, devicetree@vger.kernel.org Cc: Bert Vermeulen , John Crispin , Benjamin Larsson Subject: [PATCH 1/3] dt-bindings: arm: airoha: Add documentation for Airoha SPI controller Date: Thu, 22 Sep 2022 12:04:08 +0200 Message-Id: <20220922100410.1101874-2-bert@biot.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220922100410.1101874-1-bert@biot.com> References: <20220922100410.1101874-1-bert@biot.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org Create documentation for accessing the Airoha EN7523 SPI controller. Signed-off-by: Bert Vermeulen --- .../bindings/spi/airoha,en7523-spi.yaml | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 Documentation/devicetree/bindings/spi/airoha,en7523-spi.yaml diff --git a/Documentation/devicetree/bindings/spi/airoha,en7523-spi.yaml b/Documentation/devicetree/bindings/spi/airoha,en7523-spi.yaml new file mode 100644 index 000000000000..e5bc7814424e --- /dev/null +++ b/Documentation/devicetree/bindings/spi/airoha,en7523-spi.yaml @@ -0,0 +1,54 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/spi/airoha,en7523-spi.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Airoha EN7523 SPI controller + +maintainers: + - Bert Vermeulen + +description: | + This binding describes the SPI controller on Airoha EN7523 SoCs. + +allOf: + - $ref: "spi-controller.yaml#" + +properties: + compatible: + items: + - const: airoha,en7523-spi + + reg: + maxItems: 1 + + clocks: + items: + - description: SPI clock + + clock-names: + items: + - const: spi + +required: + - compatible + - reg + - clocks + - clock-names + - '#address-cells' + - '#size-cells' + +unevaluatedProperties: false + +examples: + - | + #include + spi0: spi@1fa10000 { + compatible = "airoha,en7523-spi"; + reg = <0x1fa10000 0x10000>; + #address-cells = <1>; + #size-cells = <0>; + clocks = <&scu EN7523_CLK_SPI>; + clock-names = "spi"; + }; From patchwork Thu Sep 22 10:04:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bert Vermeulen X-Patchwork-Id: 12984940 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BBF22C6FA82 for ; Thu, 22 Sep 2022 10:30:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229448AbiIVKam (ORCPT ); Thu, 22 Sep 2022 06:30:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55044 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230195AbiIVKal (ORCPT ); Thu, 22 Sep 2022 06:30:41 -0400 Received: from yawp.biot.com (yawp.biot.com [IPv6:2a01:4f8:10a:8e::fce2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 69A29B72A6 for ; Thu, 22 Sep 2022 03:30:39 -0700 (PDT) Received: from debian-spamd by yawp.biot.com with sa-checked (Exim 4.93) (envelope-from ) id 1obJ4J-00Bx1M-4w for linux-spi@vger.kernel.org; Thu, 22 Sep 2022 12:04:31 +0200 Received: from [2a02:578:460c:1:ae1f:6bff:fed1:9ca8] (helo=sumner.biot.com) by yawp.biot.com with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1obJ4I-00Bx1E-UN; Thu, 22 Sep 2022 12:04:31 +0200 Received: from bert by sumner.biot.com with local (Exim 4.93) (envelope-from ) id 1obJ4I-004cfR-Cj; Thu, 22 Sep 2022 12:04:30 +0200 From: Bert Vermeulen To: linux-spi@vger.kernel.org, devicetree@vger.kernel.org Cc: Bert Vermeulen , John Crispin , Benjamin Larsson Subject: [PATCH 2/3] spi: Add support for the Airoha EN7523 SoC SPI controller Date: Thu, 22 Sep 2022 12:04:09 +0200 Message-Id: <20220922100410.1101874-3-bert@biot.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220922100410.1101874-1-bert@biot.com> References: <20220922100410.1101874-1-bert@biot.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org This SPI driver primarily drives the SoC-internal state machine doing the actual transfers. This allows transfers to be transparently queued in hardware. DMA mode is not yet supported. Signed-off-by: Bert Vermeulen --- drivers/spi/Kconfig | 7 + drivers/spi/Makefile | 1 + drivers/spi/spi-en7523.c | 305 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 313 insertions(+) create mode 100644 drivers/spi/spi-en7523.c diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index e32f6a2058ae..11b8c7ea0226 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -57,6 +57,13 @@ config SPI_MEM comment "SPI Master Controller Drivers" +config SPI_AIROHA_EN7523 + bool "Airoha EN7523 SPI controller support" + depends on ARCH_AIROHA + default ARCH_AIROHA + help + This enables SPI controller support for the Airoha EN7523 SoC. + config SPI_ALTERA tristate "Altera SPI Controller platform driver" select SPI_ALTERA_CORE diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index 15d2f3835e45..8c360f764869 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -14,6 +14,7 @@ obj-$(CONFIG_SPI_SPIDEV) += spidev.o obj-$(CONFIG_SPI_LOOPBACK_TEST) += spi-loopback-test.o # SPI master controller drivers (bus) +obj-$(CONFIG_SPI_AIROHA_EN7523) += spi-en7523.o obj-$(CONFIG_SPI_ALTERA) += spi-altera-platform.o obj-$(CONFIG_SPI_ALTERA_CORE) += spi-altera-core.o obj-$(CONFIG_SPI_ALTERA_DFL) += spi-altera-dfl.o diff --git a/drivers/spi/spi-en7523.c b/drivers/spi/spi-en7523.c new file mode 100644 index 000000000000..0ec4f071a37b --- /dev/null +++ b/drivers/spi/spi-en7523.c @@ -0,0 +1,305 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include +#include +#include +#include +#include +#include + + +#define ENSPI_READ_IDLE_EN 0x0004 +#define ENSPI_MTX_MODE_TOG 0x0014 +#define ENSPI_RDCTL_FSM 0x0018 +#define ENSPI_MANUAL_EN 0x0020 +#define ENSPI_MANUAL_OPFIFO_EMPTY 0x0024 +#define ENSPI_MANUAL_OPFIFO_WDATA 0x0028 +#define ENSPI_MANUAL_OPFIFO_FULL 0x002C +#define ENSPI_MANUAL_OPFIFO_WR 0x0030 +#define ENSPI_MANUAL_DFIFO_FULL 0x0034 +#define ENSPI_MANUAL_DFIFO_WDATA 0x0038 +#define ENSPI_MANUAL_DFIFO_EMPTY 0x003C +#define ENSPI_MANUAL_DFIFO_RD 0x0040 +#define ENSPI_MANUAL_DFIFO_RDATA 0x0044 +#define ENSPI_IER 0x0090 +#define ENSPI_NFI2SPI_EN 0x0130 + +#define OP_CSH 0x00 +#define OP_CSL 0x01 +#define OP_CK 0x02 +#define OP_OUTS 0x08 +#define OP_OUTD 0x09 +#define OP_OUTQ 0x0A +#define OP_INS 0x0C +#define OP_INS0 0x0D +#define OP_IND 0x0E +#define OP_INQ 0x0F +#define OP_OS2IS 0x10 +#define OP_OS2ID 0x11 +#define OP_OS2IQ 0x12 +#define OP_OD2IS 0x13 +#define OP_OD2ID 0x14 +#define OP_OD2IQ 0x15 +#define OP_OQ2IS 0x16 +#define OP_OQ2ID 0x17 +#define OP_OQ2IQ 0x18 +#define OP_OSNIS 0x19 +#define OP_ODNID 0x1A + +#define MATRIX_MODE_AUTO 1 +#define CONF_MTX_MODE_AUTO 0 +#define MANUALEN_AUTO 0 +#define MATRIX_MODE_MANUAL 0 +#define CONF_MTX_MODE_MANUAL 9 +#define MANUALEN_MANUAL 1 + +#define ENSPI_MAX_XFER 0x1ff + +#define REG(x) (iobase + x) + +static void __iomem *iobase; + + +static void opfifo_write(u32 cmd, u32 len) +{ + u32 tmp = ((cmd & 0x1f) << 9) | (len & 0x1ff); + + writel(tmp, REG(ENSPI_MANUAL_OPFIFO_WDATA)); + + /* Wait for room in OPFIFO */ + while (readl(REG(ENSPI_MANUAL_OPFIFO_FULL))) + cpu_relax(); + + /* Shift command into OPFIFO */ + writel(1, REG(ENSPI_MANUAL_OPFIFO_WR)); + + /* Wait for command to finish */ + while (!readl(REG(ENSPI_MANUAL_OPFIFO_EMPTY))) + cpu_relax(); +} + +static void set_cs(int state) +{ + if (state) + opfifo_write(OP_CSH, 1); + else + opfifo_write(OP_CSL, 1); +} + +static void manual_begin_cmd(void) +{ + /* Disable read idle state */ + writel(0, REG(ENSPI_READ_IDLE_EN)); + + /* Wait for FSM to reach idle state */ + while (readl(REG(ENSPI_RDCTL_FSM))) + cpu_relax(); + + /* Set SPI core to manual mode */ + writel(CONF_MTX_MODE_MANUAL, REG(ENSPI_MTX_MODE_TOG)); + writel(MANUALEN_MANUAL, REG(ENSPI_MANUAL_EN)); +} + +static void manual_end_cmd(void) +{ + /* Set SPI core to auto mode */ + writel(CONF_MTX_MODE_AUTO, REG(ENSPI_MTX_MODE_TOG)); + writel(MANUALEN_AUTO, REG(ENSPI_MANUAL_EN)); + + /* Enable read idle state */ + writel(1, REG(ENSPI_READ_IDLE_EN)); +} + +static void dfifo_read(u8 *buf, int len) +{ + int i; + + for (i = 0; i < len; i++) { + /* Wait for requested data to show up in DFIFO */ + while (readl(REG(ENSPI_MANUAL_DFIFO_EMPTY))) + cpu_relax(); + buf[i] = readl(REG(ENSPI_MANUAL_DFIFO_RDATA)); + /* Queue up next byte */ + writel(1, REG(ENSPI_MANUAL_DFIFO_RD)); + } +} + +static void dfifo_write(const u8 *buf, int len) +{ + int i; + + for (i = 0; i < len; i++) { + /* Wait for room in DFIFO */ + while (readl(REG(ENSPI_MANUAL_DFIFO_FULL))) + cpu_relax(); + writel(buf[i], REG(ENSPI_MANUAL_DFIFO_WDATA)); + } +} + +static int init_hw(struct device *dev) +{ + struct clk *clk; + int ret; + + /* Disable manual/auto mode clash interrupt */ + writel(0, REG(ENSPI_IER)); + + clk = devm_clk_get(dev, "spi"); + if (IS_ERR(clk)) + return PTR_ERR(clk); + + ret = clk_prepare_enable(clk); + if (ret) + return ret; + + ret = clk_set_rate(clk, 40000000); + if (ret) { + clk_disable_unprepare(clk); + return ret; + } + + /* Disable DMA */ + writel(0, REG(ENSPI_NFI2SPI_EN)); + + return 0; +} + +static int xfer_read(struct spi_transfer *xfer) +{ + int opcode; + uint8_t *buf = xfer->rx_buf; + + switch (xfer->rx_nbits) { + case SPI_NBITS_SINGLE: + opcode = OP_INS; + break; + case SPI_NBITS_DUAL: + opcode = OP_IND; + break; + } + + opfifo_write(opcode, xfer->len); + dfifo_read(buf, xfer->len); + + return xfer->len; +} + +static int xfer_write(struct spi_transfer *xfer, int next_xfer_is_rx) +{ + int opcode; + const uint8_t *buf = xfer->tx_buf; + + if (next_xfer_is_rx) { + /* need to use Ox2Ix opcode to set the core to input afterwards */ + switch (xfer->tx_nbits) { + case SPI_NBITS_SINGLE: + opcode = OP_OS2IS; + break; + case SPI_NBITS_DUAL: + opcode = OP_OD2ID; + break; + } + } else { + switch (xfer->tx_nbits) { + case SPI_NBITS_SINGLE: + opcode = OP_OUTS; + break; + case SPI_NBITS_DUAL: + opcode = OP_OUTD; + break; + } + } + + opfifo_write(opcode, xfer->len); + dfifo_write(buf, xfer->len); + + return xfer->len; +} + +size_t max_transfer_size(struct spi_device *spi) +{ + return ENSPI_MAX_XFER; +} + +int transfer_one_message(struct spi_controller *ctrl, struct spi_message *msg) +{ + struct spi_transfer *xfer; + int next_xfer_is_rx = 0; + + manual_begin_cmd(); + set_cs(0); + list_for_each_entry(xfer, &msg->transfers, transfer_list) { + if (xfer->tx_buf) { + if (!list_is_last(&xfer->transfer_list, &msg->transfers) + && list_next_entry(xfer, transfer_list)->rx_buf != NULL) + next_xfer_is_rx = 1; + else + next_xfer_is_rx = 0; + msg->actual_length += xfer_write(xfer, next_xfer_is_rx); + } else if (xfer->rx_buf) { + msg->actual_length += xfer_read(xfer); + } + } + set_cs(1); + manual_end_cmd(); + + msg->status = 0; + spi_finalize_current_message(ctrl); + + return 0; +} + +static int spi_probe(struct platform_device *pdev) +{ + struct spi_controller *ctrl; + int err; + + ctrl = devm_spi_alloc_master(&pdev->dev, 0); + if (!ctrl) { + dev_err(&pdev->dev, "Error allocating SPI controller\n"); + return -ENOMEM; + } + + iobase = devm_platform_get_and_ioremap_resource(pdev, 0, NULL); + if (IS_ERR(iobase)) { + dev_err(&pdev->dev, "Could not map SPI register address"); + return -ENOMEM; + } + + err = init_hw(&pdev->dev); + if (err) + return err; + + ctrl->dev.of_node = pdev->dev.of_node; + ctrl->flags = SPI_CONTROLLER_HALF_DUPLEX; + ctrl->mode_bits = SPI_RX_DUAL | SPI_TX_DUAL; + ctrl->max_transfer_size = max_transfer_size; + ctrl->transfer_one_message = transfer_one_message; + err = devm_spi_register_controller(&pdev->dev, ctrl); + if (err) { + dev_err(&pdev->dev, "Could not register SPI controller\n"); + return -ENODEV; + } + + return 0; +} + +static const struct of_device_id spi_of_ids[] = { + { .compatible = "airoha,en7523-spi" }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, spi_of_ids); + +static struct platform_driver spi_driver = { + .probe = spi_probe, + .driver = { + .name = "airoha-en7523-spi", + .of_match_table = spi_of_ids, + }, +}; + +module_platform_driver(spi_driver); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Bert Vermeulen "); +MODULE_DESCRIPTION("Airoha EN7523 SPI driver"); From patchwork Thu Sep 22 10:04:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bert Vermeulen X-Patchwork-Id: 12984941 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 504C2C6FA8B for ; Thu, 22 Sep 2022 10:30:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229621AbiIVKap (ORCPT ); Thu, 22 Sep 2022 06:30:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55242 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230195AbiIVKao (ORCPT ); Thu, 22 Sep 2022 06:30:44 -0400 Received: from yawp.biot.com (yawp.biot.com [IPv6:2a01:4f8:10a:8e::fce2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 96840D0784 for ; Thu, 22 Sep 2022 03:30:43 -0700 (PDT) Received: from debian-spamd by yawp.biot.com with sa-checked (Exim 4.93) (envelope-from ) id 1obJ4J-00Bx1a-QE for linux-spi@vger.kernel.org; Thu, 22 Sep 2022 12:04:31 +0200 Received: from [2a02:578:460c:1:ae1f:6bff:fed1:9ca8] (helo=sumner.biot.com) by yawp.biot.com with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1obJ4J-00Bx1W-NE; Thu, 22 Sep 2022 12:04:31 +0200 Received: from bert by sumner.biot.com with local (Exim 4.93) (envelope-from ) id 1obJ4J-004cfU-4x; Thu, 22 Sep 2022 12:04:31 +0200 From: Bert Vermeulen To: linux-spi@vger.kernel.org, devicetree@vger.kernel.org Cc: Bert Vermeulen , John Crispin , Benjamin Larsson Subject: [PATCH 3/3] ARM: dts: en7523: Add SPI node Date: Thu, 22 Sep 2022 12:04:10 +0200 Message-Id: <20220922100410.1101874-4-bert@biot.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220922100410.1101874-1-bert@biot.com> References: <20220922100410.1101874-1-bert@biot.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org This adds an SPI node for the EN7523, so far only used for hooking up the NAND boot flash. Signed-off-by: Bert Vermeulen --- arch/arm/boot/dts/en7523-evb.dts | 20 ++++++++++++++++++++ arch/arm/boot/dts/en7523.dtsi | 11 +++++++++++ 2 files changed, 31 insertions(+) diff --git a/arch/arm/boot/dts/en7523-evb.dts b/arch/arm/boot/dts/en7523-evb.dts index f23a25cce119..50ccd58b1672 100644 --- a/arch/arm/boot/dts/en7523-evb.dts +++ b/arch/arm/boot/dts/en7523-evb.dts @@ -26,6 +26,26 @@ memory@80000000 { }; }; +&spi0 { + nand: nand@0 { + compatible = "spi-nand"; + reg = <0>; + nand-ecc-engine = <&nand>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x80000>; + read-only; + }; + }; + }; +}; + &gpio0 { status = "okay"; }; diff --git a/arch/arm/boot/dts/en7523.dtsi b/arch/arm/boot/dts/en7523.dtsi index 7f839331a777..2a61447f7b5c 100644 --- a/arch/arm/boot/dts/en7523.dtsi +++ b/arch/arm/boot/dts/en7523.dtsi @@ -201,4 +201,15 @@ pcie_intc1: interrupt-controller { #interrupt-cells = <1>; }; }; + + spi0: spi@1fa10000 { + compatible = "airoha,en7523-spi"; + reg = <0x1fa10000 0x10000>; + #address-cells = <1>; + #size-cells = <0>; + clocks = <&scu EN7523_CLK_SPI>; + clock-names = "spi"; + spi-rx-bus-width = <2>; + spi-tx-bus-width = <2>; + }; };