summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXu Yilun <yilun.xu@intel.com>2020-06-11 11:25:08 +0800
committerMark Brown <broonie@kernel.org>2020-06-15 23:36:03 +0100
commit1fccd182a4694a848f2d6f3b1820d6fc71d9c99d (patch)
treef2aec1a3fadc6995e449c25cb4267fb3577bad41
parent8e04187c1bc7953f6dfad3400c58b1b0b0ad767b (diff)
spi: altera: add platform data for slave information.
This patch introduces platform data for slave information, it allows spi-altera to add new spi devices once master registration is done. 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> Reviewed-by: Tom Rix <trix@redhat.com> Link: https://lore.kernel.org/r/1591845911-10197-4-git-send-email-yilun.xu@intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--drivers/spi/spi-altera.c11
-rw-r--r--include/linux/spi/altera.h5
2 files changed, 16 insertions, 0 deletions
diff --git a/drivers/spi/spi-altera.c b/drivers/spi/spi-altera.c
index e6e6708c7c47..aa9d1a257433 100644
--- a/drivers/spi/spi-altera.c
+++ b/drivers/spi/spi-altera.c
@@ -189,6 +189,7 @@ static int altera_spi_probe(struct platform_device *pdev)
struct altera_spi *hw;
struct spi_master *master;
int err = -ENODEV;
+ u16 i;
master = spi_alloc_master(&pdev->dev, sizeof(struct altera_spi));
if (!master)
@@ -244,6 +245,16 @@ static int altera_spi_probe(struct platform_device *pdev)
err = devm_spi_register_master(&pdev->dev, master);
if (err)
goto exit;
+
+ if (pdata) {
+ for (i = 0; i < pdata->num_devices; i++) {
+ if (!spi_new_device(master, pdata->devices + i))
+ dev_warn(&pdev->dev,
+ "unable to create SPI device: %s\n",
+ pdata->devices[i].modalias);
+ }
+ }
+
dev_info(&pdev->dev, "base %p, irq %d\n", hw->base, hw->irq);
return 0;
diff --git a/include/linux/spi/altera.h b/include/linux/spi/altera.h
index 344a3fce56a4..2d42641499a6 100644
--- a/include/linux/spi/altera.h
+++ b/include/linux/spi/altera.h
@@ -14,11 +14,16 @@
* @mode_bits: Mode bits of SPI master.
* @num_chipselect: Number of chipselects.
* @bits_per_word_mask: bitmask of supported bits_per_word for transfers.
+ * @num_devices: Number of devices that shall be added when the driver
+ * is probed.
+ * @devices: The devices to add.
*/
struct altera_spi_platform_data {
u16 mode_bits;
u16 num_chipselect;
u32 bits_per_word_mask;
+ u16 num_devices;
+ struct spi_board_info *devices;
};
#endif /* __LINUX_SPI_ALTERA_H */