From: Gregory CLEMENT <gregory.clement@bootlin.com>
To: Mark Brown <broonie@kernel.org>,
linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>,
Gregory CLEMENT <gregory.clement@bootlin.com>,
Ludovic Desroches <ludovic.desroches@microchip.com>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 5/7] spi: atmel: Remove platform data support
Date: Thu, 17 Oct 2019 16:18:44 +0200 [thread overview]
Message-ID: <20191017141846.7523-6-gregory.clement@bootlin.com> (raw)
In-Reply-To: <20191017141846.7523-1-gregory.clement@bootlin.com>
This driver is now only used through the device tree. Simplify code
by explicitly depend on device tree.
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
---
drivers/spi/Kconfig | 1 +
drivers/spi/spi-atmel.c | 16 ++--------------
2 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 6f7fdcbb9151..6c0c1f55bd71 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -80,6 +80,7 @@ config SPI_ARMADA_3700
config SPI_ATMEL
tristate "Atmel SPI Controller"
depends on ARCH_AT91 || COMPILE_TEST
+ depends on OF
help
This selects a driver for the Atmel SPI Controller, present on
many AT91 ARM chips.
diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index 19600de40422..1ff5b20eabf7 100644
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -1500,7 +1500,7 @@ static int atmel_spi_probe(struct platform_device *pdev)
master->bits_per_word_mask = SPI_BPW_RANGE_MASK(8, 16);
master->dev.of_node = pdev->dev.of_node;
master->bus_num = pdev->id;
- master->num_chipselect = master->dev.of_node ? 0 : 4;
+ master->num_chipselect = 4;
master->setup = atmel_spi_setup;
master->flags = (SPI_MASTER_MUST_RX | SPI_MASTER_MUST_TX);
master->transfer_one_message = atmel_spi_transfer_one_message;
@@ -1528,16 +1528,6 @@ static int atmel_spi_probe(struct platform_device *pdev)
atmel_get_caps(as);
- /*
- * If there are chip selects in the device tree, those will be
- * discovered by the SPI core when registering the SPI master
- * and assigned to each SPI device.
- */
- if (atmel_spi_is_v2(as) &&
- pdev->dev.of_node &&
- !of_get_property(pdev->dev.of_node, "cs-gpios", NULL))
- master->num_chipselect = 4;
-
as->use_dma = false;
as->use_pdc = false;
if (as->caps.has_dma_support) {
@@ -1745,20 +1735,18 @@ static const struct dev_pm_ops atmel_spi_pm_ops = {
#define ATMEL_SPI_PM_OPS NULL
#endif
-#if defined(CONFIG_OF)
static const struct of_device_id atmel_spi_dt_ids[] = {
{ .compatible = "atmel,at91rm9200-spi" },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, atmel_spi_dt_ids);
-#endif
static struct platform_driver atmel_spi_driver = {
.driver = {
.name = "atmel_spi",
.pm = ATMEL_SPI_PM_OPS,
- .of_match_table = of_match_ptr(atmel_spi_dt_ids),
+ .of_match_table = atmel_spi_dt_ids,
},
.probe = atmel_spi_probe,
.remove = atmel_spi_remove,
--
2.23.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-10-17 14:22 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-17 14:18 [PATCH 0/7] atmel-spi: Allow using more than 4 GPIOs as CS Gregory CLEMENT
2019-10-17 14:18 ` [PATCH 1/7] spi: atmel: Remove and fix erroneous comments Gregory CLEMENT
2019-10-18 18:07 ` Applied "spi: atmel: Remove and fix erroneous comments" to the spi tree Mark Brown
2019-10-17 14:18 ` [PATCH 2/7] spi: atmel: Fix CS high support Gregory CLEMENT
2019-10-18 18:07 ` Applied "spi: atmel: Fix CS high support" to the spi tree Mark Brown
2019-10-17 14:18 ` [PATCH 3/7] spi: atmel: Configure GPIO per CS instead of by controller Gregory CLEMENT
2019-10-18 18:07 ` Applied "spi: atmel: Configure GPIO per CS instead of by controller" to the spi tree Mark Brown
2019-10-17 14:18 ` [PATCH 4/7] spi: atmel: Remove useless private field Gregory CLEMENT
2019-10-18 18:07 ` Applied "spi: atmel: Remove useless private field" to the spi tree Mark Brown
2019-10-17 14:18 ` Gregory CLEMENT [this message]
2019-10-18 18:07 ` Applied "spi: atmel: Remove platform data support" " Mark Brown
2019-10-17 14:18 ` [PATCH 6/7] spi: atmel: Improve and fix GPIO CS usage Gregory CLEMENT
2019-10-18 18:07 ` Applied "spi: atmel: Improve and fix GPIO CS usage" to the spi tree Mark Brown
2019-10-17 14:18 ` [PATCH 7/7] spi: atmel: Improve CS0 case support on AT91RM9200 Gregory CLEMENT
2019-10-18 18:07 ` Applied "spi: atmel: Improve CS0 case support on AT91RM9200" to the spi tree 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=20191017141846.7523-6-gregory.clement@bootlin.com \
--to=gregory.clement@bootlin.com \
--cc=alexandre.belloni@bootlin.com \
--cc=broonie@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=ludovic.desroches@microchip.com \
--cc=thomas.petazzoni@bootlin.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;
as well as URLs for NNTP newsgroup(s).