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

Commit c37c07dd authored by Peter De Schrijver's avatar Peter De Schrijver Committed by Olof Johansson
Browse files

arm/tegra: prepare early init for multiple tegra variants 



This patch splits the early init code in a common and a tegra20 specific part.

Signed-off-by: default avatarPeter De Schrijver <pdeschrijver@nvidia.com>
Acked-by: default avatarStephen Warren <swarren@nvidia.com>
Acked-by: default avatarColin Cross <ccross@android.com>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 8e4fab2c

arch/arm/mach-tegra/board-dt.c

+4 −15
Original line number Original line Diff line number Diff line
@@ -53,17 +53,6 @@ void seaboard_pinmux_init(void); 
void trimslice_pinmux_init(void);

void trimslice_pinmux_init(void);

void ventana_pinmux_init(void);

void ventana_pinmux_init(void);





static const struct of_device_id tegra_dt_irq_match[] __initconst = {

	{ .compatible = "arm,cortex-a9-gic", .data = gic_of_init },

	{ }

};



void __init tegra_dt_init_irq(void)

{

	tegra_init_irq();

	of_irq_init(tegra_dt_irq_match);

}



struct of_dev_auxdata tegra20_auxdata_lookup[] __initdata = {

struct of_dev_auxdata tegra20_auxdata_lookup[] __initdata = {

	OF_DEV_AUXDATA("nvidia,tegra20-sdhci", TEGRA_SDMMC1_BASE, "sdhci-tegra.0", NULL),

	OF_DEV_AUXDATA("nvidia,tegra20-sdhci", TEGRA_SDMMC1_BASE, "sdhci-tegra.0", NULL),

	OF_DEV_AUXDATA("nvidia,tegra20-sdhci", TEGRA_SDMMC2_BASE, "sdhci-tegra.1", NULL),

	OF_DEV_AUXDATA("nvidia,tegra20-sdhci", TEGRA_SDMMC2_BASE, "sdhci-tegra.1", NULL),
@@ -139,7 +128,7 @@ static void __init tegra_dt_init(void) 
		"Unknown platform! Pinmuxing not initialized\n");

		"Unknown platform! Pinmuxing not initialized\n");

}

}





