Commit 526b2641 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'imx/cleanup' into imx/devel 



This helps resolve the conflicts between the imx cleanups and the
new code that has gone into the imx tree.
Conflict resolution was originally done by Sascha Hauer.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 4c4cbce6 05d900c9

arch/arm/mach-imx/Makefile

+7 −8
Original line number Diff line number Diff line 
obj-$(CONFIG_IMX_HAVE_DMA_V1) += dma-v1.o



obj-$(CONFIG_ARCH_MX1) += clock-imx1.o mm-imx1.o

obj-$(CONFIG_MACH_MX21) += clock-imx21.o mm-imx21.o

obj-$(CONFIG_SOC_IMX1) += clock-imx1.o mm-imx1.o

obj-$(CONFIG_SOC_IMX21) += clock-imx21.o mm-imx21.o



obj-$(CONFIG_ARCH_MX25) += clock-imx25.o mm-imx25.o ehci-imx25.o cpu-imx25.o

obj-$(CONFIG_SOC_IMX25) += clock-imx25.o mm-imx25.o ehci-imx25.o cpu-imx25.o



obj-$(CONFIG_MACH_MX27) += cpu-imx27.o pm-imx27.o

obj-$(CONFIG_MACH_MX27) += clock-imx27.o mm-imx27.o ehci-imx27.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;

}

early_initcall(mxc_init_l2x0);

arch/arm/mach-imx/mach-armadillo5x0.c

+7 −11
Original line number Diff line number Diff line
@@ -314,25 +314,19 @@ static struct mtd_partition armadillo5x0_nor_flash_partitions[] = { 
	},

};



static struct physmap_flash_data armadillo5x0_nor_flash_pdata = {

static const struct physmap_flash_data

		armadillo5x0_nor_flash_pdata __initconst = {

	.width		= 2,

	.parts		= armadillo5x0_nor_flash_partitions,

	.nr_parts	= ARRAY_SIZE(armadillo5x0_nor_flash_partitions),

};



static struct resource armadillo5x0_nor_flash_resource = {

static const struct resource armadillo5x0_nor_flash_resource __initconst = {

	.flags		= IORESOURCE_MEM,

	.start		= MX31_CS0_BASE_ADDR,

	.end		= MX31_CS0_BASE_ADDR + SZ_64M - 1,

};



static struct platform_device armadillo5x0_nor_flash = {

	.name			= "physmap-flash",

	.id			= -1,

	.num_resources		= 1,

	.resource		= &armadillo5x0_nor_flash_resource,

};



/*

 * FB support

 */
@@ -514,8 +508,10 @@ static void __init armadillo5x0_init(void) 
	imx31_add_mx3_sdc_fb(&mx3fb_pdata);



	/* Register NOR Flash */

	mxc_register_device(&armadillo5x0_nor_flash,

			    &armadillo5x0_nor_flash_pdata);

	platform_device_register_resndata(NULL, "physmap-flash", -1,

			&armadillo5x0_nor_flash_resource, 1,

			&armadillo5x0_nor_flash_pdata,

			sizeof(armadillo5x0_nor_flash_pdata));



	/* Register NAND Flash */

	imx31_add_mxc_nand(&armadillo5x0_nand_board_info);

arch/arm/mach-imx/mach-cpuimx35.c

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static struct i2c_board_info eukrea_cpuimx35_i2c_devices[] = { 
		I2C_BOARD_INFO("tsc2007", 0x48),

		.type		= "tsc2007",

		.platform_data	= &tsc2007_info,

		.irq		= gpio_to_irq(TSC2007_IRQGPIO),

		.irq		= IMX_GPIO_TO_IRQ(TSC2007_IRQGPIO),

	},

};

arch/arm/mach-imx/mach-mx1ads.c

+5 −10
Original line number Diff line number Diff line
@@ -68,23 +68,16 @@ static const struct imxuart_platform_data uart1_pdata __initconst = { 
 * Physmap flash

 */



static struct physmap_flash_data mx1ads_flash_data = {

static const struct physmap_flash_data mx1ads_flash_data __initconst = {

	.width		= 4,		/* bankwidth in bytes */

};



static struct resource flash_resource = {

static const struct resource flash_resource __initconst = {

	.start	= MX1_CS0_PHYS,

	.end	= MX1_CS0_PHYS + SZ_32M - 1,

	.flags	= IORESOURCE_MEM,

};



static struct platform_device flash_device = {

	.name	= "physmap-flash",

	.id	= 0,

	.resource = &flash_resource,

	.num_resources = 1,

};



/*

 * I2C

 */
@@ -125,7 +118,9 @@ static void __init mx1ads_init(void) 
	imx1_add_imx_uart1(&uart1_pdata);



	/* Physmap flash */

	mxc_register_device(&flash_device, &mx1ads_flash_data);

	platform_device_register_resndata(NULL, "physmap-flash", 0,

			&flash_resource, 1,

			&mx1ads_flash_data, sizeof(mx1ads_flash_data));



	/* I2C */

	i2c_register_board_info(0, mx1ads_i2c_devices,