From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 15 Dec 2015 22:45:22 +0000 (+0100)
Subject: Merge branch 's3c64xx/multiplatform' into next/multiplatform
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fb4f0424293a0fb75d0c9edbc16bd618930ff2da;p=linux-beck.git

Merge branch 's3c64xx/multiplatform' into next/multiplatform

* s3c64xx/multiplatform:
  ARM: s3c64xx: allow building without board support
  ARM: s3c64xx: multiplatform support
  ARM: s3c64xx: use common debug-ll implementation
  ARM: s3c64xx: use new adc/touchscreen driver
  iio: exynos-adc: add experimental touchscreen support
  ARM: s3c64xx: enable sparse IRQ support
  ARM: s3c64xx: prepare initcalls for multiplatform
  gpio: samsung: move gpio-samsung driver back to platform code
  ASoC: samsung/smartq: use dynamic registration
  Input: s3c2410_ts: fix S3C_ADC dependency

Conflicts:
	arch/arm/Kconfig.debug
---

fb4f0424293a0fb75d0c9edbc16bd618930ff2da
diff --cc arch/arm/Kconfig.debug
index bb868887c83d,17ca2b5f8be7..3626b8ba7c0d
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -1481,7 -1422,11 +1488,11 @@@ config DEBUG_UART_PHY
  	default 0x50008000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART2 || \
  				DEBUG_S3C2410_UART2)
  	default 0x78000000 if DEBUG_CNS3XXX
 -	default 0x7c0003f8 if FOOTBRIDGE
 +	default 0x7c0003f8 if DEBUG_FOOTBRIDGE_COM1
+ 	default 0x7f005000 if DEBUG_S3C64XX_UART && DEBUG_S3C_UART0
+ 	default 0x7f005400 if DEBUG_S3C64XX_UART && DEBUG_S3C_UART1
+ 	default 0x7f005800 if DEBUG_S3C64XX_UART && DEBUG_S3C_UART2
+ 	default 0x7f005c00 if DEBUG_S3C64XX_UART && DEBUG_S3C_UART3
  	default 0x80010000 if DEBUG_ASM9260_UART
  	default 0x80070000 if DEBUG_IMX23_UART
  	default 0x80074000 if DEBUG_IMX28_UART
@@@ -1559,13 -1507,16 +1571,17 @@@ config DEBUG_UART_VIR
  	default 0xf1c28000 if DEBUG_SUNXI_UART0
  	default 0xf1c28400 if DEBUG_SUNXI_UART1
  	default 0xf1f02800 if DEBUG_SUNXI_R_UART
 +	default 0xf31004c0 if DEBUG_MESON_UARTAO
 +	default 0xf4090000 if DEBUG_LPC32XX
 +	default 0xf4200000 if DEBUG_GEMINI
  	default 0xf6200000 if DEBUG_PXA_UART1
 -	default 0xf4090000 if ARCH_LPC32XX
 -	default 0xf4200000 if ARCH_GEMINI
  	default 0xf7000000 if DEBUG_SUN9I_UART0
+ 	default 0xf7000000 if DEBUG_S3C64XX_UART && DEBUG_S3C_UART0
  	default 0xf7000000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART0 || \
  				DEBUG_S3C2410_UART0)
+ 	default 0xf7000400 if DEBUG_S3C64XX_UART && DEBUG_S3C_UART1
+ 	default 0xf7000800 if DEBUG_S3C64XX_UART && DEBUG_S3C_UART2
+ 	default 0xf7000c00 if DEBUG_S3C64XX_UART && DEBUG_S3C_UART3
  	default 0xf7004000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART1 || \
  				DEBUG_S3C2410_UART1)
  	default 0xf7008000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART2 || \