From: Xu Yilun <yilun.xu@intel.com>
To: broonie@kernel.org, linux-spi@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: trix@redhat.com, yilun.xu@intel.com, hao.wu@intel.com,
matthew.gerlach@linux.intel.com, russell.h.weight@intel.com
Subject: [PATCH 2/6] spi: altera: add SPI core parameters support via platform data.
Date: Thu, 11 Jun 2020 11:25:07 +0800 [thread overview]
Message-ID: <1591845911-10197-3-git-send-email-yilun.xu@intel.com> (raw)
In-Reply-To: <1591845911-10197-1-git-send-email-yilun.xu@intel.com>
This patch introduced SPI core parameters in platform data, it
allows passing these SPI core parameters via platform data.
Signed-off-by: Wu Hao <hao.wu@intel.com>
Signed-off-by: Xu Yilun <yilun.xu@intel.com>
Signed-off-by: Matthew Gerlach <matthew.gerlach@linux.intel.com>
Signed-off-by: Russ Weight <russell.h.weight@intel.com>
---
drivers/spi/spi-altera.c | 25 ++++++++++++++++++++++---
include/linux/spi/altera.h | 24 ++++++++++++++++++++++++
2 files changed, 46 insertions(+), 3 deletions(-)
create mode 100644 include/linux/spi/altera.h
diff --git a/drivers/spi/spi-altera.c b/drivers/spi/spi-altera.c
index d5fa0c5..e6e6708 100644
--- a/drivers/spi/spi-altera.c
+++ b/drivers/spi/spi-altera.c
@@ -14,6 +14,7 @@
#include <linux/errno.h>
#include <linux/module.h>
#include <linux/platform_device.h>
+#include <linux/spi/altera.h>
#include <linux/spi/spi.h>
#include <linux/io.h>
#include <linux/of.h>
@@ -40,6 +41,8 @@
#define ALTERA_SPI_CONTROL_IE_MSK 0x100
#define ALTERA_SPI_CONTROL_SSO_MSK 0x400
+#define ALTERA_SPI_MAX_CS 32
+
struct altera_spi {
void __iomem *base;
int irq;
@@ -182,6 +185,7 @@ static irqreturn_t altera_spi_irq(int irq, void *dev)
static int altera_spi_probe(struct platform_device *pdev)
{
+ struct altera_spi_platform_data *pdata = dev_get_platdata(&pdev->dev);
struct altera_spi *hw;
struct spi_master *master;
int err = -ENODEV;
@@ -192,9 +196,24 @@ static int altera_spi_probe(struct platform_device *pdev)
/* setup the master state. */
master->bus_num = pdev->id;
- master->num_chipselect = 16;
- master->mode_bits = SPI_CS_HIGH;
- master->bits_per_word_mask = SPI_BPW_RANGE_MASK(1, 16);
+
+ if (pdata) {
+ if (pdata->num_chipselect > ALTERA_SPI_MAX_CS) {
+ dev_err(&pdev->dev,
+ "Invalid number of chipselect: %hu\n",
+ pdata->num_chipselect);
+ return -EINVAL;
+ }
+
+ master->num_chipselect = pdata->num_chipselect;
+ master->mode_bits = pdata->mode_bits;
+ master->bits_per_word_mask = pdata->bits_per_word_mask;
+ } else {
+ master->num_chipselect = 16;
+ master->mode_bits = SPI_CS_HIGH;
+ master->bits_per_word_mask = SPI_BPW_RANGE_MASK(1, 16);
+ }
+
master->dev.of_node = pdev->dev.of_node;
master->transfer_one = altera_spi_txrx;
master->set_cs = altera_spi_set_cs;
diff --git a/include/linux/spi/altera.h b/include/linux/spi/altera.h
new file mode 100644
index 0000000..344a3fc
--- /dev/null
+++ b/include/linux/spi/altera.h
@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Header File for Altera SPI Driver.
+ */
+#ifndef __LINUX_SPI_ALTERA_H
+#define __LINUX_SPI_ALTERA_H
+
+#include <linux/regmap.h>
+#include <linux/spi/spi.h>
+#include <linux/types.h>
+
+/**
+ * struct altera_spi_platform_data - Platform data of the Altera SPI driver
+ * @mode_bits: Mode bits of SPI master.
+ * @num_chipselect: Number of chipselects.
+ * @bits_per_word_mask: bitmask of supported bits_per_word for transfers.
+ */
+struct altera_spi_platform_data {
+ u16 mode_bits;
+ u16 num_chipselect;
+ u32 bits_per_word_mask;
+};
+
+#endif /* __LINUX_SPI_ALTERA_H */
--
2.7.4
next prev parent reply other threads:[~2020-06-11 3:29 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-11 3:25 [PATCH 0/6] Add more configuration and regmap support for spi-altera Xu Yilun
2020-06-11 3:25 ` [PATCH 1/6] spi: altera: add 32bit data width transfer support Xu Yilun
2020-06-11 3:25 ` Xu Yilun [this message]
2020-06-11 3:25 ` [PATCH 3/6] spi: altera: add platform data for slave information Xu Yilun
2020-06-11 3:25 ` [PATCH 4/6] spi: altera: use regmap instead of direct mmio register access Xu Yilun
2020-06-11 11:02 ` Mark Brown
2020-06-12 4:43 ` Xu Yilun
2020-06-12 11:52 ` Mark Brown
2020-06-12 12:31 ` Xu Yilun
2020-06-11 3:25 ` [PATCH 5/6] spi: altera: move driver name string to header file Xu Yilun
2020-06-11 14:03 ` Mark Brown
2020-06-12 3:14 ` Xu Yilun
2020-06-11 3:25 ` [PATCH 6/6] spi: altera: fix size mismatch on 64 bit processors Xu Yilun
2020-06-11 11:04 ` Mark Brown
2020-06-12 3:39 ` Xu Yilun
2020-06-11 12:56 ` [PATCH 0/6] Add more configuration and regmap support for spi-altera Tom Rix
2020-06-15 23:41 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1591845911-10197-3-git-send-email-yilun.xu@intel.com \
--to=yilun.xu@intel.com \
--cc=broonie@kernel.org \
--cc=hao.wu@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=matthew.gerlach@linux.intel.com \
--cc=russell.h.weight@intel.com \
--cc=trix@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®