4ce3c41696
One replaces our local patch and another is just for keeping driver in sync (license change). Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
52 lines
1.7 KiB
Diff
52 lines
1.7 KiB
Diff
From 78d759daceaf0a7058f37c4142bdca9948b6d987 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
|
Date: Thu, 29 Dec 2016 17:27:55 +0100
|
|
Subject: [PATCH] spi: bcm53xx: set of_node to let DT specify device(s)
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Setting of_node of master's dev seems to be a common way of letting it
|
|
work nicely with DT. This allows specifying device there instead of
|
|
hardcoding one in the driver code.
|
|
|
|
This was successfully tested with commit 1b47b98acce2 ("ARM: BCM5301X:
|
|
Add DT entry for SPI controller and NOR flash")
|
|
|
|
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
|
Signed-off-by: Mark Brown <broonie@kernel.org>
|
|
---
|
|
drivers/spi/spi-bcm53xx.c | 8 +-------
|
|
1 file changed, 1 insertion(+), 7 deletions(-)
|
|
|
|
--- a/drivers/spi/spi-bcm53xx.c
|
|
+++ b/drivers/spi/spi-bcm53xx.c
|
|
@@ -275,10 +275,6 @@ static int bcm53xxspi_flash_read(struct
|
|
* BCMA
|
|
**************************************************/
|
|
|
|
-static struct spi_board_info bcm53xx_info = {
|
|
- .modalias = "bcm53xxspiflash",
|
|
-};
|
|
-
|
|
static const struct bcma_device_id bcm53xxspi_bcma_tbl[] = {
|
|
BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_NS_QSPI, BCMA_ANY_REV, BCMA_ANY_CLASS),
|
|
{},
|
|
@@ -311,6 +307,7 @@ static int bcm53xxspi_bcma_probe(struct
|
|
b53spi->bspi = true;
|
|
bcm53xxspi_disable_bspi(b53spi);
|
|
|
|
+ master->dev.of_node = dev->of_node;
|
|
master->transfer_one = bcm53xxspi_transfer_one;
|
|
if (b53spi->mmio_base)
|
|
master->spi_flash_read = bcm53xxspi_flash_read;
|
|
@@ -324,9 +321,6 @@ static int bcm53xxspi_bcma_probe(struct
|
|
return err;
|
|
}
|
|
|
|
- /* Broadcom SoCs (at least with the CC rev 42) use SPI for flash only */
|
|
- spi_new_device(master, &bcm53xx_info);
|
|
-
|
|
return 0;
|
|
}
|
|
|