Commit ddd5f51b authored by Shawn Guo's avatar Shawn Guo Committed by Sascha Hauer
Browse files

arm/imx: change mxc_init_l2x0() to an imx31/35 specific call 



The mxc_init_l2x0() should really be an imx31/35 specific call.
The patch removes early_initcall from mxc_init_l2x0() and get imx31
and imx35 soc specific function calls mxc_init_l2x0(), so that it's
not necessarily to be called for all imx socs when we build single
image for multiple imx socs.

Thus the function can be renamed to imx3_init_l2x0() and put into
mm-imx3.c.  It also changes the return type from integer to void.
From what I see, the integer was picked just to satisfy early_initcall
prototype.

With the patch 'ARM: l2x0: add empty l2x0_of_init' applied, the code
compiles even without CONFIG_CACHE_L2X0 enabled.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 742b6c6f

arch/arm/mach-imx/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ obj-$(CONFIG_MACH_MX27) += clock-imx27.o mm-imx27.o ehci-imx27.o 


obj-$(CONFIG_SOC_IMX31) += mm-imx3.o cpu-imx31.o clock-imx31.o iomux-imx31.o ehci-imx31.o

obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o clock-imx35.o ehci-imx35.o

obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o



# Support for CMOS sensor interface

obj-$(CONFIG_MX1_VIDEO) += mx1-camera-fiq.o mx1-camera-fiq-ksym.o

arch/arm/mach-imx/cache-l2x0.c

deleted100644 → 0
+0 −56
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2009-2010 Pengutronix

 * Sascha Hauer <s.hauer@pengutronix.de>

 * Juergen Beisert <j.beisert@pengutronix.de>

 *

 * This program is free software; you can redistribute it and/or modify it under

 * the terms of the GNU General Public License version 2 as published by the

 * Free Software Foundation.

 */



#include <linux/init.h>

#include <linux/err.h>

#include <linux/kernel.h>



#include <asm/hardware/cache-l2x0.h>



#include <mach/hardware.h>



static int mxc_init_l2x0(void)

{

	void __iomem *l2x0_base;

	void __iomem *clkctl_base;



	if (!cpu_is_mx31() && !cpu_is_mx35())

		return 0;



/*

 * First of all, we must repair broken chip settings. There are some

 * i.MX35 CPUs in the wild, comming with bogus L2 cache settings. These

 * misconfigured CPUs will run amok immediately when the L2 cache gets enabled.

 * Workaraound is to setup the correct register setting prior enabling the

 * L2 cache. This should not hurt already working CPUs, as they are using the

 * same value.

 */

#define L2_MEM_VAL 0x10



	clkctl_base = ioremap(MX35_CLKCTL_BASE_ADDR, 4096);

	if (clkctl_base != NULL) {

		writel(0x00000515, clkctl_base + L2_MEM_VAL);

		iounmap(clkctl_base);

	} else {

		pr_err("L2 cache: Cannot fix timing. Trying to continue without\n");

	}



	l2x0_base = ioremap(MX3x_L2CC_BASE_ADDR, 4096);

	if (IS_ERR(l2x0_base)) {

		printk(KERN_ERR "remapping L2 cache area failed with %ld\n",

				PTR_ERR(l2x0_base));

		return 0;

	}



	l2x0_init(l2x0_base, 0x00030024, 0x00000000);



	return 0;

}

arch_initcall(mxc_init_l2x0);

arch/arm/mach-imx/mm-imx3.c

+38 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/err.h>



#include <asm/pgtable.h>

#include <asm/hardware/cache-l2x0.h>

#include <asm/mach/map.h>



#include <mach/common.h>
@@ -29,6 +30,39 @@ 
#include <mach/iomux-v3.h>

#include <mach/irqs.h>



void imx3_init_l2x0(void)

{

	void __iomem *l2x0_base;

	void __iomem *clkctl_base;



/*

 * First of all, we must repair broken chip settings. There are some

 * i.MX35 CPUs in the wild, comming with bogus L2 cache settings. These

 * misconfigured CPUs will run amok immediately when the L2 cache gets enabled.

 * Workaraound is to setup the correct register setting prior enabling the

 * L2 cache. This should not hurt already working CPUs, as they are using the

 * same value.

 */

#define L2_MEM_VAL 0x10



	clkctl_base = ioremap(MX35_CLKCTL_BASE_ADDR, 4096);

	if (clkctl_base != NULL) {

		writel(0x00000515, clkctl_base + L2_MEM_VAL);

		iounmap(clkctl_base);

	} else {

		pr_err("L2 cache: Cannot fix timing. Trying to continue without\n");

	}



	l2x0_base = ioremap(MX3x_L2CC_BASE_ADDR, 4096);

	if (IS_ERR(l2x0_base)) {

		printk(KERN_ERR "remapping L2 cache area failed with %ld\n",

				PTR_ERR(l2x0_base));

		return;

	}



	l2x0_init(l2x0_base, 0x00030024, 0x00000000);

}



static struct map_desc mx31_io_desc[] __initdata = {

	imx_map_entry(MX31, X_MEMC, MT_DEVICE),

	imx_map_entry(MX31, AVIC, MT_DEVICE_NONSHARED),
@@ -102,6 +136,8 @@ void __init imx31_soc_init(void) 
{

	int to_version = mx31_revision() >> 4;



	imx3_init_l2x0();



	mxc_register_gpio("imx31-gpio", 0, MX31_GPIO1_BASE_ADDR, SZ_16K, MX31_INT_GPIO1, 0);

	mxc_register_gpio("imx31-gpio", 1, MX31_GPIO2_BASE_ADDR, SZ_16K, MX31_INT_GPIO2, 0);

	mxc_register_gpio("imx31-gpio", 2, MX31_GPIO3_BASE_ADDR, SZ_16K, MX31_INT_GPIO3, 0);
@@ -154,6 +190,8 @@ void __init imx35_soc_init(void) 
{

	int to_version = mx35_revision() >> 4;



	imx3_init_l2x0();



	/* i.mx35 has the i.mx31 type gpio */

	mxc_register_gpio("imx31-gpio", 0, MX35_GPIO1_BASE_ADDR, SZ_16K, MX35_INT_GPIO1, 0);

	mxc_register_gpio("imx31-gpio", 1, MX35_GPIO2_BASE_ADDR, SZ_16K, MX35_INT_GPIO2, 0);

CRA Git | Maintained and supported by SUSTech CRA and CCSE