There are lots of conflicts between the omap and exynos cleanups and the memory.h remove series. Conflicts: arch/arm/mach-exynos4/mach-smdkc210.c arch/arm/mach-exynos4/mach-smdkv310.c arch/arm/mach-imx/mach-cpuimx27.c arch/arm/mach-omap1/board-ams-delta.c arch/arm/mach-omap1/board-generic.c arch/arm/mach-omap1/board-h2.c arch/arm/mach-omap1/board-h3.c arch/arm/mach-omap1/board-nokia770.c arch/arm/mach-omap1/board-osk.c arch/arm/mach-omap1/board-palmte.c arch/arm/mach-omap1/board-palmtt.c arch/arm/mach-omap1/board-palmz71.c arch/arm/mach-omap1/board-sx1.c arch/arm/mach-omap1/board-voiceblue.c arch/arm/mach-omap1/io.c arch/arm/mach-omap2/board-generic.c arch/arm/mach-omap2/io.c arch/arm/plat-omap/io.c Signed-off-by: Arnd Bergmann <arnd@arndb.de>
		
			
				
	
	
		
			105 lines
		
	
	
	
		
			2.3 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			105 lines
		
	
	
	
		
			2.3 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * linux/arch/arm/mach-s3c64xx/mach-ncp.c
 | 
						|
 *
 | 
						|
 * Copyright (C) 2008-2009 Samsung Electronics
 | 
						|
 *
 | 
						|
 * 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/kernel.h>
 | 
						|
#include <linux/types.h>
 | 
						|
#include <linux/interrupt.h>
 | 
						|
#include <linux/list.h>
 | 
						|
#include <linux/timer.h>
 | 
						|
#include <linux/init.h>
 | 
						|
#include <linux/serial_core.h>
 | 
						|
#include <linux/platform_device.h>
 | 
						|
#include <linux/io.h>
 | 
						|
#include <linux/i2c.h>
 | 
						|
#include <linux/fb.h>
 | 
						|
#include <linux/gpio.h>
 | 
						|
#include <linux/delay.h>
 | 
						|
 | 
						|
#include <video/platform_lcd.h>
 | 
						|
 | 
						|
#include <asm/mach/arch.h>
 | 
						|
#include <asm/mach/map.h>
 | 
						|
#include <asm/mach/irq.h>
 | 
						|
 | 
						|
#include <mach/hardware.h>
 | 
						|
#include <mach/map.h>
 | 
						|
 | 
						|
#include <asm/irq.h>
 | 
						|
#include <asm/mach-types.h>
 | 
						|
 | 
						|
#include <plat/regs-serial.h>
 | 
						|
#include <plat/iic.h>
 | 
						|
#include <plat/fb.h>
 | 
						|
 | 
						|
#include <plat/s3c6410.h>
 | 
						|
#include <plat/clock.h>
 | 
						|
#include <plat/devs.h>
 | 
						|
#include <plat/cpu.h>
 | 
						|
#include <plat/regs-fb-v4.h>
 | 
						|
 | 
						|
#define UCON S3C2410_UCON_DEFAULT
 | 
						|
#define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE
 | 
						|
#define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE
 | 
						|
 | 
						|
static struct s3c2410_uartcfg ncp_uartcfgs[] __initdata = {
 | 
						|
	/* REVISIT: NCP uses only serial 1, 2 */
 | 
						|
	[0] = {
 | 
						|
		.hwport	     = 0,
 | 
						|
		.flags	     = 0,
 | 
						|
		.ucon	     = UCON,
 | 
						|
		.ulcon	     = ULCON,
 | 
						|
		.ufcon	     = UFCON,
 | 
						|
	},
 | 
						|
	[1] = {
 | 
						|
		.hwport	     = 1,
 | 
						|
		.flags	     = 0,
 | 
						|
		.ucon	     = UCON,
 | 
						|
		.ulcon	     = ULCON,
 | 
						|
		.ufcon	     = UFCON,
 | 
						|
	},
 | 
						|
	[2] = {
 | 
						|
		.hwport	     = 2,
 | 
						|
		.flags	     = 0,
 | 
						|
		.ucon	     = UCON,
 | 
						|
		.ulcon	     = ULCON,
 | 
						|
		.ufcon	     = UFCON,
 | 
						|
	},
 | 
						|
};
 | 
						|
 | 
						|
static struct platform_device *ncp_devices[] __initdata = {
 | 
						|
	&s3c_device_hsmmc1,
 | 
						|
	&s3c_device_i2c0,
 | 
						|
};
 | 
						|
 | 
						|
static struct map_desc ncp_iodesc[] __initdata = {};
 | 
						|
 | 
						|
static void __init ncp_map_io(void)
 | 
						|
{
 | 
						|
	s3c64xx_init_io(ncp_iodesc, ARRAY_SIZE(ncp_iodesc));
 | 
						|
	s3c24xx_init_clocks(12000000);
 | 
						|
	s3c24xx_init_uarts(ncp_uartcfgs, ARRAY_SIZE(ncp_uartcfgs));
 | 
						|
}
 | 
						|
 | 
						|
static void __init ncp_machine_init(void)
 | 
						|
{
 | 
						|
	s3c_i2c0_set_platdata(NULL);
 | 
						|
 | 
						|
	platform_add_devices(ncp_devices, ARRAY_SIZE(ncp_devices));
 | 
						|
}
 | 
						|
 | 
						|
MACHINE_START(NCP, "NCP")
 | 
						|
	/* Maintainer: Samsung Electronics */
 | 
						|
	.atag_offset	= 0x100,
 | 
						|
	.init_irq	= s3c6410_init_irq,
 | 
						|
	.map_io		= ncp_map_io,
 | 
						|
	.init_machine	= ncp_machine_init,
 | 
						|
	.timer		= &s3c24xx_timer,
 | 
						|
MACHINE_END
 |