Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull arm-soc Marvell Orion device-tree updates from Olof Johansson:
 "This contains a set of device-tree conversions for Marvell Orion
  platforms that were staged early but took a few tries to get the
  branch into a format where it was suitable for us to pick up.

  Given that most people working on these platforms are hobbyists with
  limited time, we were a bit more flexible with merging it even though
  it came in late."

* tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (21 commits)
  ARM: Kirkwood: Replace mrvl with marvell
  ARM: Kirkwood: Describe GoFlex Net LEDs and SATA in DT.
  ARM: Kirkwood: Describe Dreamplug LEDs in DT.
  ARM: Kirkwood: Describe iConnects LEDs in DT.
  ARM: Kirkwood: Describe iConnects temperature sensor in DT.
  ARM: Kirkwood: Describe IB62x0 LEDs in DT.
  ARM: Kirkwood: Describe IB62x0 gpio-keys in DT.
  ARM: Kirkwood: Describe DNS32? gpio-keys in DT.
  ARM: Kirkwood: Move common portions into a kirkwood-dnskw.dtsi
  ARM: Kirkwood: Replace DNS-320/DNS-325 leds with dt bindings
  ARM: Kirkwood: Describe DNS325 temperature sensor in DT.
  ARM: Kirkwood: Use DT to configure SATA device.
  ARM: kirkwood: use devicetree for SPI on dreamplug
  ARM: kirkwood: Add LS-XHL and LS-CHLv2 support
  ARM: Kirkwood: Initial DTS support for Kirkwood GoFlex Net
  ARM: Kirkwood: Add basic device tree support for QNAP TS219.
  ATA: sata_mv: Add device tree support
  ARM: Orion: DTify the watchdog timer.
  ARM: Orion: Add arch support needed for I2C via DT.
  ARM: kirkwood: use devicetree for orion-spi
  ...

Conflicts:
	drivers/watchdog/orion_wdt.c

2 files changed, 37 insertions, 13 deletions

diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 24712adf69df..311be18d3f03 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -65,6 +65,8 @@
 #include <linux/mbus.h>
 #include <linux/bitops.h>
 #include <linux/gfp.h>
+#include <linux/of.h>
+#include <linux/of_irq.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_device.h>
@@ -4026,7 +4028,7 @@ static int mv_platform_probe(struct platform_device *pdev)
         struct ata_host *host;
         struct mv_host_priv *hpriv;
         struct resource *res;
-        int n_ports = 0;
+        int n_ports = 0, irq = 0;
         int rc;
 #if defined(CONFIG_HAVE_CLK)
         int port;
@@ -4050,8 +4052,14 @@ static int mv_platform_probe(struct platform_device *pdev)
                 return -EINVAL;
 
         /* allocate host */
-        mv_platform_data = pdev->dev.platform_data;
-        n_ports = mv_platform_data->n_ports;
+        if (pdev->dev.of_node) {
+                of_property_read_u32(pdev->dev.of_node, "nr-ports", &n_ports);
+                irq = irq_of_parse_and_map(pdev->dev.of_node, 0);
+        } else {
+                mv_platform_data = pdev->dev.platform_data;
+                n_ports = mv_platform_data->n_ports;
+                irq = platform_get_irq(pdev, 0);
+        }
 
         host = ata_host_alloc_pinfo(&pdev->dev, ppi, n_ports);
         hpriv = devm_kzalloc(&pdev->dev, sizeof(*hpriv), GFP_KERNEL);
@@ -4109,8 +4117,7 @@ static int mv_platform_probe(struct platform_device *pdev)
         dev_info(&pdev->dev, "slots %u ports %d\n",
                  (unsigned)MV_MAX_Q_DEPTH, host->n_ports);
 
-        rc = ata_host_activate(host, platform_get_irq(pdev, 0), mv_interrupt,
-                               IRQF_SHARED, &mv6_sht);
+        rc = ata_host_activate(host, irq, mv_interrupt, IRQF_SHARED, &mv6_sht);
         if (!rc)
                 return 0;
 
@@ -4205,15 +4212,24 @@ static int mv_platform_resume(struct platform_device *pdev)
 #define mv_platform_resume NULL
 #endif
 
+#ifdef CONFIG_OF
+static struct of_device_id mv_sata_dt_ids[] __devinitdata = {
+        { .compatible = "marvell,orion-sata", },
+        {},
+};
+MODULE_DEVICE_TABLE(of, mv_sata_dt_ids);
+#endif
+
 static struct platform_driver mv_platform_driver = {
-        .probe                  = mv_platform_probe,
-        .remove                 = __devexit_p(mv_platform_remove),
-        .suspend                = mv_platform_suspend,
-        .resume                 = mv_platform_resume,
-        .driver                 = {
-                                   .name = DRV_NAME,
-                                   .owner = THIS_MODULE,
-                                  },
+        .probe          = mv_platform_probe,
+        .remove         = __devexit_p(mv_platform_remove),
+        .suspend        = mv_platform_suspend,
+        .resume         = mv_platform_resume,
+        .driver         = {
+                .name = DRV_NAME,
+                .owner = THIS_MODULE,
+                .of_match_table = of_match_ptr(mv_sata_dt_ids),
+        },
 };
 
 
diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index a73bea4aa1ba..c20f96b579d9 100644
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@ -24,6 +24,7 @@
 #include <linux/spinlock.h>
 #include <linux/clk.h>
 #include <linux/err.h>
+#include <linux/of.h>
 #include <mach/bridge-regs.h>
 
 /*
@@ -192,6 +193,12 @@ static void orion_wdt_shutdown(struct platform_device *pdev)
         orion_wdt_stop(&orion_wdt);
 }
 
+static const struct of_device_id orion_wdt_of_match_table[] __devinitdata = {
+        { .compatible = "marvell,orion-wdt", },
+        {},
+};
+MODULE_DEVICE_TABLE(of, orion_wdt_of_match_table);
+
 static struct platform_driver orion_wdt_driver = {
         .probe          = orion_wdt_probe,
         .remove         = __devexit_p(orion_wdt_remove),
@@ -199,6 +206,7 @@ static struct platform_driver orion_wdt_driver = {
         .driver         = {
                 .owner  = THIS_MODULE,
                 .name   = "orion_wdt",
+                .of_match_table = of_match_ptr(orion_wdt_of_match_table),
         },
 };