From patchwork Fri Feb 7 06:14:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuanhong Guo X-Patchwork-Id: 11369831 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 01895921 for ; Fri, 7 Feb 2020 06:16:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C0AE420726 for ; Fri, 7 Feb 2020 06:16:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZuVxEzMM" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726674AbgBGGQF (ORCPT ); Fri, 7 Feb 2020 01:16:05 -0500 Received: from mail-pg1-f194.google.com ([209.85.215.194]:45285 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726465AbgBGGQF (ORCPT ); Fri, 7 Feb 2020 01:16:05 -0500 Received: by mail-pg1-f194.google.com with SMTP id b9so561097pgk.12; Thu, 06 Feb 2020 22:16:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ESgD9KZnwIe+9pa0UfpMO2wtd+VBKLjbitmk6dRbojk=; b=ZuVxEzMMn+ivLSOeYZUVrBnVgvkp7wDY/1ViQ6H8OarPTRSv+NLbN0+6hPKBSUW8eh erFFDHRpEyfbL6wckTL2bKtiuzpiXRLfc5NzLmwvmp21z1tZTWOn2J8+tJanvbZVfafO MYDEz3OuT8hSLaZQIYCChjXyT2m+hIn8uHrE9wqU0y+0LtxgPSbhjLxl4EDgqEE4e3gA xFoXUHGfjZ4dETirHJug3AZ22IjkEf9fpNgBAa47NIKgWpuffrOopD4vEFqwHOZ15ELN ci5Lf4ftTOxGiRv9/8OMxkSNHkNXXuyULB8eibDFhCbqvmfHOtcFDkq07wOl261R4Sfi 36Sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ESgD9KZnwIe+9pa0UfpMO2wtd+VBKLjbitmk6dRbojk=; b=V1pTztjO5JioNwVUMbsJXmEYhhH99ghAaUy1UAqg+NG74HRtv2GBNh2994EAVs/X47 VttUbmjncfgeq8Lpk5IgjvFmYEeI2j8btE2OE7NhSEDgVn+F109avbxMOU65Ksk7WD5U uD7OxPz9PnJc6cn77SnYjztv5LVU00btf3WdHSlkviDZdPV2Btfucy9pj7Mlx1lheerQ /R4fCH1zZaFK3elvz1M9zZvdFTCGh4uIXnb8NpvXjGBIJFqgqbDp2kMc4oN80IyK9P1D papdMOwwDeNFWd62Joy8fu7Wy3Of5U56874P7CIwW///uSrobs8bC/gC4hfckrEjU2as S1iA== X-Gm-Message-State: APjAAAULxAN2AYMX61clrcv5tjL6B3wSyFULJdQuon4pi0bYLUhSkvDf iq/2pL3A32wHLmQ789Bn/v/8oAyX+oLXCg== X-Google-Smtp-Source: APXvYqzD2hSe0aCQkYz7nn6CHur7QFAQ7NogQCHayT/t4w9NEZvnC5V9KFTAdRAFwPSafvLaG5LHBw== X-Received: by 2002:aa7:9205:: with SMTP id 5mr8276682pfo.213.1581056163957; Thu, 06 Feb 2020 22:16:03 -0800 (PST) Received: from localhost.localdomain ([2001:19f0:7001:2668:5400:1ff:fe62:2bbd]) by smtp.gmail.com with ESMTPSA id gc1sm1127414pjb.20.2020.02.06.22.15.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Feb 2020 22:16:03 -0800 (PST) From: Chuanhong Guo To: linux-spi@vger.kernel.org Cc: Mark Brown , linux-kernel@vger.kernel.org, Rob Herring , Mark Rutland , devicetree@vger.kernel.org, Chuanhong Guo Subject: [PATCH v3 1/2] spi: add driver for ar934x spi controller Date: Fri, 7 Feb 2020 14:14:05 +0800 Message-Id: <20200207061406.1735079-2-gch981213@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200207061406.1735079-1-gch981213@gmail.com> References: <20200207061406.1735079-1-gch981213@gmail.com> MIME-Version: 1.0 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org This patch adds driver for SPI controller found in Qualcomm Atheros AR934x/QCA95xx SoCs. This controller is a superset of the already supported qca,ar7100-spi. Besides the bit-bang mode in spi-ath79.c, this new controller added a new "shift register" mode, allowing faster spi operations. Signed-off-by: Chuanhong Guo --- Change since v2: none. Changes since v1: 1. change comment at the beginning to C++ style 2. rename ar934x_spi_transfer_one to ar934x_spi_transfer_one_message drivers/spi/Kconfig | 7 ++ drivers/spi/Makefile | 1 + drivers/spi/spi-ar934x.c | 229 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 237 insertions(+) create mode 100644 drivers/spi/spi-ar934x.c diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index d6ed0c355954..0434614d8201 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -62,6 +62,13 @@ config SPI_ALTERA help This is the driver for the Altera SPI Controller. +config SPI_AR934X + tristate "Qualcomm Atheros AR934X/QCA95XX SPI controller driver" + depends on ATH79 || COMPILE_TEST + help + This enables support for the SPI controller present on the + Qualcomm Atheros AR934X/QCA95XX SoCs. + config SPI_ATH79 tristate "Atheros AR71XX/AR724X/AR913X SPI controller driver" depends on ATH79 || COMPILE_TEST diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index 9b65ec5afc5e..9892bdfab15e 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -14,6 +14,7 @@ obj-$(CONFIG_SPI_LOOPBACK_TEST) += spi-loopback-test.o # SPI master controller drivers (bus) obj-$(CONFIG_SPI_ALTERA) += spi-altera.o +obj-$(CONFIG_SPI_AR934X) += spi-ar934x.o obj-$(CONFIG_SPI_ARMADA_3700) += spi-armada-3700.o obj-$(CONFIG_SPI_ATMEL) += spi-atmel.o obj-$(CONFIG_SPI_ATMEL_QUADSPI) += atmel-quadspi.o diff --git a/drivers/spi/spi-ar934x.c b/drivers/spi/spi-ar934x.c new file mode 100644 index 000000000000..4d21b285bffc --- /dev/null +++ b/drivers/spi/spi-ar934x.c @@ -0,0 +1,229 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// SPI controller driver for Qualcomm Atheros AR934x/QCA95xx SoCs +// +// Copyright (C) 2020 Chuanhong Guo +// +// Based on spi-mt7621.c: +// Copyright (C) 2011 Sergiy +// Copyright (C) 2011-2013 Gabor Juhos +// Copyright (C) 2014-2015 Felix Fietkau + +#include +#include +#include +#include +#include +#include +#include + +#define DRIVER_NAME "spi-ar934x" + +#define AR934X_SPI_REG_FS 0x00 +#define AR934X_SPI_ENABLE BIT(0) + +#define AR934X_SPI_REG_CTRL 0x04 +#define AR934X_SPI_CLK_MASK GENMASK(5, 0) + +#define AR934X_SPI_DATAOUT 0x10 + +#define AR934X_SPI_REG_SHIFT_CTRL 0x14 +#define AR934X_SPI_SHIFT_EN BIT(31) +#define AR934X_SPI_SHIFT_CS(n) BIT(28 + (n)) +#define AR934X_SPI_SHIFT_TERM 26 +#define AR934X_SPI_SHIFT_VAL(cs, term, count) \ + (AR934X_SPI_SHIFT_EN | AR934X_SPI_SHIFT_CS(cs) | \ + (term) << AR934X_SPI_SHIFT_TERM | (count)) + +#define AR934X_SPI_DATAIN 0x18 + +struct ar934x_spi { + struct spi_controller *ctlr; + void __iomem *base; + struct clk *clk; + unsigned int clk_freq; +}; + +static inline int ar934x_spi_clk_div(struct ar934x_spi *sp, unsigned int freq) +{ + int div = DIV_ROUND_UP(sp->clk_freq, freq * 2) - 1; + + if (div < 0) + return 0; + else if (div > AR934X_SPI_CLK_MASK) + return -EINVAL; + else + return div; +} + +static int ar934x_spi_setup(struct spi_device *spi) +{ + struct ar934x_spi *sp = spi_controller_get_devdata(spi->master); + + if ((spi->max_speed_hz == 0) || + (spi->max_speed_hz > (sp->clk_freq / 2))) { + spi->max_speed_hz = sp->clk_freq / 2; + } else if (spi->max_speed_hz < (sp->clk_freq / 128)) { + dev_err(&spi->dev, "spi clock is too low\n"); + return -EINVAL; + } + + return 0; +} + +static int ar934x_spi_transfer_one_message(struct spi_controller *master, + struct spi_message *m) +{ + struct ar934x_spi *sp = spi_controller_get_devdata(master); + struct spi_transfer *t = NULL; + struct spi_device *spi = m->spi; + unsigned long trx_done, trx_cur; + int stat = 0; + u8 term = 0; + int div, i; + u32 reg; + const u8 *tx_buf; + u8 *buf; + + m->actual_length = 0; + list_for_each_entry(t, &m->transfers, transfer_list) { + if (t->speed_hz) + div = ar934x_spi_clk_div(sp, t->speed_hz); + else + div = ar934x_spi_clk_div(sp, spi->max_speed_hz); + if (div < 0) { + stat = -EIO; + goto msg_done; + } + + reg = ioread32(sp->base + AR934X_SPI_REG_CTRL); + reg &= ~AR934X_SPI_CLK_MASK; + reg |= div; + iowrite32(reg, sp->base + AR934X_SPI_REG_CTRL); + iowrite32(0, sp->base + AR934X_SPI_DATAOUT); + + for (trx_done = 0; trx_done < t->len; trx_done += 4) { + trx_cur = t->len - trx_done; + if (trx_cur > 4) + trx_cur = 4; + else if (list_is_last(&t->transfer_list, &m->transfers)) + term = 1; + + if (t->tx_buf) { + tx_buf = t->tx_buf + trx_done; + reg = tx_buf[0]; + for (i = 1; i < trx_cur; i++) + reg = reg << 8 | tx_buf[i]; + iowrite32(reg, sp->base + AR934X_SPI_DATAOUT); + } + + reg = AR934X_SPI_SHIFT_VAL(spi->chip_select, term, + trx_cur * 8); + iowrite32(reg, sp->base + AR934X_SPI_REG_SHIFT_CTRL); + stat = readl_poll_timeout( + sp->base + AR934X_SPI_REG_SHIFT_CTRL, reg, + !(reg & AR934X_SPI_SHIFT_EN), 0, 5); + if (stat < 0) + goto msg_done; + + if (t->rx_buf) { + reg = ioread32(sp->base + AR934X_SPI_DATAIN); + buf = t->rx_buf + trx_done; + for (i = 0; i < trx_cur; i++) { + buf[trx_cur - i - 1] = reg & 0xff; + reg >>= 8; + } + } + } + m->actual_length += t->len; + } + +msg_done: + m->status = stat; + spi_finalize_current_message(master); + + return 0; +} + +static const struct of_device_id ar934x_spi_match[] = { + { .compatible = "qca,ar934x-spi" }, + {}, +}; +MODULE_DEVICE_TABLE(of, ar934x_spi_match); + +static int ar934x_spi_probe(struct platform_device *pdev) +{ + struct spi_controller *ctlr; + struct ar934x_spi *sp; + void __iomem *base; + struct clk *clk; + int ret; + + base = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(base)) + return PTR_ERR(base); + + clk = devm_clk_get(&pdev->dev, NULL); + if (IS_ERR(clk)) { + dev_err(&pdev->dev, "failed to get clock\n"); + return PTR_ERR(clk); + } + + ret = clk_prepare_enable(clk); + if (ret) + return ret; + + ctlr = spi_alloc_master(&pdev->dev, sizeof(*sp)); + if (!ctlr) { + dev_info(&pdev->dev, "failed to allocate spi controller\n"); + return -ENOMEM; + } + + iowrite32(AR934X_SPI_ENABLE, base + AR934X_SPI_REG_FS); + + ctlr->mode_bits = SPI_LSB_FIRST; + ctlr->setup = ar934x_spi_setup; + ctlr->transfer_one_message = ar934x_spi_transfer_one_message; + ctlr->bits_per_word_mask = SPI_BPW_MASK(8); + ctlr->dev.of_node = pdev->dev.of_node; + ctlr->num_chipselect = 3; + + dev_set_drvdata(&pdev->dev, ctlr); + + sp = spi_controller_get_devdata(ctlr); + sp->base = base; + sp->clk = clk; + sp->clk_freq = clk_get_rate(clk); + sp->ctlr = ctlr; + + return devm_spi_register_controller(&pdev->dev, ctlr); +} + +static int ar934x_spi_remove(struct platform_device *pdev) +{ + struct spi_controller *ctlr; + struct ar934x_spi *sp; + + ctlr = dev_get_drvdata(&pdev->dev); + sp = spi_controller_get_devdata(ctlr); + + clk_disable_unprepare(sp->clk); + + return 0; +} + +static struct platform_driver ar934x_spi_driver = { + .driver = { + .name = DRIVER_NAME, + .of_match_table = ar934x_spi_match, + }, + .probe = ar934x_spi_probe, + .remove = ar934x_spi_remove, +}; + +module_platform_driver(ar934x_spi_driver); + +MODULE_DESCRIPTION("SPI controller driver for Qualcomm Atheros AR934x/QCA95xx"); +MODULE_AUTHOR("Chuanhong Guo "); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:" DRIVER_NAME); From patchwork Fri Feb 7 06:14:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuanhong Guo X-Patchwork-Id: 11369833 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 524C392A for ; Fri, 7 Feb 2020 06:16:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 30C6220838 for ; Fri, 7 Feb 2020 06:16:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kI+DrXub" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727011AbgBGGQM (ORCPT ); Fri, 7 Feb 2020 01:16:12 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:42586 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726465AbgBGGQM (ORCPT ); Fri, 7 Feb 2020 01:16:12 -0500 Received: by mail-pl1-f193.google.com with SMTP id e8so562717plt.9; Thu, 06 Feb 2020 22:16:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LLDRXPEmr92tJ/zW0EJ5LnXwFmsRZHZ9agSKK3TRvMc=; b=kI+DrXub+Bc0HwoHIQ/uBOvcuKrRA4Jte58ps5rM6l0GEkIoMVuiEtEnp+CyoWLngP n4TPr3qIyOzs5/zPH4o12NuMH0zQPmCYN5hNUuucVJl22IgI3vPHKzqhyiENFGuWq4fH PZ/PjB6KIZc0awYqwR0nS6Jb/H+5WVSj0WHD5ZRzdYMBdkHkCuUevuXB6uhSB+4f9IVL rDxpLNvNz7GJY+6ZOMe1p5M2oxaK5hGeKq/4V9phQkjt0dzRW5Z6D3xa/lKfDCCfT1jR 1aZE1JQiYsn2DMZraNN379M0eLcWesDNR1gDjNsx4ZjBjT+LbpJrJn+fUcsPySmpXZ9v 7dwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LLDRXPEmr92tJ/zW0EJ5LnXwFmsRZHZ9agSKK3TRvMc=; b=ceW++m0rMwsCP+STPizJuvMbmQxA/Lx/4PnxVLGarI1A9f6gJw5IzsFmrQudYM3mKg cTUSPMhP9Ba3et53d51lc9QWzOgxvi8f9BBtXPhLq+V/oux4RTOzokmgybLpWbJTeW1m tFbc1GnhyGqAnjlFcBVHdDY34EaAeUDYobR3fwRF9ZQbNaZpq8dlnMpY0APjNkDF0AZq upGOUPr5oxK6mO7IBw0vrWJE18Wfgn7gFCXzs/XhUJhWWUVYJ6lN3evVeTsOvOjrnFwe zcvF3qw3ymKY1gCw3rpuicVxgtrXhBQZLOLd4SKziT5iiG3FtG7NB5yfilClJpOHlED/ ckLg== X-Gm-Message-State: APjAAAXTaon7HJ+9s9nxw8fn5GEzcP7JXDXBSuGbwWO7Nx3jHedXrZxn JerT4Pgm2B5Rg26MkcE7TMsdE+obF8dQDg== X-Google-Smtp-Source: APXvYqwkksJiPrNoPYwkBTejCkMOLN/C7NY720tvLxZhpVs1IQU1uqOY4TULZaCNouWXMf7IotdSCA== X-Received: by 2002:a17:902:9b93:: with SMTP id y19mr8090102plp.89.1581056171645; Thu, 06 Feb 2020 22:16:11 -0800 (PST) Received: from localhost.localdomain ([2001:19f0:7001:2668:5400:1ff:fe62:2bbd]) by smtp.gmail.com with ESMTPSA id gc1sm1127414pjb.20.2020.02.06.22.16.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Feb 2020 22:16:11 -0800 (PST) From: Chuanhong Guo To: linux-spi@vger.kernel.org Cc: Mark Brown , linux-kernel@vger.kernel.org, Rob Herring , Mark Rutland , devicetree@vger.kernel.org, Chuanhong Guo Subject: [PATCH v3 2/2] dt-binding: spi: add bindings for spi-ar934x Date: Fri, 7 Feb 2020 14:14:06 +0800 Message-Id: <20200207061406.1735079-3-gch981213@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200207061406.1735079-1-gch981213@gmail.com> References: <20200207061406.1735079-1-gch981213@gmail.com> MIME-Version: 1.0 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org Add binding documentation for SPI controller in Qualcomm Atheros AR934x/QCA95xx SoCs. Signed-off-by: Chuanhong Guo --- Change since v2: replace clock binding in example with a bogus spi_clock to fix dt binding check error. Change since v1: none .../bindings/spi/qca,ar934x-spi.yaml | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 Documentation/devicetree/bindings/spi/qca,ar934x-spi.yaml diff --git a/Documentation/devicetree/bindings/spi/qca,ar934x-spi.yaml b/Documentation/devicetree/bindings/spi/qca,ar934x-spi.yaml new file mode 100644 index 000000000000..d90c81d4127d --- /dev/null +++ b/Documentation/devicetree/bindings/spi/qca,ar934x-spi.yaml @@ -0,0 +1,40 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/spi/qca,ar934x-spi.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm Atheros AR934x/QCA95xx SoC SPI controller + +maintainers: + - Chuanhong Guo + +allOf: + - $ref: spi-controller.yaml# + +properties: + compatible: + const: qca,ar934x-spi + + reg: + maxItems: 1 + + clocks: + maxItems: 1 + +required: + - compatible + - reg + - clocks + - '#address-cells' + - '#size-cells' + +examples: + - | + spi: spi@1f000000 { + compatible = "qca,ar934x-spi"; + reg = <0x1f000000 0x1c>; + clocks = <&spi_clock>; + #address-cells = <1>; + #size-cells = <0>; + };