aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorCrestez Dan Leonard <leonard.crestez@intel.com>2016-04-15 08:10:52 -0400
committerMark Brown <broonie@kernel.org>2016-04-15 13:02:58 -0400
commit83835fb07836eac1b35e98b919bf757ff7f77aad (patch)
tree878be922588ffac1e4de3ba44bbf63d787b01caf /drivers/spi
parentf55532a0c0b8bb6148f4e07853b876ef73bc69ca (diff)
spi: dln2: Pass of_node to spi master
This allows defining SPI devices connected to a DLN2 using devicetree. This already works for i2c because of a similar patch: 3b10db23: i2c: dln2: set the device tree node of the adapter Signed-off-by: Crestez Dan Leonard <leonard.crestez@intel.com> Acked-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-dln2.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/spi/spi-dln2.c b/drivers/spi/spi-dln2.c
index 3b7d91d94fea..4e8a8629d514 100644
--- a/drivers/spi/spi-dln2.c
+++ b/drivers/spi/spi-dln2.c
@@ -683,6 +683,7 @@ static int dln2_spi_probe(struct platform_device *pdev)
683 struct spi_master *master; 683 struct spi_master *master;
684 struct dln2_spi *dln2; 684 struct dln2_spi *dln2;
685 struct dln2_platform_data *pdata = dev_get_platdata(&pdev->dev); 685 struct dln2_platform_data *pdata = dev_get_platdata(&pdev->dev);
686 struct device *dev = &pdev->dev;
686 int ret; 687 int ret;
687 688
688 master = spi_alloc_master(&pdev->dev, sizeof(*dln2)); 689 master = spi_alloc_master(&pdev->dev, sizeof(*dln2));
@@ -700,6 +701,8 @@ static int dln2_spi_probe(struct platform_device *pdev)
700 } 701 }
701 702
702 dln2->master = master; 703 dln2->master = master;
704 dln2->master->dev.parent = dev;
705 dln2->master->dev.of_node = dev->of_node;
703 dln2->pdev = pdev; 706 dln2->pdev = pdev;
704 dln2->port = pdata->port; 707 dln2->port = pdata->port;
705 /* cs/mode can never be 0xff, so the first transfer will set them */ 708 /* cs/mode can never be 0xff, so the first transfer will set them */