From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 1 Mar 2013 04:09:24 +0000 (-0800)
Subject: Merge tag 'late-mvebu-rebased' of git://git.kernel.org/pub/scm/linux/kernel/git/arm... 
X-Git-Tag: v3.9-rc1~35
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1a32c58bb945970e56f27a1cfb61625a3ac0b88e;p=platform%2Fkernel%2Flinux-exynos.git

Merge tag 'late-mvebu-rebased' of git://git./linux/kernel/git/arm/arm-soc

Pull ARM SoC mvebu platform changes from Olof Johansson:
 "This series contains changes for the Marvell EBU platforms (mvebu,
  orion, kirkwood, dove) that were not part of the first set of pull
  requests because of dependencies on the MMC tree, and being submitted
  a little late.

  Notable changes are:

   - More devices get moved out of board files into device tree
     descriptions.  The remaining devices listed in there have patches
     that will get sent for 3.10, after which we can remove a lot of the
     board files entirely.  We are doing the pinctrl and mmc drivers
     here, ethernet and PCI still remain.

   - SMP support for mvebu is improved with support for the local
     interrupt controller.

   - The Guruplug board file gets replaced with a DT description.

  Unfortunately, the dependency on the MMC tree turned out to be a much
  larger problem than expected, when the MMC maintainer rebased the
  patches in his tree that all of the patches in this branch are based
  on, which caused merge conflicts between the new and old versions of
  those patches.

  To work around the merge conflicts, this branch rebases all patches on
  top of the respective MMC patches that did get merged into 3.9.  The
  patches are all identical to the versions that were part of
  linux-next, but have a new commit date."

* tag 'late-mvebu-rebased' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (90 commits)
  arm: mvebu: enable the SD card slot on Armada 370 Reference Design board
  ARM: kirkwood: topkick: init mvsdio via DT
  ARM: kirkwood: nsa310: convert to pinctrl
  ARM: Kirkwood: topkick: Enable i2c bus.
  ARM: kirkwood: topkick: convert to pinctrl
  ARM: dove: convert serial DT nodes to clocks property
  arm: mvebu: Add SPI flash on Armada 370 DB board
  arm: mvebu: Add SPI flash on Armada XP-DB board
  arm: mvebu: Add SPI flash on Armada XP-GP board
  arm: mvebu: Add support for SPI controller in Armada 370/XP
  clocksource: update and move armada-370-xp-timer documentation to timer directory
  arm: mvebu: update DT to support local timers
  ARM: Dove: convert usb host controller to DT
  arm: mvebu: Enable USB controllers on Armada 370/XP boards
  arm: mvebu: Add support for USB host controllers in Armada 370/XP
  arm: mvebu: add button for OpenBlocks AX3-4
  ARM: Kirkwood: Convert NS2 to gpio-poweroff.
  ARM: Kirkwood: Convert NSA310 I2C to device tree
  ARM: Kirkwood: Convert NSA310 to use gpio-poweroff driver
  ARM: Kirkwood: Convert NSA310 to DT based regulators.
  ...
---

1a32c58bb945970e56f27a1cfb61625a3ac0b88e
diff --cc arch/arm/boot/dts/Makefile
index e007134,157fbeb..9c62558
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -78,19 -78,13 +79,21 @@@ dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.
  	msm8960-cdp.dtb
  dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
  	armada-370-mirabox.dtb \
+ 	armada-370-rd.dtb \
  	armada-xp-db.dtb \
+ 	armada-xp-gp.dtb \
  	armada-xp-openblocks-ax3-4.dtb
 -dtb-$(CONFIG_ARCH_MXC) += imx51-babbage.dtb \
 +dtb-$(CONFIG_ARCH_MXC) += \
 +	imx25-karo-tx25.dtb \
 +	imx25-pdk.dtb \
 +	imx27-apf27.dtb \
 +	imx27-pdk.dtb \
 +	imx31-bug.dtb \
 +	imx51-apf51.dtb \
 +	imx51-babbage.dtb \
  	imx53-ard.dtb \
  	imx53-evk.dtb \
 +	imx53-mba53.dtb \
  	imx53-qsb.dtb \
  	imx53-smd.dtb \
  	imx6q-arm2.dtb \
diff --cc arch/arm/mach-kirkwood/board-nsa310.c
index 970174a,544f83a..55ade93
--- a/arch/arm/mach-kirkwood/board-nsa310.c
+++ b/arch/arm/mach-kirkwood/board-nsa310.c
@@@ -10,8 -10,7 +10,6 @@@
  
  #include <linux/kernel.h>
  #include <linux/init.h>
- #include <linux/gpio.h>
--#include <linux/i2c.h>
  #include <mach/kirkwood.h>
  #include <linux/of.h>
  #include "common.h"