diff options
| author | Luka Perkov <luka@openwrt.org> | 2014-02-11 02:07:38 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2014-02-11 02:07:38 +0000 |
| commit | 69d323f23119ce6986c2803f34d95869144a00e6 (patch) | |
| tree | 15747b34c6f9a8dfb622f3d61cbffe043f67e573 /target/linux/mvebu/patches-3.10/0052-bus-mvebu-mbus-Factorize-Armada-370-XP-data-structur.patch | |
| parent | 31fb795fd01ac711ff6ca881271fdd4268e34570 (diff) | |
| download | upstream-69d323f23119ce6986c2803f34d95869144a00e6.tar.gz upstream-69d323f23119ce6986c2803f34d95869144a00e6.tar.bz2 upstream-69d323f23119ce6986c2803f34d95869144a00e6.zip | |
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
Diffstat (limited to 'target/linux/mvebu/patches-3.10/0052-bus-mvebu-mbus-Factorize-Armada-370-XP-data-structur.patch')
| -rw-r--r-- | target/linux/mvebu/patches-3.10/0052-bus-mvebu-mbus-Factorize-Armada-370-XP-data-structur.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/target/linux/mvebu/patches-3.10/0052-bus-mvebu-mbus-Factorize-Armada-370-XP-data-structur.patch b/target/linux/mvebu/patches-3.10/0052-bus-mvebu-mbus-Factorize-Armada-370-XP-data-structur.patch new file mode 100644 index 0000000000..382aa438b5 --- /dev/null +++ b/target/linux/mvebu/patches-3.10/0052-bus-mvebu-mbus-Factorize-Armada-370-XP-data-structur.patch @@ -0,0 +1,48 @@ +From 2c8f0b1810ff9cd45ed2055441b4c43afcfb7d2a Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Date: Fri, 5 Jul 2013 14:54:26 +0200 +Subject: [PATCH 052/203] bus: mvebu-mbus: Factorize Armada 370/XP data + structures + +These structures were only different in the mapping tables. +Now that those tables have been removed, it doesn't make any sense +to keep different structures. + +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 | 14 +++----------- + 1 file changed, 3 insertions(+), 11 deletions(-) + +--- a/drivers/bus/mvebu-mbus.c ++++ b/drivers/bus/mvebu-mbus.c +@@ -536,15 +536,7 @@ mvebu_mbus_dove_setup_cpu_target(struct + mvebu_mbus_dram_info.num_cs = cs; + } + +-static const struct mvebu_mbus_soc_data armada_370_mbus_data = { +- .num_wins = 20, +- .num_remappable_wins = 8, +- .win_cfg_offset = armada_370_xp_mbus_win_offset, +- .setup_cpu_target = mvebu_mbus_default_setup_cpu_target, +- .show_cpu_target = mvebu_sdram_debug_show_orion, +-}; +- +-static const struct mvebu_mbus_soc_data armada_xp_mbus_data = { ++static const struct mvebu_mbus_soc_data armada_370_xp_mbus_data = { + .num_wins = 20, + .num_remappable_wins = 8, + .win_cfg_offset = armada_370_xp_mbus_win_offset, +@@ -604,9 +596,9 @@ static const struct mvebu_mbus_soc_data + */ + static const struct of_device_id of_mvebu_mbus_ids[] = { + { .compatible = "marvell,armada370-mbus", +- .data = &armada_370_mbus_data, }, ++ .data = &armada_370_xp_mbus_data, }, + { .compatible = "marvell,armadaxp-mbus", +- .data = &armada_xp_mbus_data, }, ++ .data = &armada_370_xp_mbus_data, }, + { .compatible = "marvell,kirkwood-mbus", + .data = &kirkwood_mbus_data, }, + { .compatible = "marvell,dove-mbus", |