From: Linus Torvalds Date: Tue, 27 Mar 2012 23:03:32 +0000 (-0700) Subject: Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d61b7a572b292e2be409e13b4b3adf475f18fb29;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge tag 'cleanup' of git://git./linux/kernel/git/arm/arm-soc Pull "ARM: global cleanups" from Arnd Bergmann: "Quite a bit of code gets removed, and some stuff moved around, mostly the old samsung s3c24xx stuff. There should be no functional changes in this series otherwise. Some cleanups have dependencies on other arm-soc branches and will be sent in the second round. Signed-off-by: Arnd Bergmann " Fixed up trivial conflicts mainly due to #include's being changes on both sides. * tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (121 commits) ep93xx: Remove unnecessary includes of ep93xx-regs.h ep93xx: Move EP93XX_SYSCON defines to SoC private header ep93xx: Move crunch code to mach-ep93xx directory ep93xx: Make syscon access functions private to SoC ep93xx: Configure GPIO ports in core code ep93xx: Move peripheral defines to local SoC header ep93xx: Convert the watchdog driver into a platform device. ep93xx: Use ioremap for backlight driver ep93xx: Move GPIO defines to gpio-ep93xx.h ep93xx: Don't use system controller defines in audio drivers ep93xx: Move PHYS_BASE defines to local SoC header file ARM: EXYNOS: Add clock register addresses for EXYNOS4X12 bus devfreq driver ARM: EXYNOS: add clock registers for exynos4x12-cpufreq PM / devfreq: update the name of EXYNOS clock registers that were omitted PM / devfreq: update the name of EXYNOS clock register ARM: EXYNOS: change the prefix S5P_ to EXYNOS4_ for clock ARM: EXYNOS: use static declaration on regarding clock ARM: EXYNOS: replace clock.c for other new EXYNOS SoCs ARM: OMAP2+: Fix build error after merge ARM: S3C24XX: remove call to s3c24xx_setup_clocks ... --- d61b7a572b292e2be409e13b4b3adf475f18fb29 diff --cc Documentation/feature-removal-schedule.txt index 4bfd982f8080,1bea46a54b1c..0cad4803ffac --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt @@@ -510,36 -510,3 +510,22 @@@ Why: The pci_scan_bus_parented() interf convert to using pci_scan_root_bus() so they can supply a list of bus resources when the bus is created. Who: Bjorn Helgaas + +---------------------------- + - What: The CAP9 SoC family will be removed - When: 3.4 - Files: arch/arm/mach-at91/at91cap9.c - arch/arm/mach-at91/at91cap9_devices.c - arch/arm/mach-at91/include/mach/at91cap9.h - arch/arm/mach-at91/include/mach/at91cap9_matrix.h - arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h - arch/arm/mach-at91/board-cap9adk.c - Why: The code is not actively maintained and platforms are now hard to find. - Who: Nicolas Ferre - Jean-Christophe PLAGNIOL-VILLARD - - ---------------------------- - +What: Low Performance USB Block driver ("CONFIG_BLK_DEV_UB") +When: 3.6 +Why: This driver provides support for USB storage devices like "USB + sticks". As of now, it is deactivated in Debian, Fedora and + Ubuntu. All current users can switch over to usb-storage + (CONFIG_USB_STORAGE) which only drawback is the additional SCSI + stack. +Who: Sebastian Andrzej Siewior + +---------------------------- + +What: kmap_atomic(page, km_type) +When: 3.5 +Why: The old kmap_atomic() with two arguments is deprecated, we only + keep it for backward compatibility for few cycles and then drop it. +Who: Cong Wang diff --cc arch/arm/mach-omap1/board-ams-delta.c index e0e8245f3c9f,ac65d7d7c7a1..83eac744ddb9 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c @@@ -20,7 -20,7 +20,8 @@@ #include #include #include +#include + #include #include diff --cc arch/arm/mach-omap1/board-fsample.c index 7afaf3c5bdc6,079292cca584..80bd43c7f4ec --- a/arch/arm/mach-omap1/board-fsample.c +++ b/arch/arm/mach-omap1/board-fsample.c @@@ -21,9 -21,7 +21,8 @@@ #include #include #include +#include - #include #include #include #include diff --cc arch/arm/mach-omap1/board-h2.c index af2be8c12c07,03e0050a8961..c3068622fdcb --- a/arch/arm/mach-omap1/board-h2.c +++ b/arch/arm/mach-omap1/board-h2.c @@@ -30,10 -30,7 +30,8 @@@ #include #include #include +#include - #include - #include #include #include diff --cc arch/arm/mach-omap1/board-innovator.c index 1d5ab6606b9f,74de3e39a10d..61219182d16a --- a/arch/arm/mach-omap1/board-innovator.c +++ b/arch/arm/mach-omap1/board-innovator.c @@@ -25,9 -25,7 +25,8 @@@ #include #include #include +#include - #include #include #include #include diff --cc arch/arm/mach-omap1/board-nokia770.c index 9b6332a31fb6,abdbdb08644f..fe95ec5f6f03 --- a/arch/arm/mach-omap1/board-nokia770.c +++ b/arch/arm/mach-omap1/board-nokia770.c @@@ -30,7 -29,7 +29,6 @@@ #include #include #include - #include "common.h" -#include #include #include #include diff --cc arch/arm/mach-omap1/board-osk.c index ef874655fbd3,e2d7ae4418f2..1fe347396f4d --- a/arch/arm/mach-omap1/board-osk.c +++ b/arch/arm/mach-omap1/board-osk.c @@@ -34,8 -34,6 +34,7 @@@ #include #include #include +#include - #include #include #include diff --cc arch/arm/mach-omap1/board-palmte.c index 612342cb2a2d,04efa7e61149..0863d8e2bdf1 --- a/arch/arm/mach-omap1/board-palmte.c +++ b/arch/arm/mach-omap1/board-palmte.c @@@ -27,9 -27,7 +27,8 @@@ #include #include #include +#include - #include #include #include #include diff --cc arch/arm/mach-omap1/board-palmtt.c index b63350bc88fd,acd1f3645ba0..4ff699c509c0 --- a/arch/arm/mach-omap1/board-palmtt.c +++ b/arch/arm/mach-omap1/board-palmtt.c @@@ -24,9 -24,9 +24,10 @@@ #include #include #include +#include + #include + #include - #include #include #include #include diff --cc arch/arm/mach-omap1/board-palmz71.c index 9924c70af09f,c1cd0f2d6866..abcbbd339aeb --- a/arch/arm/mach-omap1/board-palmz71.c +++ b/arch/arm/mach-omap1/board-palmz71.c @@@ -27,9 -27,9 +27,10 @@@ #include #include #include +#include + #include + #include - #include #include #include #include diff --cc arch/arm/mach-omap1/board-perseus2.c index 8e0153447c6d,83f5b765c5b6..76d4ee05a814 --- a/arch/arm/mach-omap1/board-perseus2.c +++ b/arch/arm/mach-omap1/board-perseus2.c @@@ -21,9 -21,7 +21,8 @@@ #include #include #include +#include - #include #include #include #include diff --cc arch/arm/mach-omap1/board-sx1.c index 0c76e12337d9,fed4435f5d43..f34cb74a9f41 --- a/arch/arm/mach-omap1/board-sx1.c +++ b/arch/arm/mach-omap1/board-sx1.c @@@ -27,9 -27,7 +27,8 @@@ #include #include #include +#include - #include #include #include #include diff --cc arch/arm/mach-omap1/devices.c index 187b2fe132e9,d06c7140392c..dcd8ddbec2bb --- a/arch/arm/mach-omap1/devices.c +++ b/arch/arm/mach-omap1/devices.c @@@ -28,7 -24,12 +24,11 @@@ #include #include #include -#include + #include + #include + + #include "common.h" #include "clock.h" /*-------------------------------------------------------------------------*/ diff --cc arch/arm/mach-omap2/devices.c index 881dab64ef6a,71e7df8c413a..e4336035c0ea --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@@ -25,8 -24,9 +25,8 @@@ #include #include - #include + #include "iomap.h" #include -#include #include #include #include diff --cc arch/arm/mach-omap2/io.c index 2d19efbbc52d,0b73d3153604..cd47a71297b9 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@@ -21,9 -21,9 +21,8 @@@ #include #include #include -#include #include - #include #include diff --cc arch/arm/mach-s3c24xx/simtec-pm.c index 000000000000,68296b1fe7e5..699f93171297 mode 000000,100644..100644 --- a/arch/arm/mach-s3c24xx/simtec-pm.c +++ b/arch/arm/mach-s3c24xx/simtec-pm.c @@@ -1,0 -1,66 +1,66 @@@ + /* linux/arch/arm/plat-s3c24xx/pm-simtec.c + * + * Copyright 2004 Simtec Electronics + * Ben Dooks + * + * http://armlinux.simtec.co.uk/ + * + * Power Management helpers for Simtec S3C24XX implementations + * + * 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. + */ + + #include + #include + #include + #include + #include + #include + #include + #include + + #include + #include + + #include + + #include + #include + #include + + #include + + #include + + #define COPYRIGHT ", Copyright 2005 Simtec Electronics" + + /* pm_simtec_init + * + * enable the power management functions + */ + + static __init int pm_simtec_init(void) + { + unsigned long gstatus4; + + /* check which machine we are running on */ + + if (!machine_is_bast() && !machine_is_vr1000() && + !machine_is_anubis() && !machine_is_osiris() && + !machine_is_aml_m5900()) + return 0; + - printk(KERN_INFO "Simtec Board Power Manangement" COPYRIGHT "\n"); ++ printk(KERN_INFO "Simtec Board Power Management" COPYRIGHT "\n"); + + gstatus4 = (__raw_readl(S3C2410_BANKCON7) & 0x3) << 30; + gstatus4 |= (__raw_readl(S3C2410_BANKCON6) & 0x3) << 28; + gstatus4 |= (__raw_readl(S3C2410_BANKSIZE) & S3C2410_BANKSIZE_MASK); + + __raw_writel(gstatus4, S3C2410_GSTATUS4); + + return s3c_pm_init(); + } + + arch_initcall(pm_simtec_init); diff --cc drivers/input/touchscreen/Kconfig index 97b31a0e0525,b3061684252e..2a2141915aa0 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@@ -243,24 -213,9 +243,24 @@@ config TOUCHSCREEN_FUJITS To compile this driver as a module, choose M here: the module will be called fujitsu-ts. +config TOUCHSCREEN_ILI210X + tristate "Ilitek ILI210X based touchscreen" + depends on I2C + help + Say Y here if you have a ILI210X based touchscreen + controller. This driver supports models ILI2102, + ILI2102s, ILI2103, ILI2103s and ILI2105. + Such kind of chipsets can be found in Amazon Kindle Fire + touchscreens. + + If unsure, say N. + + To compile this driver as a module, choose M here: the + module will be called ili210x. + config TOUCHSCREEN_S3C2410 tristate "Samsung S3C2410/generic touchscreen input driver" - depends on ARCH_S3C2410 || SAMSUNG_DEV_TS + depends on ARCH_S3C24XX || SAMSUNG_DEV_TS select S3C_ADC help Say Y here if you have the s3c2410 touchscreen. diff --cc drivers/spi/Kconfig index 0b06e360628a,ac92194f894e..3ed748355b98 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@@ -285,15 -279,9 +285,15 @@@ config SPI_PXA2X config SPI_PXA2XX_PCI def_bool SPI_PXA2XX && X86_32 && PCI +config SPI_RSPI + tristate "Renesas RSPI controller" + depends on SUPERH + help + SPI driver for Renesas RSPI blocks. + config SPI_S3C24XX tristate "Samsung S3C24XX series SPI" - depends on ARCH_S3C2410 && EXPERIMENTAL + depends on ARCH_S3C24XX && EXPERIMENTAL select SPI_BITBANG help SPI driver for Samsung S3C24XX series ARM SoCs