summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2010-10-08 18:11:19 +0200
committerSebastian Andrzej Siewior <bigeasy@linutronix.de>2010-12-02 17:55:13 +0100
commit21486af0f34d03b813b023d7a2b887b329f60486 (patch)
tree0c0bae3b1dccc79a7870addc60a8269d7927f25b /drivers/spi
parent579d3bb2ac1a351bbf536480a9ab38199bbf901d (diff)
downloadlinux-21486af0f34d03b813b023d7a2b887b329f60486.tar.bz2
spi/pxa2xx: pass of_node to spi device and set a parent device
the of_node will auto-publish devices which are added to the device tree. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/pxa2xx_spi.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c
index 9ca6454cfadc..95928833855b 100644
--- a/drivers/spi/pxa2xx_spi.c
+++ b/drivers/spi/pxa2xx_spi.c
@@ -1556,6 +1556,10 @@ static int __devinit pxa2xx_spi_probe(struct platform_device *pdev)
drv_data->pdev = pdev;
drv_data->ssp = ssp;
+ master->dev.parent = &pdev->dev;
+#ifdef CONFIG_OF
+ master->dev.of_node = pdev->dev.of_node;
+#endif
/* the spi->mode bits understood by this driver: */
master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;