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

Commit 6bd3e3f4 authored by Nicolas Ferre's avatar Nicolas Ferre
Browse files

ARM: at91: move alternative initial mapping to board-dt-sama5.c 



For sama5d4, remove an indirection and the remaining need for at91_boot_soc
structure.
This will allow further cleanup.

Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent 2b019a43

arch/arm/mach-at91/board-dt-sama5.c

+36 −1
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
#include <linux/clk-provider.h>

#include <linux/phy.h>



#include <mach/hardware.h>



#include <asm/setup.h>

#include <asm/irq.h>

#include <asm/mach/arch.h>
@@ -63,6 +65,39 @@ DT_MACHINE_START(sama5_dt, "Atmel SAMA5 (Device Tree)") 
	.dt_compat	= sama5_dt_board_compat,

MACHINE_END



static struct map_desc at91_io_desc[] __initdata = {

	{

	.virtual        = (unsigned long)AT91_ALT_IO_P2V(SAMA5D4_BASE_MPDDRC),

	.pfn            = __phys_to_pfn(SAMA5D4_BASE_MPDDRC),

	.length         = SZ_512,

	.type           = MT_DEVICE,

	},

	{

	.virtual        = (unsigned long)AT91_ALT_IO_P2V(SAMA5D4_BASE_PMC),

	.pfn            = __phys_to_pfn(SAMA5D4_BASE_PMC),

	.length         = SZ_512,

	.type           = MT_DEVICE,

	},

	{ /* On sama5d4, we use USART3 as serial console */

	.virtual        = (unsigned long)AT91_ALT_IO_P2V(SAMA5D4_BASE_USART3),

	.pfn            = __phys_to_pfn(SAMA5D4_BASE_USART3),

	.length         = SZ_256,

	.type           = MT_DEVICE,

	},

	{ /* A bunch of peripheral with fine grained IO space */

	.virtual        = (unsigned long)AT91_ALT_IO_P2V(SAMA5D4_BASE_SYS2),

	.pfn            = __phys_to_pfn(SAMA5D4_BASE_SYS2),

	.length         = SZ_2K,

	.type           = MT_DEVICE,

	},

};



static void __init sama5_alt_map_io(void)

{

	at91_alt_map_io();

	iotable_init(at91_io_desc, ARRAY_SIZE(at91_io_desc));

}



static const char *sama5_alt_dt_board_compat[] __initconst = {

	"atmel,sama5d4",

	NULL
@@ -70,7 +105,7 @@ static const char *sama5_alt_dt_board_compat[] __initconst = { 


DT_MACHINE_START(sama5_alt_dt, "Atmel SAMA5 (Device Tree)")

	/* Maintainer: Atmel */

	.map_io		= at91_alt_map_io,

	.map_io		= sama5_alt_map_io,

	.init_early	= at91_dt_initialize,

	.init_machine	= sama5_dt_device_init,

	.dt_compat	= sama5_alt_dt_board_compat,

arch/arm/mach-at91/sama5d4.c

+0 −33
Original line number Diff line number Diff line
@@ -25,39 +25,6 @@ 
/* --------------------------------------------------------------------

 *  Processor initialization

 * -------------------------------------------------------------------- */

static struct map_desc at91_io_desc[] __initdata = {

	{

	.virtual        = (unsigned long)AT91_ALT_IO_P2V(SAMA5D4_BASE_MPDDRC),

	.pfn            = __phys_to_pfn(SAMA5D4_BASE_MPDDRC),

	.length         = SZ_512,

	.type           = MT_DEVICE,

	},

	{

	.virtual        = (unsigned long)AT91_ALT_IO_P2V(SAMA5D4_BASE_PMC),

	.pfn            = __phys_to_pfn(SAMA5D4_BASE_PMC),

	.length         = SZ_512,

	.type           = MT_DEVICE,

	},

	{ /* On sama5d4, we use USART3 as serial console */

	.virtual        = (unsigned long)AT91_ALT_IO_P2V(SAMA5D4_BASE_USART3),

	.pfn            = __phys_to_pfn(SAMA5D4_BASE_USART3),

	.length         = SZ_256,

	.type           = MT_DEVICE,

	},

	{ /* A bunch of peripheral with fine grained IO space */

	.virtual        = (unsigned long)AT91_ALT_IO_P2V(SAMA5D4_BASE_SYS2),

	.pfn            = __phys_to_pfn(SAMA5D4_BASE_SYS2),

	.length         = SZ_2K,

	.type           = MT_DEVICE,

	},

};





static void __init sama5d4_map_io(void)

{

	iotable_init(at91_io_desc, ARRAY_SIZE(at91_io_desc));

}



AT91_SOC_START(sama5d4)

	.map_io = sama5d4_map_io,

AT91_SOC_END

arch/arm/mach-at91/setup.c

+0 −6
Original line number Diff line number Diff line
@@ -327,12 +327,6 @@ void __init at91_alt_map_io(void) 
	if (at91_soc_initdata.subtype != AT91_SOC_SUBTYPE_NONE)

		pr_info("AT91: Detected soc subtype: %s\n",

			at91_get_soc_subtype(&at91_soc_initdata));



	if (!at91_soc_is_enabled())

		panic("AT91: Soc not enabled");



	if (at91_boot_soc.map_io)

		at91_boot_soc.map_io();

}



void __iomem *at91_matrix_base;