Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp1625469ybv; Thu, 6 Feb 2020 07:09:28 -0800 (PST) X-Google-Smtp-Source: APXvYqxl+4pbWi7Fr3lLpcQMOaZv/Q0JINebVAN6cvyKebq9IGBfg5hbZjlxQQJAXW2zqIGpc0aw X-Received: by 2002:a9d:7315:: with SMTP id e21mr32432243otk.255.1581001768661; Thu, 06 Feb 2020 07:09:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581001768; cv=none; d=google.com; s=arc-20160816; b=HDt/wFvMavth2LHrWjfj/HWLigHkIK7Y0lVYBVIsNLeAHSZo9FIsS7NlwRRRmEkNvj HvV3/+3HMgNtyvDi1T0s12hI4jkLpwUCJnZuRcWVqNzGJov28ITWMYm8wnDP0SLEh3zZ QlZu1+R3RLnAG0rH7vnl4dBOjieX9aR/U5n5toA3IPhg1b7JXMKM7A0ivESKLqtj1NEu 49HeEbG4SVRhO6ivaRszkgYqq8PLfbdXknffJ+6uCGNYwgoBgBxjyor7lcm+1F5ph7cG 7YcYAMMmmvYJjvevWz0Ziaxxl5hm9lPr0NQEr0G4EwCxRljMlIRSoBSTeTJiGqTo0Voc bi7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Et1WN4d0c+7wViTitFnIlOSjK+PLt9Tg9GxY7O4eMrU=; b=TkwbhVw1QhcasDkLTXijcj5fQyotJCQROvIFDk0cP/DTRP6dFvJIReR9hi+PaTQEsn CiSU+lZWT5CHXzHOzQfGYEIempopmneAnFrhwk8xDwfjTr1Xv0NX5vSqHITkhyltuuS5 HIqR7P1XsCaVjQL/FRGFomVpVvIAl48E15tkbH8saV33BP1uQA7lNvCFnVD9IJqrZzHP FHGa+0NZAC62NZ/yYLhw43RMNDq3aS7zYTZW3Je3G0PNac9lvJlVy1VtxF5d7GnpWIkJ DvEfJxspVVpyDS6jpU6c+pcaU4FtHMAX4rSlq+hHzyb0nbXqOnp3ib9FmPuE4yuaoGSV sGzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=AG4cb+Zr; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r22si2245535oic.93.2020.02.06.07.08.50; Thu, 06 Feb 2020 07:09:28 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=AG4cb+Zr; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727589AbgBFPGt (ORCPT + 99 others); Thu, 6 Feb 2020 10:06:49 -0500 Received: from mail-pj1-f65.google.com ([209.85.216.65]:38730 "EHLO mail-pj1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727325AbgBFPGt (ORCPT ); Thu, 6 Feb 2020 10:06:49 -0500 Received: by mail-pj1-f65.google.com with SMTP id j17so95942pjz.3; Thu, 06 Feb 2020 07:06:47 -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=Et1WN4d0c+7wViTitFnIlOSjK+PLt9Tg9GxY7O4eMrU=; b=AG4cb+Zr75LgvfBxMt8/h+RhGvzIq0MBIr4wUl12PCYsOlCY7nTiLZsXgdzGwpLiCe Hd9i9d8NnJ9Da2+JNDSMaRtvMUyDO82R8NMBtQotgVzNkvQMdBoFPQsWfGdODwnttLqb Om3HpqCOMXhc+bphtLL1XvYiwE9ePc04zlWYM5RbsXA3EgW8dJr63K1MmEnxJKdcm155 6tquQB9yqFWiqb14A8N+SIdI2mwQUATUph7BjYr+CjfIpmtT0a1w+Yy9OTO6NGgmjoGL +Ym+U+uuRykXR/aOkBGwkGESy7Qq8xEBuVJjU3yJQXMxE0Arfyk9RpX2qoT4EF1rZug4 fOCw== 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=Et1WN4d0c+7wViTitFnIlOSjK+PLt9Tg9GxY7O4eMrU=; b=WiVfgw6aVJ/S5ee1aT/9p1Ei+HYSJvrHEH5fb56/FWfvnrGOJ/Rla7QYaVWGQqhLF4 W7eCEDLSNGsECFfBL30Tae/LezG2uiMTP8Lxb/v/y06EVAi6EbUxbO/lgIAL2o6qJ9Qc LXTbYL4FeHFkVQs06HYkPkr4VQThLrob/lr0DELzZRin44HX+qOcX3dGVQqaMtppuE9O GcQ4O9KH/Xuo6dQDT+foaQs5JILuRNQBmacz9hvRI1I1sxo6IZf3idH5qqIXIQIRSp+E VpSQkbt/hBeGkFJ1T0W1HmrL96OWD/HZILZmMGIpDlhkaMm07Yu9Yb0wh48Rv0i0Vk2M iRYw== X-Gm-Message-State: APjAAAWWRqJa9EsjrNvTlUl+ZDOLBH4LwckESCaPVneQiVvno0Z9gMF3 nfTzzyZ04I0a0gAh8B0XPdg5M6Ce4zY= X-Received: by 2002:a17:90a:3745:: with SMTP id u63mr4762236pjb.123.1581001606908; Thu, 06 Feb 2020 07:06:46 -0800 (PST) Received: from localhost.localdomain ([2001:19f0:7001:2668:5400:1ff:fe62:2bbd]) by smtp.gmail.com with ESMTPSA id 64sm3748157pfd.48.2020.02.06.07.06.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Feb 2020 07:06:46 -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 v2 1/2] spi: add driver for ar934x spi controller Date: Thu, 6 Feb 2020 23:06:25 +0800 Message-Id: <20200206150626.708649-2-gch981213@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200206150626.708649-1-gch981213@gmail.com> References: <20200206150626.708649-1-gch981213@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 --- 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); -- 2.24.1