Commit 05d900c9 authored by Sascha Hauer's avatar Sascha Hauer
Browse files

Merge branches 'cleanups/mx3-mm-v2' and 'cleanups/mxs' into imx-cleanup

parents 6da5ce17 f548897f a6d34048

arch/arm/mach-imx/Makefile

+2 −3
Original line number Diff line number Diff line
@@ -8,9 +8,8 @@ obj-$(CONFIG_SOC_IMX25) += clock-imx25.o mm-imx25.o ehci-imx25.o 
obj-$(CONFIG_SOC_IMX27) += cpu-imx27.o pm-imx27.o

obj-$(CONFIG_SOC_IMX27) += clock-imx27.o mm-imx27.o ehci-imx27.o



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

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

obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.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



# 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-imx35.c→arch/arm/mach-imx/mm-imx3.c

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



#include <asm/pgtable.h>

#include <asm/mach/map.h>

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

#include <asm/mach/map.h>



#include <mach/common.h>

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

#include <mach/irqs.h>



static void imx3_idle(void)

{

	unsigned long reg = 0;

	__asm__ __volatile__(

		/* disable I and D cache */

		"mrc p15, 0, %0, c1, c0, 0\n"

		"bic %0, %0, #0x00001000\n"

		"bic %0, %0, #0x00000004\n"

		"mcr p15, 0, %0, c1, c0, 0\n"

		/* invalidate I cache */

		"mov %0, #0\n"

		"mcr p15, 0, %0, c7, c5, 0\n"

		/* clear and invalidate D cache */

		"mov %0, #0\n"

		"mcr p15, 0, %0, c7, c14, 0\n"

		/* WFI */

		"mov %0, #0\n"

		"mcr p15, 0, %0, c7, c0, 4\n"

		"nop\n" "nop\n" "nop\n" "nop\n"

		"nop\n" "nop\n" "nop\n"

		/* enable I and D cache */

		"mrc p15, 0, %0, c1, c0, 0\n"

		"orr %0, %0, #0x00001000\n"

		"orr %0, %0, #0x00000004\n"

		"mcr p15, 0, %0, c1, c0, 0\n"

		: "=r" (reg));

}



static void __iomem *imx3_ioremap(unsigned long phys_addr, size_t size,

				  unsigned int mtype)

{

	if (mtype == MT_DEVICE) {

		/*

		 * Access all peripherals below 0x80000000 as nonshared device

		 * on mx3, but leave l2cc alone.  Otherwise cache corruptions

		 * can occur.

		 */

		if (phys_addr < 0x80000000 &&

				!addr_in_module(phys_addr, MX3x_L2CC))

			mtype = MT_DEVICE_NONSHARED;

	}



	return __arm_ioremap(phys_addr, size, mtype);

}



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),

	imx_map_entry(MX31, AIPS1, MT_DEVICE_NONSHARED),

	imx_map_entry(MX31, AIPS2, MT_DEVICE_NONSHARED),

	imx_map_entry(MX31, SPBA0, MT_DEVICE_NONSHARED),

};



/*

 * This function initializes the memory map. It is called during the

 * system startup to create static physical to virtual memory mappings

 * for the IO modules.

 */

void __init mx31_map_io(void)

{

	iotable_init(mx31_io_desc, ARRAY_SIZE(mx31_io_desc));

}



static struct map_desc mx35_io_desc[] __initdata = {

	imx_map_entry(MX35, X_MEMC, MT_DEVICE),

	imx_map_entry(MX35, AVIC, MT_DEVICE_NONSHARED),
@@ -43,11 +139,26 @@ void __init mx35_map_io(void) 
	iotable_init(mx35_io_desc, ARRAY_SIZE(mx35_io_desc));

}



void __init imx31_init_early(void)

{

	mxc_set_cpu_type(MXC_CPU_MX31);

	mxc_arch_reset_init(MX31_IO_ADDRESS(MX31_WDOG_BASE_ADDR));

	imx_idle = imx3_idle;

	imx_ioremap = imx3_ioremap;

}



void __init imx35_init_early(void)

{

	mxc_set_cpu_type(MXC_CPU_MX35);

	mxc_iomux_v3_init(MX35_IO_ADDRESS(MX35_IOMUXC_BASE_ADDR));

	mxc_arch_reset_init(MX35_IO_ADDRESS(MX35_WDOG_BASE_ADDR));

	imx_idle = imx3_idle;

	imx_ioremap = imx3_ioremap;

}



void __init mx31_init_irq(void)

{

	mxc_init_irq(MX31_IO_ADDRESS(MX31_AVIC_BASE_ADDR));

}



