mvebu: backport mainline patches from kernel 3.11

This is a backport of the patches accepted to the Linux mainline related to
mvebu SoC (Armada XP and Armada 370) between Linux v3.10, and Linux v3.11.
This work mainly covers:

* Enabling USB storage, and PCI to mvebu_defconfig.
* Add support for NOR flash.
* Some PCI device tree related updates, and bus parsing.
* Adding Armada XP & 370 PCI driver, and update some clock gating
  specifics.
* Introduce Marvell EBU Device Bus driver.
* Enaling USB in the armada*.dts.
* Enabling, and updating the mvebu-mbus.
* Some SATA and Ethernet related fixes.

Signed-off-by: Seif Mazareeb <seif.mazareeb@gmail.com>
CC: Luka Perkov <luka@openwrt.org>

SVN-Revision: 39564

1 files changed, 82 insertions, 0 deletions

diff --git a/target/linux/mvebu/patches-3.10/0049-bus-mvebu-mbus-Remove-the-no-longer-used-name-based-.patch b/target/linux/mvebu/patches-3.10/0049-bus-mvebu-mbus-Remove-the-no-longer-used-name-based-.patch
new file mode 100644
index 0000000000..ac97c113c4
--- /dev/null
+++ b/target/linux/mvebu/patches-3.10/0049-bus-mvebu-mbus-Remove-the-no-longer-used-name-based-.patch
@@ -0,0 +1,82 @@
+From 1e94a8740cb1f9c328a3ae8ec4727d90bfb2d7f7 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Fri, 5 Jul 2013 14:54:23 +0200
+Subject: [PATCH 049/203] bus: mvebu-mbus: Remove the no longer used name-based
+ API
+
+Now that every user of the deprecated name-based API has been
+converted to using the ID-based API, let's remove the former one.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Tested-by: Andrew Lunn <andrew@lunn.ch>
+Tested-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
+---
+ drivers/bus/mvebu-mbus.c | 38 --------------------------------------
+ include/linux/mbus.h     |  5 -----
+ 2 files changed, 43 deletions(-)
+
+--- a/drivers/bus/mvebu-mbus.c
++++ b/drivers/bus/mvebu-mbus.c
+@@ -766,44 +766,6 @@ int mvebu_mbus_add_window_remap_by_id(un
+ 	return mvebu_mbus_alloc_window(s, base, size, remap, target, attribute);
+ }
+ 
+-int mvebu_mbus_add_window_remap_flags(const char *devname, phys_addr_t base,
+-				      size_t size, phys_addr_t remap,
+-				      unsigned int flags)
+-{
+-	struct mvebu_mbus_state *s = &mbus_state;
+-	u8 target, attr;
+-	int i;
+-
+-	if (!s->soc->map)
+-		return -ENODEV;
+-
+-	for (i = 0; s->soc->map[i].name; i++)
+-		if (!strcmp(s->soc->map[i].name, devname))
+-			break;
+-
+-	if (!s->soc->map[i].name) {
+-		pr_err("unknown device '%s'\n", devname);
+-		return -ENODEV;
+-	}
+-
+-	target = s->soc->map[i].target;
+-	attr   = s->soc->map[i].attr;
+-
+-	if (flags == MVEBU_MBUS_PCI_MEM)
+-		attr |= 0x8;
+-	else if (flags == MVEBU_MBUS_PCI_WA)
+-		attr |= 0x28;
+-
+-	return mvebu_mbus_add_window_remap_by_id(target, attr, base,
+-						 size, remap);
+-}
+-
+-int mvebu_mbus_add_window(const char *devname, phys_addr_t base, size_t size)
+-{
+-	return mvebu_mbus_add_window_remap_flags(devname, base, size,
+-						 MVEBU_MBUS_NO_REMAP, 0);
+-}
+-
+ int mvebu_mbus_add_window_by_id(unsigned int target, unsigned int attribute,
+ 				phys_addr_t base, size_t size)
+ {
+--- a/include/linux/mbus.h
++++ b/include/linux/mbus.h
+@@ -63,15 +63,10 @@ static inline const struct mbus_dram_tar
+ 
+ void mvebu_mbus_get_pcie_mem_aperture(struct resource *res);
+ void mvebu_mbus_get_pcie_io_aperture(struct resource *res);
+-int mvebu_mbus_add_window_remap_flags(const char *devname, phys_addr_t base,
+-				      size_t size, phys_addr_t remap,
+-				      unsigned int flags);
+ int mvebu_mbus_add_window_remap_by_id(unsigned int target,
+ 				      unsigned int attribute,
+ 				      phys_addr_t base, size_t size,
+ 				      phys_addr_t remap);
+-int mvebu_mbus_add_window(const char *devname, phys_addr_t base,
+-			  size_t size);
+ int mvebu_mbus_add_window_by_id(unsigned int target, unsigned int attribute,
+ 				phys_addr_t base, size_t size);
+ int mvebu_mbus_del_window(phys_addr_t base, size_t size);