Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 488275be authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Jason Cooper
Browse files

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: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 3e0a8f23

arch/arm/mach-mvebu/armada-370-xp.c

+1 −10
Original line number Original line Diff line number Diff line
@@ -28,18 +28,9 @@ 
#include "common.h"

#include "common.h"

#include "coherency.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)

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)

static void __init armada_370_xp_timer_and_clk_init(void)

arch/arm/mach-mvebu/armada-370-xp.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -16,8 +16,6 @@ 
#define __MACH_ARMADA_370_XP_H

#define __MACH_ARMADA_370_XP_H





#define ARMADA_370_XP_REGS_PHYS_BASE	0xd0000000

#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 */

/* 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)

#define ARMADA_370_XP_MBUS_WINS_BASE    (ARMADA_370_XP_REGS_PHYS_BASE + 0x20000)