69d323f231
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
52 lines
1.8 KiB
Diff
52 lines
1.8 KiB
Diff
From fe4fce3c521f5d9f3a64c4d06a73a5e6b7324116 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
Date: Wed, 5 Jun 2013 09:04:57 +0200
|
|
Subject: [PATCH 027/203] arm: mvebu: remove hardcoded static I/O mapping
|
|
|
|
Now that we have removed the need of the static I/O mapping for early
|
|
initialization reasons, and fixed the registers area length that were
|
|
broken, we can get rid of the static I/O mapping. Only the earlyprintk
|
|
mapping needs to be set up, using the debug_ll_io_init() helper
|
|
function.
|
|
|
|
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 | 11 +----------
|
|
arch/arm/mach-mvebu/armada-370-xp.h | 2 --
|
|
2 files changed, 1 insertion(+), 12 deletions(-)
|
|
|
|
--- a/arch/arm/mach-mvebu/armada-370-xp.c
|
|
+++ b/arch/arm/mach-mvebu/armada-370-xp.c
|
|
@@ -29,18 +29,9 @@
|
|
#include "common.h"
|
|
#include "coherency.h"
|
|
|
|
-static struct map_desc armada_370_xp_io_desc[] __initdata = {
|
|
- {
|
|
- .virtual = (unsigned long) ARMADA_370_XP_REGS_VIRT_BASE,
|
|
- .pfn = __phys_to_pfn(ARMADA_370_XP_REGS_PHYS_BASE),
|
|
- .length = ARMADA_370_XP_REGS_SIZE,
|
|
- .type = MT_DEVICE,
|
|
- },
|
|
-};
|
|
-
|
|
static void __init armada_370_xp_map_io(void)
|
|
{
|
|
- iotable_init(armada_370_xp_io_desc, ARRAY_SIZE(armada_370_xp_io_desc));
|
|
+ debug_ll_io_init();
|
|
}
|
|
|
|
static void __init armada_370_xp_timer_and_clk_init(void)
|
|
--- a/arch/arm/mach-mvebu/armada-370-xp.h
|
|
+++ b/arch/arm/mach-mvebu/armada-370-xp.h
|
|
@@ -16,8 +16,6 @@
|
|
#define __MACH_ARMADA_370_XP_H
|
|
|
|
#define ARMADA_370_XP_REGS_PHYS_BASE 0xd0000000
|
|
-#define ARMADA_370_XP_REGS_VIRT_BASE IOMEM(0xfec00000)
|
|
-#define ARMADA_370_XP_REGS_SIZE SZ_1M
|
|
|
|
/* These defines can go away once mvebu-mbus has a DT binding */
|
|
#define ARMADA_370_XP_MBUS_WINS_BASE (ARMADA_370_XP_REGS_PHYS_BASE + 0x20000)
|