Commit 0dc488e7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'samsung/exynos-multiplatform' into next/drivers 



Merging this into the next/drivers branch avoids a number of
pointless conflicts with code changed here.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents c4c54da2 bd51de53

arch/arm/Kconfig

+1 −9
Original line number Diff line number Diff line
@@ -860,19 +860,11 @@ config ARCH_S5PV210 
	help

	  Samsung S5PV210/S5PC110 series based systems



config ARCH_EXYNOS

config ARCH_EXYNOS_SINGLE

	bool "Samsung EXYNOS"

	select ARCH_HAS_CPUFREQ

	select ARCH_HAS_HOLES_MEMORYMODEL

	select ARCH_SPARSEMEM_ENABLE

	select CLKDEV_LOOKUP

	select COMMON_CLK

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select HAVE_S3C_RTC if RTC_CLASS

	select NEED_MACH_GPIO_H

	select NEED_MACH_MEMORY_H

	help

arch/arm/Kconfig.debug

+8 −0
Original line number Diff line number Diff line
@@ -330,6 +330,7 @@ choice 


	config DEBUG_S3C_UART0

		depends on PLAT_SAMSUNG

		select DEBUG_EXYNOS_UART if ARCH_EXYNOS

		bool "Use S3C UART 0 for low-level debug"

		help

		  Say Y here if you want the debug print routines to direct
@@ -341,6 +342,7 @@ choice 


	config DEBUG_S3C_UART1

		depends on PLAT_SAMSUNG

		select DEBUG_EXYNOS_UART if ARCH_EXYNOS

		bool "Use S3C UART 1 for low-level debug"

		help

		  Say Y here if you want the debug print routines to direct
@@ -352,6 +354,7 @@ choice 


	config DEBUG_S3C_UART2

		depends on PLAT_SAMSUNG

		select DEBUG_EXYNOS_UART if ARCH_EXYNOS

		bool "Use S3C UART 2 for low-level debug"

		help

		  Say Y here if you want the debug print routines to direct
@@ -363,6 +366,7 @@ choice 


	config DEBUG_S3C_UART3

		depends on PLAT_SAMSUNG && ARCH_EXYNOS

		select DEBUG_EXYNOS_UART

		bool "Use S3C UART 3 for low-level debug"

		help

		  Say Y here if you want the debug print routines to direct
@@ -485,6 +489,9 @@ choice 


endchoice



config DEBUG_EXYNOS_UART

	bool



config DEBUG_IMX_UART_PORT

	int "i.MX Debug UART Port Selection" if DEBUG_IMX1_UART || \

						DEBUG_IMX25_UART || \
@@ -580,6 +587,7 @@ endchoice 


config DEBUG_LL_INCLUDE

	string

	default "debug/exynos.S" if DEBUG_EXYNOS_UART

	default "debug/icedcc.S" if DEBUG_ICEDCC

	default "debug/imx.S" if DEBUG_IMX1_UART || \

				 DEBUG_IMX25_UART || \

arch/arm/configs/exynos4_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ CONFIG_KALLSYMS_ALL=y 
CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_EXYNOS=y

CONFIG_ARCH_EXYNOS_SINGLE=y

CONFIG_S3C_LOWLEVEL_UART_PORT=1

CONFIG_MACH_SMDKC210=y

CONFIG_MACH_ARMLEX4210=y

arch/arm/mach-exynos/include/mach/debug-macro.S→arch/arm/include/debug/exynos.S

+6 −6
Original line number Diff line number Diff line 
/* linux/arch/arm/mach-exynos4/include/mach/debug-macro.S

 *

/*

 * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com

 *

 * Based on arch/arm/mach-s3c6400/include/mach/debug-macro.S

 *

 * 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.
@@ -12,7 +9,10 @@ 


/* pull in the relevant register and map files. */



#include <mach/map.h>

#define S3C_ADDR_BASE   0xF6000000

#define S3C_VA_UART	S3C_ADDR_BASE + 0x01000000

#define EXYNOS4_PA_UART	0x13800000

#define EXYNOS5_PA_UART	0x12C00000



	/* note, for the boot process to work we have to keep the UART

	 * virtual address aligned to an 1MiB boundary for the L1
@@ -36,4 +36,4 @@ 
#define fifo_full fifo_full_s5pv210

#define fifo_level fifo_level_s5pv210



#include <plat/debug-macro.S>
 
#include <debug/samsung.S>