static const char * tegra_dt_board_compat[] = {

static const char *tegra20_dt_board_compat[] = {

	"compulab,trimslice",

	"compulab,trimslice",

	"nvidia,harmony",

	"nvidia,harmony",

	"compal,paz00",

	"compal,paz00",
@@ -148,12 +137,12 @@ static const char * tegra_dt_board_compat[] = { 
	NULL

	NULL

};

};





DT_MACHINE_START(TEGRA_DT, "nVidia Tegra (Flattened Device Tree)")

DT_MACHINE_START(TEGRA_DT, "nVidia Tegra20 (Flattened Device Tree)")

	.map_io		= tegra_map_common_io,

	.map_io		= tegra_map_common_io,

	.init_early	= tegra_init_early,

	.init_early	= tegra20_init_early,

	.init_irq	= tegra_dt_init_irq,

	.init_irq	= tegra_dt_init_irq,

	.handle_irq	= gic_handle_irq,

	.handle_irq	= gic_handle_irq,

	.timer		= &tegra_timer,

	.timer		= &tegra_timer,

	.init_machine	= tegra_dt_init,

	.init_machine	= tegra_dt_init,

	.dt_compat	= tegra_dt_board_compat,

	.dt_compat	= tegra20_dt_board_compat,

MACHINE_END
 
MACHINE_END

arch/arm/mach-tegra/board-harmony.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -186,7 +186,7 @@ MACHINE_START(HARMONY, "harmony") 
	.atag_offset	= 0x100,

	.atag_offset	= 0x100,

	.fixup		= tegra_harmony_fixup,

	.fixup		= tegra_harmony_fixup,

	.map_io         = tegra_map_common_io,

	.map_io         = tegra_map_common_io,

	.init_early	= tegra_init_early,

	.init_early	= tegra20_init_early,

	.init_irq       = tegra_init_irq,

	.init_irq       = tegra_init_irq,

	.handle_irq	= gic_handle_irq,

	.handle_irq	= gic_handle_irq,

	.timer          = &tegra_timer,

	.timer          = &tegra_timer,

arch/arm/mach-tegra/board-paz00.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -189,7 +189,7 @@ MACHINE_START(PAZ00, "Toshiba AC100 / Dynabook AZ") 
	.atag_offset	= 0x100,

	.atag_offset	= 0x100,

	.fixup		= tegra_paz00_fixup,

	.fixup		= tegra_paz00_fixup,

	.map_io         = tegra_map_common_io,

	.map_io         = tegra_map_common_io,

	.init_early	= tegra_init_early,

	.init_early	= tegra20_init_early,

	.init_irq       = tegra_init_irq,

	.init_irq       = tegra_init_irq,

	.handle_irq	= gic_handle_irq,

	.handle_irq	= gic_handle_irq,

	.timer          = &tegra_timer,

	.timer          = &tegra_timer,

arch/arm/mach-tegra/board-seaboard.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -283,7 +283,7 @@ static void __init tegra_wario_init(void) 
MACHINE_START(SEABOARD, "seaboard")

MACHINE_START(SEABOARD, "seaboard")

	.atag_offset    = 0x100,

	.atag_offset    = 0x100,

	.map_io         = tegra_map_common_io,

	.map_io         = tegra_map_common_io,

	.init_early     = tegra_init_early,

	.init_early     = tegra20_init_early,

	.init_irq       = tegra_init_irq,

	.init_irq       = tegra_init_irq,

	.handle_irq	= gic_handle_irq,

	.handle_irq	= gic_handle_irq,

	.timer          = &tegra_timer,

	.timer          = &tegra_timer,
@@ -293,7 +293,7 @@ MACHINE_END 
MACHINE_START(KAEN, "kaen")

MACHINE_START(KAEN, "kaen")

	.atag_offset    = 0x100,

	.atag_offset    = 0x100,

	.map_io         = tegra_map_common_io,

	.map_io         = tegra_map_common_io,

	.init_early     = tegra_init_early,

	.init_early     = tegra20_init_early,

	.init_irq       = tegra_init_irq,

	.init_irq       = tegra_init_irq,

	.handle_irq	= gic_handle_irq,

	.handle_irq	= gic_handle_irq,

	.timer          = &tegra_timer,

	.timer          = &tegra_timer,
@@ -303,7 +303,7 @@ MACHINE_END 
MACHINE_START(WARIO, "wario")

MACHINE_START(WARIO, "wario")

	.atag_offset    = 0x100,

	.atag_offset    = 0x100,

	.map_io         = tegra_map_common_io,

	.map_io         = tegra_map_common_io,

	.init_early     = tegra_init_early,

	.init_early     = tegra20_init_early,

	.init_irq       = tegra_init_irq,

	.init_irq       = tegra_init_irq,

	.handle_irq	= gic_handle_irq,

	.handle_irq	= gic_handle_irq,

	.timer          = &tegra_timer,

	.timer          = &tegra_timer,

arch/arm/mach-tegra/board-trimslice.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -175,7 +175,7 @@ MACHINE_START(TRIMSLICE, "trimslice") 
	.atag_offset	= 0x100,

	.atag_offset	= 0x100,

	.fixup		= tegra_trimslice_fixup,

	.fixup		= tegra_trimslice_fixup,

	.map_io         = tegra_map_common_io,

	.map_io         = tegra_map_common_io,

	.init_early	= tegra_init_early,

	.init_early	= tegra20_init_early,

	.init_irq       = tegra_init_irq,

	.init_irq       = tegra_init_irq,

	.handle_irq	= gic_handle_irq,

	.handle_irq	= gic_handle_irq,

	.timer          = &tegra_timer,

	.timer          = &tegra_timer,