diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2012-04-07 16:16:53 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2012-04-13 12:21:39 -0400 |
commit | d57a4282d04810417c4ed2a49cbbeda8b3569b18 (patch) | |
tree | 40fbd959e4a72c7c2635f8488bbd43d0ff353b80 /drivers/spi | |
parent | 8ebb35fd7ad07ab9a88a35eedd4f89a1e2a8fa55 (diff) |
spi/devicetree: Move devicetree support code into spi directory
The SPI device tree support code isn't shared by any other subsystem. It can
be moved into the core drivers/spi directory and the exported symbol can be
removed.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Cc: Rob Herring <rob.herring@calxeda.com>
Diffstat (limited to 'drivers/spi')
-rw-r--r-- | drivers/spi/spi-fsl-espi.c | 1 | ||||
-rw-r--r-- | drivers/spi/spi-fsl-lib.c | 2 | ||||
-rw-r--r-- | drivers/spi/spi-ppc4xx.c | 1 | ||||
-rw-r--r-- | drivers/spi/spi.c | 92 |
4 files changed, 92 insertions, 4 deletions
diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c index 7523a2429d0..27bdc47b525 100644 --- a/drivers/spi/spi-fsl-espi.c +++ b/drivers/spi/spi-fsl-espi.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
18 | #include <linux/of.h> | 18 | #include <linux/of.h> |
19 | #include <linux/of_platform.h> | 19 | #include <linux/of_platform.h> |
20 | #include <linux/of_spi.h> | ||
21 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
22 | #include <linux/err.h> | 21 | #include <linux/err.h> |
23 | #include <sysdev/fsl_soc.h> | 22 | #include <sysdev/fsl_soc.h> |
diff --git a/drivers/spi/spi-fsl-lib.c b/drivers/spi/spi-fsl-lib.c index 2674fad7f68..1503574b215 100644 --- a/drivers/spi/spi-fsl-lib.c +++ b/drivers/spi/spi-fsl-lib.c | |||
@@ -22,7 +22,7 @@ | |||
22 | #include <linux/dma-mapping.h> | 22 | #include <linux/dma-mapping.h> |
23 | #include <linux/mm.h> | 23 | #include <linux/mm.h> |
24 | #include <linux/of_platform.h> | 24 | #include <linux/of_platform.h> |
25 | #include <linux/of_spi.h> | 25 | #include <linux/spi/spi.h> |
26 | #include <sysdev/fsl_soc.h> | 26 | #include <sysdev/fsl_soc.h> |
27 | 27 | ||
28 | #include "spi-fsl-lib.h" | 28 | #include "spi-fsl-lib.h" |
diff --git a/drivers/spi/spi-ppc4xx.c b/drivers/spi/spi-ppc4xx.c index 98ec53285fc..d95d307a110 100644 --- a/drivers/spi/spi-ppc4xx.c +++ b/drivers/spi/spi-ppc4xx.c | |||
@@ -30,7 +30,6 @@ | |||
30 | #include <linux/errno.h> | 30 | #include <linux/errno.h> |
31 | #include <linux/wait.h> | 31 | #include <linux/wait.h> |
32 | #include <linux/of_platform.h> | 32 | #include <linux/of_platform.h> |
33 | #include <linux/of_spi.h> | ||
34 | #include <linux/of_gpio.h> | 33 | #include <linux/of_gpio.h> |
35 | #include <linux/interrupt.h> | 34 | #include <linux/interrupt.h> |
36 | #include <linux/delay.h> | 35 | #include <linux/delay.h> |
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 3d8f662e4fe..37c555ec59a 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c | |||
@@ -2,6 +2,7 @@ | |||
2 | * SPI init/core code | 2 | * SPI init/core code |
3 | * | 3 | * |
4 | * Copyright (C) 2005 David Brownell | 4 | * Copyright (C) 2005 David Brownell |
5 | * Copyright (C) 2008 Secret Lab Technologies Ltd. | ||
5 | * | 6 | * |
6 | * This program is free software; you can redistribute it and/or modify | 7 | * This program is free software; you can redistribute it and/or modify |
7 | * it under the terms of the GNU General Public License as published by | 8 | * it under the terms of the GNU General Public License as published by |
@@ -19,15 +20,16 @@ | |||
19 | */ | 20 | */ |
20 | 21 | ||
21 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
23 | #include <linux/kmod.h> | ||
22 | #include <linux/device.h> | 24 | #include <linux/device.h> |
23 | #include <linux/init.h> | 25 | #include <linux/init.h> |
24 | #include <linux/cache.h> | 26 | #include <linux/cache.h> |
25 | #include <linux/mutex.h> | 27 | #include <linux/mutex.h> |
26 | #include <linux/of_device.h> | 28 | #include <linux/of_device.h> |
29 | #include <linux/of_irq.h> | ||
27 | #include <linux/slab.h> | 30 | #include <linux/slab.h> |
28 | #include <linux/mod_devicetable.h> | 31 | #include <linux/mod_devicetable.h> |
29 | #include <linux/spi/spi.h> | 32 | #include <linux/spi/spi.h> |
30 | #include <linux/of_spi.h> | ||
31 | #include <linux/pm_runtime.h> | 33 | #include <linux/pm_runtime.h> |
32 | #include <linux/export.h> | 34 | #include <linux/export.h> |
33 | #include <linux/sched.h> | 35 | #include <linux/sched.h> |
@@ -798,6 +800,94 @@ err_init_queue: | |||
798 | 800 | ||
799 | /*-------------------------------------------------------------------------*/ | 801 | /*-------------------------------------------------------------------------*/ |
800 | 802 | ||
803 | #if defined(CONFIG_OF) && !defined(CONFIG_SPARC) | ||
804 | /** | ||
805 | * of_register_spi_devices() - Register child devices onto the SPI bus | ||
806 | * @master: Pointer to spi_master device | ||
807 | * | ||
808 | * Registers an spi_device for each child node of master node which has a 'reg' | ||
809 | * property. | ||
810 | */ | ||
811 | static void of_register_spi_devices(struct spi_master *master) | ||
812 | { | ||
813 | struct spi_device *spi; | ||
814 | struct device_node *nc; | ||
815 | const __be32 *prop; | ||
816 | int rc; | ||
817 | int len; | ||
818 | |||
819 | if (!master->dev.of_node) | ||
820 | return; | ||
821 | |||
822 | for_each_child_of_node(master->dev.of_node, nc) { | ||
823 | /* Alloc an spi_device */ | ||
824 | spi = spi_alloc_device(master); | ||
825 | if (!spi) { | ||
826 | dev_err(&master->dev, "spi_device alloc error for %s\n", | ||
827 | nc->full_name); | ||
828 | spi_dev_put(spi); | ||
829 | continue; | ||
830 | } | ||
831 | |||
832 | /* Select device driver */ | ||
833 | if (of_modalias_node(nc, spi->modalias, | ||
834 | sizeof(spi->modalias)) < 0) { | ||
835 | dev_err(&master->dev, "cannot find modalias for %s\n", | ||
836 | nc->full_name); | ||
837 | spi_dev_put(spi); | ||
838 | continue; | ||
839 | } | ||
840 | |||
841 | /* Device address */ | ||
842 | prop = of_get_property(nc, "reg", &len); | ||
843 | if (!prop || len < sizeof(*prop)) { | ||
844 | dev_err(&master->dev, "%s has no 'reg' property\n", | ||
845 | nc->full_name); | ||
846 | spi_dev_put(spi); | ||
847 | continue; | ||
848 | } | ||
849 | spi->chip_select = be32_to_cpup(prop); | ||
850 | |||
851 | /* Mode (clock phase/polarity/etc.) */ | ||
852 | if (of_find_property(nc, "spi-cpha", NULL)) | ||
853 | spi->mode |= SPI_CPHA; | ||
854 | if (of_find_property(nc, "spi-cpol", NULL)) | ||
855 | spi->mode |= SPI_CPOL; | ||
856 | if (of_find_property(nc, "spi-cs-high", NULL)) | ||
857 | spi->mode |= SPI_CS_HIGH; | ||
858 | |||
859 | /* Device speed */ | ||
860 | prop = of_get_property(nc, "spi-max-frequency", &len); | ||
861 | if (!prop || len < sizeof(*prop)) { | ||
862 | dev_err(&master->dev, "%s has no 'spi-max-frequency' property\n", | ||
863 | nc->full_name); | ||
864 | spi_dev_put(spi); | ||
865 | continue; | ||
866 | } | ||
867 | spi->max_speed_hz = be32_to_cpup(prop); | ||
868 | |||
869 | /* IRQ */ | ||
870 | spi->irq = irq_of_parse_and_map(nc, 0); | ||
871 | |||
872 | /* Store a pointer to the node in the device structure */ | ||
873 | of_node_get(nc); | ||
874 | spi->dev.of_node = nc; | ||
875 | |||
876 | /* Register the new device */ | ||
877 | request_module(spi->modalias); | ||
878 | rc = spi_add_device(spi); | ||
879 | if (rc) { | ||
880 | dev_err(&master->dev, "spi_device register error %s\n", | ||
881 | nc->full_name); | ||
882 | spi_dev_put(spi); | ||
883 | } | ||
884 | |||
885 | } | ||
886 | } | ||
887 | #else | ||
888 | static void of_register_spi_devices(struct spi_master *master) { } | ||
889 | #endif | ||
890 | |||
801 | static void spi_master_release(struct device *dev) | 891 | static void spi_master_release(struct device *dev) |
802 | { | 892 | { |
803 | struct spi_master *master; | 893 | struct spi_master *master; |