Commit fb4f0424 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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
parents 35d3aad4 b2821042

Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt

+3 −0
Original line number Diff line number Diff line
@@ -47,6 +47,9 @@ Required properties: 


- samsung,syscon-phandle Contains the PMU system controller node

			(To access the ADC_PHY register on Exynos5250/5420/5800/3250)

Optional properties:

- has-touchscreen:	If present, indicates that a touchscreen is

			connected an usable.



Note: child nodes can be added for auto probing from device tree.

arch/arm/Kconfig

+0 −26
Original line number Diff line number Diff line
@@ -682,32 +682,6 @@ config ARCH_S3C24XX 
	  (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or the

	  Samsung SMDK2410 development board (and derivatives).



config ARCH_S3C64XX

	bool "Samsung S3C64XX"

	select ARCH_REQUIRE_GPIOLIB

	select ARM_AMBA

	select ARM_VIC

	select ATAGS

	select CLKDEV_LOOKUP

	select CLKSRC_SAMSUNG_PWM

	select COMMON_CLK_SAMSUNG

	select CPU_V6K

	select GENERIC_CLOCKEVENTS

	select GPIO_SAMSUNG

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select HAVE_TCM

	select NO_IOPORT_MAP

	select PLAT_SAMSUNG

	select PM_GENERIC_DOMAINS if PM

	select S3C_DEV_NAND

	select S3C_GPIO_TRACK

	select SAMSUNG_ATAGS

	select SAMSUNG_WAKEMASK

	select SAMSUNG_WDT_RESET

	help

	  Samsung S3C64XX series based systems



config ARCH_DAVINCI

	bool "TI DaVinci"

	select ARCH_HAS_HOLES_MEMORYMODEL

arch/arm/Kconfig.debug

+18 −1
Original line number Diff line number Diff line
@@ -914,6 +914,7 @@ choice 
		depends on PLAT_SAMSUNG

		select DEBUG_EXYNOS_UART if ARCH_EXYNOS

		select DEBUG_S3C24XX_UART if ARCH_S3C24XX

		select DEBUG_S3C64XX_UART if ARCH_S3C64XX

		select DEBUG_S5PV210_UART if ARCH_S5PV210

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

		help
@@ -925,6 +926,7 @@ choice 
		depends on PLAT_SAMSUNG

		select DEBUG_EXYNOS_UART if ARCH_EXYNOS

		select DEBUG_S3C24XX_UART if ARCH_S3C24XX

		select DEBUG_S3C64XX_UART if ARCH_S3C64XX

		select DEBUG_S5PV210_UART if ARCH_S5PV210

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

		help
@@ -936,6 +938,7 @@ choice 
		depends on PLAT_SAMSUNG

		select DEBUG_EXYNOS_UART if ARCH_EXYNOS

		select DEBUG_S3C24XX_UART if ARCH_S3C24XX

		select DEBUG_S3C64XX_UART if ARCH_S3C64XX

		select DEBUG_S5PV210_UART if ARCH_S5PV210

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

		help
@@ -946,6 +949,7 @@ choice 
	config DEBUG_S3C_UART3

		depends on PLAT_SAMSUNG && (ARCH_EXYNOS || ARCH_S5PV210)

		select DEBUG_EXYNOS_UART if ARCH_EXYNOS

		select DEBUG_S3C64XX_UART if ARCH_S3C64XX

		select DEBUG_S5PV210_UART if ARCH_S5PV210

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

		help
@@ -1320,6 +1324,9 @@ config DEBUG_S3C2410_UART 
config DEBUG_S3C24XX_UART

	bool



config DEBUG_S3C64XX_UART

	bool



config DEBUG_S5PV210_UART

	bool
@@ -1406,7 +1413,7 @@ config DEBUG_LL_INCLUDE 
	default "debug/renesas-scif.S" if DEBUG_RMOBILE_SCIFA0

	default "debug/renesas-scif.S" if DEBUG_RMOBILE_SCIFA1

	default "debug/renesas-scif.S" if DEBUG_RMOBILE_SCIFA4

	default "debug/s3c24xx.S" if DEBUG_S3C24XX_UART

	default "debug/s3c24xx.S" if DEBUG_S3C24XX_UART || DEBUG_S3C64XX_UART

	default "debug/s5pv210.S" if DEBUG_S5PV210_UART

	default "debug/sirf.S" if DEBUG_SIRFSOC_UART

	default "debug/sti.S" if DEBUG_STI_UART
@@ -1482,6 +1489,10 @@ config DEBUG_UART_PHYS 
				DEBUG_S3C2410_UART2)

	default 0x78000000 if DEBUG_CNS3XXX

	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
@@ -1538,6 +1549,7 @@ config DEBUG_UART_PHYS 
		DEBUG_RCAR_GEN2_SCIF0 || DEBUG_RCAR_GEN2_SCIF2 || \

		DEBUG_RMOBILE_SCIFA0 || DEBUG_RMOBILE_SCIFA1 || \

		DEBUG_RMOBILE_SCIFA4 || DEBUG_S3C24XX_UART || \

		DEBUG_S3C64XX_UART || \

		DEBUG_UART_BCM63XX || DEBUG_ASM9260_UART || \

		DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \

		DEBUG_AT91_UART
@@ -1564,8 +1576,12 @@ config DEBUG_UART_VIRT 
	default 0xf4200000 if DEBUG_GEMINI

	default 0xf6200000 if DEBUG_PXA_UART1

	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 || \
@@ -1629,6 +1645,7 @@ config DEBUG_UART_VIRT 
		DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_MESON_UARTAO || \

		DEBUG_NETX_UART || \

		DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \

		DEBUG_S3C64XX_UART || \

		DEBUG_UART_BCM63XX || DEBUG_ASM9260_UART || \

		DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0

arch/arm/configs/multi_v7_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -11,6 +11,9 @@ CONFIG_MODULES=y 
CONFIG_MODULE_UNLOAD=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_CMDLINE_PARTITION=y

CONFIG_ARCH_MULTI_V7=y

# CONFIG_ARCH_MULTI_V5 is not set

# CONFIG_ARCH_MULTI_V4 is not set

CONFIG_ARCH_VIRT=y

CONFIG_ARCH_ALPINE=y

CONFIG_ARCH_MVEBU=y

arch/arm/configs/s3c6400_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ CONFIG_KALLSYMS_ALL=y 
CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_MULTI_V6=y

# CONFIG_ARCH_MULTI_V7 is not set

CONFIG_ARCH_S3C64XX=y

CONFIG_S3C_BOOT_ERROR_RESET=y

CONFIG_MACH_SMDK6400=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE