[PATCH 3/6] arm/tegra: prepare early init for multiple tegra variants

[Stephen Warren]

Peter De Schrijver wrote at Tuesday, October 25, 2011 10:54 AM:
> This patch splits the early init code in a common and a tegra20 specific part.

> diff --git a/arch/arm/mach-tegra/board-dt.c b/arch/arm/mach-tegra/board-dt.c

> +static void __init tegra_init_early(void)
> +{
> +
> +	int i;
> +
> +	for (i = 0; i < ARRAY_SIZE(early_init); i++)
> +		if (of_machine_is_compatible(early_init[i].machine))
> +			return early_init[i].init();
> +
> +	printk(KERN_WARNING "Unknown platform detected\n");

pr_warn/WARN/WARN_ON?

> diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c

> @@ -31,8 +31,6 @@
>  #include "clock.h"
>  #include "fuse.h"
> 
> -void (*arch_reset)(char mode, const char *cmd) = tegra_assert_system_reset;
> -
>  void tegra_assert_system_reset(char mode, const char *cmd)
>  {
>  	void __iomem *reset = IO_ADDRESS(TEGRA_CLK_RESET_BASE + 0x04);
> @@ -44,7 +42,9 @@ void tegra_assert_system_reset(char mode, const char *cmd)
>  	writel_relaxed(reg, reset);
>  }
> 
> -static __initdata struct tegra_clk_init_table common_clk_init_table[] = {
> +void (*arch_reset)(char mode, const char *cmd) = tegra_assert_system_reset;

I'm not sure why you moved that, but I suppose it's fine.

> +
> +static __initdata struct tegra_clk_init_table tegra20_clk_init_table[] = {
>  	/* name		parent		rate		enabled */
>  	{ "clk_m",	NULL,		0,		true },
>  	{ "pll_p",	"clk_m",	216000000,	true },
> @@ -65,19 +65,25 @@ static void __init tegra_init_cache(void)
>  {
>  #ifdef CONFIG_CACHE_L2X0
>  	void __iomem *p = IO_ADDRESS(TEGRA_ARM_PERIF_BASE) + 0x3000;
> +	u32 aux_ctrl;
> 
>  	writel_relaxed(0x331, p + L2X0_TAG_LATENCY_CTRL);
>  	writel_relaxed(0x441, p + L2X0_DATA_LATENCY_CTRL);
> +	writel(2, p + L2X0_PREFETCH_CTRL);
> +
> +	aux_ctrl = readl(p + L2X0_CACHE_TYPE);
> +	aux_ctrl = (aux_ctrl & 0x700) << (17-8);
> +	aux_ctrl |= 0x6C000001;

This is an unrelated change?

> 
>  	l2x0_init(p, 0x6C080001, 0x8200c3fe);
>  #endif
> 
>  }

-- 
nvpublic