From: Kukjin Kim <kgene.kim@samsung.com>
Date: Fri, 16 May 2014 23:51:40 +0000 (+0900)
Subject: Merge branch 'v3.16-next/cleanup-samsung' into for-next
X-Git-Tag: next-20140519~105^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=493388f563bbb5f9d6735c348a7b710e23f63479;p=karo-tx-linux.git

Merge branch 'v3.16-next/cleanup-samsung' into for-next

Conflicts:
	arch/arm/mach-s3c24xx/Kconfig
---

493388f563bbb5f9d6735c348a7b710e23f63479
diff --cc arch/arm/Kconfig.debug
index eab8ecbe69c1,2e1bd765e40f..4678870f8ee8
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -1029,10 -1067,16 +1067,16 @@@ config DEBUG_UART_PHY
  	default 0x40090000 if ARCH_LPC32XX
  	default 0x40100000 if DEBUG_PXA_UART1
  	default 0x42000000 if ARCH_GEMINI
+ 	default 0x50000000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART0 || \
+ 				DEBUG_S3C2410_UART0)
+ 	default 0x50004000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART1 || \
+ 				DEBUG_S3C2410_UART1)
+ 	default 0x50008000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART2 || \
+ 				DEBUG_S3C2410_UART2)
  	default 0x7c0003f8 if FOOTBRIDGE
 -	default 0x80230000 if DEBUG_PICOXCELL_UART
  	default 0x80070000 if DEBUG_IMX23_UART
  	default 0x80074000 if DEBUG_IMX28_UART
 +	default 0x80230000 if DEBUG_PICOXCELL_UART
  	default 0x808c0000 if ARCH_EP93XX
  	default 0x90020000 if DEBUG_NSPIRE_CLASSIC_UART || DEBUG_NSPIRE_CX_UART
  	default 0xb0090000 if DEBUG_VEXPRESS_UART0_CRX
diff --cc arch/arm/mach-s3c24xx/Kconfig
index 1e52b6926374,98d17afedf96..1efc070efd13
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@@ -28,8 -26,7 +26,7 @@@ config CPU_S3C241
  	bool "SAMSUNG S3C2410"
  	default y
  	select CPU_ARM920T
- 	select CPU_LLSERIAL_S3C2410
 -	select S3C2410_CLOCK
 +	select S3C2410_COMMON_CLK
  	select S3C2410_DMA if S3C24XX_DMA
  	select ARM_S3C2410_CPUFREQ if ARM_S3C24XX_CPUFREQ
  	select S3C2410_PM if PM
@@@ -41,8 -38,6 +38,7 @@@
  config CPU_S3C2412
  	bool "SAMSUNG S3C2412"
  	select CPU_ARM926T
- 	select CPU_LLSERIAL_S3C2440
 +	select S3C2412_COMMON_CLK
  	select S3C2412_DMA if S3C24XX_DMA
  	select S3C2412_PM if PM
  	help
@@@ -51,18 -46,17 +47,16 @@@
  config CPU_S3C2416
  	bool "SAMSUNG S3C2416/S3C2450"
  	select CPU_ARM926T
- 	select CPU_LLSERIAL_S3C2440
  	select S3C2416_PM if PM
 -	select S3C2443_COMMON
 +	select S3C2443_COMMON_CLK
  	select S3C2443_DMA if S3C24XX_DMA
 -	select SAMSUNG_CLKSRC
  	help
  	  Support for the S3C2416 SoC from the S3C24XX line
  
  config CPU_S3C2440
  	bool "SAMSUNG S3C2440"
  	select CPU_ARM920T
- 	select CPU_LLSERIAL_S3C2440
 -	select S3C2410_CLOCK
 +	select S3C2410_COMMON_CLK
  	select S3C2410_PM if PM
  	select S3C2440_DMA if S3C24XX_DMA
  	help
@@@ -71,8 -65,7 +65,7 @@@
  config CPU_S3C2442
  	bool "SAMSUNG S3C2442"
  	select CPU_ARM920T
- 	select CPU_LLSERIAL_S3C2440
 -	select S3C2410_CLOCK
 +	select S3C2410_COMMON_CLK
  	select S3C2410_DMA if S3C24XX_DMA
  	select S3C2410_PM if PM
  	help
@@@ -86,9 -79,9 +79,8 @@@ config CPU_S3C244
  config CPU_S3C2443
  	bool "SAMSUNG S3C2443"
  	select CPU_ARM920T
- 	select CPU_LLSERIAL_S3C2440
 -	select S3C2443_COMMON
 +	select S3C2443_COMMON_CLK
  	select S3C2443_DMA if S3C24XX_DMA
 -	select SAMSUNG_CLKSRC
  	help
  	  Support for the S3C2443 SoC from the S3C24XX line