void __init mx35_init_irq(void)
@@ -55,6 +166,40 @@ void __init mx35_init_irq(void) 
	mxc_init_irq(MX35_IO_ADDRESS(MX35_AVIC_BASE_ADDR));

}



static struct sdma_script_start_addrs imx31_to1_sdma_script __initdata = {

	.per_2_per_addr = 1677,

};



static struct sdma_script_start_addrs imx31_to2_sdma_script __initdata = {

	.ap_2_ap_addr = 423,

	.ap_2_bp_addr = 829,

	.bp_2_ap_addr = 1029,

};



static struct sdma_platform_data imx31_sdma_pdata __initdata = {

	.fw_name = "sdma-imx31-to2.bin",

	.script_addrs = &imx31_to2_sdma_script,

};



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);



	if (to_version == 1) {

		strncpy(imx31_sdma_pdata.fw_name, "sdma-imx31-to1.bin",

			strlen(imx31_sdma_pdata.fw_name));

		imx31_sdma_pdata.script_addrs = &imx31_to1_sdma_script;

	}



	imx_add_imx_sdma("imx31-sdma", MX31_SDMA_BASE_ADDR, MX31_INT_SDMA, &imx31_sdma_pdata);

}



static struct sdma_script_start_addrs imx35_to1_sdma_script __initdata = {

	.ap_2_ap_addr = 642,

	.uart_2_mcu_addr = 817,
@@ -94,6 +239,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);

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

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

 *  Copyright (C) 1999,2000 Arm Limited

 *  Copyright (C) 2000 Deep Blue Solutions Ltd

 *  Copyright (C) 2002 Shane Nay (shane@minirl.com)

 *  Copyright 2005-2007 Freescale Semiconductor, Inc. All Rights Reserved.

 *    - add MX31 specific definitions

 *

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

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include <linux/mm.h>

#include <linux/init.h>

#include <linux/err.h>



#include <asm/pgtable.h>

#include <asm/mach/map.h>



#include <mach/common.h>

#include <mach/devices-common.h>

#include <mach/hardware.h>

#include <mach/iomux-v3.h>

#include <mach/irqs.h>



static struct map_desc mx31_io_desc[] __initdata = {

	imx_map_entry(MX31, X_MEMC, MT_DEVICE),

	imx_map_entry(MX31, AVIC, MT_DEVICE_NONSHARED),

	imx_map_entry(MX31, AIPS1, MT_DEVICE_NONSHARED),

	imx_map_entry(MX31, AIPS2, MT_DEVICE_NONSHARED),

	imx_map_entry(MX31, SPBA0, MT_DEVICE_NONSHARED),

};



/*

 * This function initializes the memory map. It is called during the

 * system startup to create static physical to virtual memory mappings

 * for the IO modules.

 */

void __init mx31_map_io(void)

{

	iotable_init(mx31_io_desc, ARRAY_SIZE(mx31_io_desc));

}



void __init imx31_init_early(void)

{

	mxc_set_cpu_type(MXC_CPU_MX31);

	mxc_arch_reset_init(MX31_IO_ADDRESS(MX31_WDOG_BASE_ADDR));

}



void __init mx31_init_irq(void)

{

	mxc_init_irq(MX31_IO_ADDRESS(MX31_AVIC_BASE_ADDR));

}



static struct sdma_script_start_addrs imx31_to1_sdma_script __initdata = {

	.per_2_per_addr = 1677,

};



static struct sdma_script_start_addrs imx31_to2_sdma_script __initdata = {

	.ap_2_ap_addr = 423,

	.ap_2_bp_addr = 829,

	.bp_2_ap_addr = 1029,

};



static struct sdma_platform_data imx31_sdma_pdata __initdata = {

	.fw_name = "sdma-imx31-to2.bin",

	.script_addrs = &imx31_to2_sdma_script,

};



void __init imx31_soc_init(void)

{

	int to_version = mx31_revision() >> 4;



	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);



	if (to_version == 1) {

		strncpy(imx31_sdma_pdata.fw_name, "sdma-imx31-to1.bin",

			strlen(imx31_sdma_pdata.fw_name));

		imx31_sdma_pdata.script_addrs = &imx31_to1_sdma_script;

	}



	imx_add_imx_sdma("imx31-sdma", MX31_SDMA_BASE_ADDR, MX31_INT_SDMA, &imx31_sdma_pdata);

}

arch/arm/mach-imx/pm-imx27.c

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#include <linux/suspend.h>

#include <linux/io.h>

#include <mach/system.h>

#include <mach/mx27.h>

#include <mach/hardware.h>



static int mx27_suspend_enter(suspend_state_t state)

{