kernel/linux
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ synced 2026-09-28 19:20:30 +00:00
Code Issues Releases Packages Activity

Merge branch 's3c64xx/multiplatform' into next/multiplatform

Browse source 
* 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
This commit is contained in:
Arnd Bergmann 2015-12-15 23:45:22 +01:00
commit fb4f042429
44 changed files with 1731 additions and 1527 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt
View file

26
arch/arm/Kconfig
View file

19
arch/arm/Kconfig.debug
View file

3
arch/arm/configs/multi_v7_defconfig
View file

2
arch/arm/configs/s3c6400_defconfig
View file

31
arch/arm/mach-s3c64xx/Kconfig
View file

24
arch/arm/mach-s3c64xx/Makefile
View file

5
arch/arm/mach-s3c64xx/common.c
View file

5
arch/arm/mach-s3c64xx/cpuidle.c
View file

1
arch/arm/mach-s3c64xx/dev-uart.c
View file

38
arch/arm/mach-s3c64xx/include/mach/debug-macro.S
View file

3
arch/arm/mach-s3c64xx/include/mach/gpio-samsung.h
View file

20
arch/arm/mach-s3c64xx/include/mach/irqs.h
View file

1
arch/arm/mach-s3c64xx/include/mach/pm-core.h
View file

2
arch/arm/mach-s3c64xx/irq-pm.c
View file

3
arch/arm/mach-s3c64xx/mach-anw6410.c
View file

6
arch/arm/mach-s3c64xx/mach-crag6410-module.c
View file

2
arch/arm/mach-s3c64xx/mach-crag6410.c
View file

2
arch/arm/mach-s3c64xx/mach-hmt.c
View file

5
arch/arm/mach-s3c64xx/mach-mini6410.c
View file

2
arch/arm/mach-s3c64xx/mach-ncp.c
View file

6
arch/arm/mach-s3c64xx/mach-real6410.c
View file

16
arch/arm/mach-s3c64xx/mach-smartq.c
View file

2
arch/arm/mach-s3c64xx/mach-smartq5.c
View file

2
arch/arm/mach-s3c64xx/mach-smartq7.c
View file

3
arch/arm/mach-s3c64xx/mach-smdk6400.c
View file

6
arch/arm/mach-s3c64xx/mach-smdk6410.c
View file

4
arch/arm/mach-s3c64xx/pl080.c
View file

4
arch/arm/mach-s3c64xx/pm.c
View file

2
arch/arm/mach-s3c64xx/s3c6400.c
View file

2
arch/arm/mach-s3c64xx/s3c6410.c
View file

5
arch/arm/plat-samsung/Kconfig
View file

5
arch/arm/plat-samsung/Makefile
View file

22
arch/arm/plat-samsung/devs.c
View file

12
drivers/gpio/gpio-samsung.c → arch/arm/plat-samsung/gpio-samsung.c
View file

5
arch/arm/plat-samsung/init.c
View file

4
arch/arm/plat-samsung/pm.c
View file

7
drivers/gpio/Kconfig
View file

1
drivers/gpio/Makefile
View file

224
drivers/iio/adc/exynos_adc.c
View file

2
drivers/input/touchscreen/Kconfig
View file

1
include/linux/platform_data/touchscreen-s3c2410.h
View file

76
sound/soc/samsung/smartq_wm8987.c
View file