From: Olof Johansson <olof@lixom.net>
Date: Sun, 10 Feb 2013 01:27:13 +0000 (-0800)
Subject: Merge tag 'davinci-for-v3.9/dt-2' of git://gitorious.org/linux-davinci/linux-davinci... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=93ce285503e375a4a751b632dd7b93291629c5cd;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'davinci-for-v3.9/dt-2' of git://gitorious.org/linux-davinci/linux-davinci into next/dt

From Sekhar Nori:
Second round of DT updates for DaVinci.

This pull request adds support for I2C0 and watchdog timer
for DA850 EVM booting using device tree. It also enables
machine reboot when using device tree.

* tag 'davinci-for-v3.9/dt-2' of git://gitorious.org/linux-davinci/linux-davinci:
  ARM: davinci: da850 DT: add support for machine reboot
  ARM: davinci: da850: add wdt DT node
  ARM: davinci: da850: add DT node for I2C0
---

93ce285503e375a4a751b632dd7b93291629c5cd
diff --cc arch/arm/mach-davinci/include/mach/da8xx.h
index 1b14aea40310,ef9f70ea30a0..de439b7b9af1
--- a/arch/arm/mach-davinci/include/mach/da8xx.h
+++ b/arch/arm/mach-davinci/include/mach/da8xx.h
@@@ -109,8 -110,8 +109,7 @@@ extern struct platform_device da8xx_ser
  extern struct emac_platform_data da8xx_emac_pdata;
  extern struct da8xx_lcdc_platform_data sharp_lcd035q3dg01_pdata;
  extern struct da8xx_lcdc_platform_data sharp_lk043t1dg01_pdata;
 -extern struct davinci_spi_platform_data da8xx_spi_pdata[];
  
- extern struct platform_device da8xx_wdt_device;
  
  extern const short da830_emif25_pins[];
  extern const short da830_spi0_pins[];