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 | a8c10d8f903682fb3dde82084665a9a72216b02e (patch) | |
tree | c62a7fd987aaeef721141f541c4477b8427e22ea /target/linux/mvebu/patches-3.10/0026-arm-mvebu-move-cache-and-mvebu-mbus-initialization-l.patch | |
parent | e84b7226b0a6713c4edbb8aab562413766eb64d0 (diff) | |
download | master-187ad058-a8c10d8f903682fb3dde82084665a9a72216b02e.tar.gz master-187ad058-a8c10d8f903682fb3dde82084665a9a72216b02e.tar.bz2 master-187ad058-a8c10d8f903682fb3dde82084665a9a72216b02e.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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39564 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/mvebu/patches-3.10/0026-arm-mvebu-move-cache-and-mvebu-mbus-initialization-l.patch')
-rw-r--r-- | target/linux/mvebu/patches-3.10/0026-arm-mvebu-move-cache-and-mvebu-mbus-initialization-l.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/target/linux/mvebu/patches-3.10/0026-arm-mvebu-move-cache-and-mvebu-mbus-initialization-l.patch b/target/linux/mvebu/patches-3.10/0026-arm-mvebu-move-cache-and-mvebu-mbus-initialization-l.patch new file mode 100644 index 0000000000..de2ed7377c --- /dev/null +++ b/target/linux/mvebu/patches-3.10/0026-arm-mvebu-move-cache-and-mvebu-mbus-initialization-l.patch @@ -0,0 +1,54 @@ +From c7c7e6309ae12f2cb0d9053875876b57bb7587e4 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Date: Wed, 5 Jun 2013 09:04:56 +0200 +Subject: [PATCH 026/203] arm: mvebu: move cache and mvebu-mbus initialization + later + +Current, the L2 cache and the mvebu-mbus drivers are initialized at +->init_early() time. However, at ->init_early() time, ioremap() only +works if a static I/O mapping has already been put in place. If it's +not the case, it tries to do a memory allocation with kmalloc() which +is not possible so early at this stage of the initialization. + +Since we want to get rid of the static I/O mapping, we cannot +initialize the L2 cache driver and the mvebu-mbus driver so early. So, +we move their initialization to the ->init_time() level, which is +slightly later (so ioremap() works properly), but sufficiently early +to be before the call of the ->smp_prepare_cpus() hook, which creates +an address decoding window for the BootROM, which requires the +mvebu-mbus driver to be properly initialized. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Acked-by: Arnd Bergmann <arnd@arndb.de> +Signed-off-by: Jason Cooper <jason@lakedaemon.net> +--- + arch/arm/mach-mvebu/armada-370-xp.c | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +--- a/arch/arm/mach-mvebu/armada-370-xp.c ++++ b/arch/arm/mach-mvebu/armada-370-xp.c +@@ -45,14 +45,11 @@ static void __init armada_370_xp_map_io( + + static void __init armada_370_xp_timer_and_clk_init(void) + { ++ char *mbus_soc_name; ++ + mvebu_clocks_init(); + armada_370_xp_timer_init(); + coherency_init(); +-} +- +-static void __init armada_370_xp_init_early(void) +-{ +- char *mbus_soc_name; + + /* + * This initialization will be replaced by a DT-based +@@ -88,7 +85,6 @@ DT_MACHINE_START(ARMADA_XP_DT, "Marvell + .smp = smp_ops(armada_xp_smp_ops), + .init_machine = armada_370_xp_dt_init, + .map_io = armada_370_xp_map_io, +- .init_early = armada_370_xp_init_early, + .init_irq = irqchip_init, + .init_time = armada_370_xp_timer_and_clk_init, + .restart = mvebu_restart, |