Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile...

[~andy/linux] / drivers / spi / spi-orion.c

diff --git a/drivers/spi/spi-orion.c b/drivers/spi/spi-orion.c
index dfd04e91fa6da35d14c89f3aeb874935d41da339..9b0caddce5037b5b347615969ae9c6bd22eaf8f7 100644 (file)
--- a/drivers/spi/spi-orion.c
+++ b/drivers/spi/spi-orion.c
@@ -17,6 +17,7 @@
 #include <linux/io.h>
 #include <linux/spi/spi.h>
 #include <linux/module.h>
+#include <linux/of.h>
 #include <linux/clk.h>
 #include <asm/unaligned.h>
 
@@ -45,7 +46,6 @@ struct orion_spi {
        void __iomem            *base;
        unsigned int            max_speed;
        unsigned int            min_speed;
-       struct orion_spi_info   *spi_info;
        struct clk              *clk;
 };
 
@@ -450,11 +450,10 @@ static int __init orion_spi_probe(struct platform_device *pdev)
        struct spi_master *master;
        struct orion_spi *spi;
        struct resource *r;
-       struct orion_spi_info *spi_info;
        unsigned long tclk_hz;
        int status = 0;
-
-       spi_info = pdev->dev.platform_data;
+       const u32 *iprop;
+       int size;
 
        master = spi_alloc_master(&pdev->dev, sizeof *spi);
        if (master == NULL) {
@@ -464,6 +463,12 @@ static int __init orion_spi_probe(struct platform_device *pdev)
 
        if (pdev->id != -1)
                master->bus_num = pdev->id;
+       if (pdev->dev.of_node) {
+               iprop = of_get_property(pdev->dev.of_node, "cell-index",
+                                       &size);
+               if (iprop && size == sizeof(*iprop))
+                       master->bus_num = *iprop;
+       }
 
        /* we support only mode 0, and no options */
        master->mode_bits = 0;
@@ -476,7 +481,6 @@ static int __init orion_spi_probe(struct platform_device *pdev)
 
        spi = spi_master_get_devdata(master);
        spi->master = master;
-       spi->spi_info = spi_info;
 
        spi->clk = clk_get(&pdev->dev, NULL);
        if (IS_ERR(spi->clk)) {
@@ -511,6 +515,7 @@ static int __init orion_spi_probe(struct platform_device *pdev)
        if (orion_spi_reset(spi) < 0)
                goto out_rel_mem;
 
+       master->dev.of_node = pdev->dev.of_node;
        status = spi_register_master(master);
        if (status < 0)
                goto out_rel_mem;
@@ -552,10 +557,17 @@ static int __exit orion_spi_remove(struct platform_device *pdev)
 
 MODULE_ALIAS("platform:" DRIVER_NAME);
 
+static const struct of_device_id orion_spi_of_match_table[] __devinitdata = {
+       { .compatible = "marvell,orion-spi", },
+       {}
+};
+MODULE_DEVICE_TABLE(of, orion_spi_of_match_table);
+
 static struct platform_driver orion_spi_driver = {
        .driver = {
                .name   = DRIVER_NAME,
                .owner  = THIS_MODULE,
+               .of_match_table = of_match_ptr(orion_spi_of_match_table),
        },
        .remove         = __exit_p(orion_spi_remove),
 };