From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 2 Aug 2012 18:50:24 +0000 (-0700)
Subject: Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~14277
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=44d82e2963551eafa378a3fc7a923df7853af4e2;p=mirror_ubuntu-artful-kernel.git

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
---

44d82e2963551eafa378a3fc7a923df7853af4e2
diff --cc drivers/watchdog/orion_wdt.c
index a73bea4aa1ba,1531e0256c34..c20f96b579d9
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@@ -23,7 -24,8 +23,8 @@@
  #include <linux/io.h>
  #include <linux/spinlock.h>
  #include <linux/clk.h>
 +#include <linux/err.h>
+ #include <linux/of.h>
  #include <mach/bridge-regs.h>
  
  /*
@@@ -189,9 -292,16 +190,15 @@@ static int __devexit orion_wdt_remove(s
  
  static void orion_wdt_shutdown(struct platform_device *pdev)
  {
 -	if (test_bit(WDT_IN_USE, &wdt_status))
 -		orion_wdt_disable();
 +	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),