target/linux/bcm53xx/patches-4.4/084-0001-spi-bcm53xx-set-of_node-to-let-DT-specify-device-s.patch

   1 From 78d759daceaf0a7058f37c4142bdca9948b6d987 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
   3 Date: Thu, 29 Dec 2016 17:27:55 +0100
   4 Subject: [PATCH] spi: bcm53xx: set of_node to let DT specify device(s)
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 Setting of_node of master's dev seems to be a common way of letting it
  10 work nicely with DT. This allows specifying device there instead of
  11 hardcoding one in the driver code.
  12
  13 This was successfully tested with commit 1b47b98acce2 ("ARM: BCM5301X:
  14 Add DT entry for SPI controller and NOR flash")
  15
  16 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
  17 Signed-off-by: Mark Brown <broonie@kernel.org>
  18 ---
  19  drivers/spi/spi-bcm53xx.c | 8 +-------
  20  1 file changed, 1 insertion(+), 7 deletions(-)
  21
  22 --- a/drivers/spi/spi-bcm53xx.c
  23 +++ b/drivers/spi/spi-bcm53xx.c
  24 @@ -275,10 +275,6 @@ static int bcm53xxspi_flash_read(struct
  25   * BCMA
  26   **************************************************/
  27
  28 -static struct spi_board_info bcm53xx_info = {
  29 -       .modalias       = "bcm53xxspiflash",
  30 -};
  31 -
  32  static const struct bcma_device_id bcm53xxspi_bcma_tbl[] = {
  33         BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_NS_QSPI, BCMA_ANY_REV, BCMA_ANY_CLASS),
  34         {},
  35 @@ -311,6 +307,7 @@ static int bcm53xxspi_bcma_probe(struct
  36         b53spi->bspi = true;
  37         bcm53xxspi_disable_bspi(b53spi);
  38
  39 +       master->dev.of_node = dev->of_node;
  40         master->transfer_one = bcm53xxspi_transfer_one;
  41         if (b53spi->mmio_base)
  42                 master->spi_flash_read = bcm53xxspi_flash_read;
  43 @@ -324,9 +321,6 @@ static int bcm53xxspi_bcma_probe(struct
  44                 return err;
  45         }
  46
  47 -       /* Broadcom SoCs (at least with the CC rev 42) use SPI for flash only */
  48 -       spi_new_device(master, &bcm53xx_info);
  49 -
  50         return 0;
  51  }
  52