2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-24 13:13:57 +08:00
linux-next/arch/arm/mach-exynos
Uwe Kleine-König 51bcb6aae8 This cleanup series gets rid of <mach/timex.h> for platforms not using
ARCH_MULTIPLATFORM. (For multi-platform code it's already unused since
 387798b (ARM: initial multiplatform support).)
 
 To make this work some code out of arch/arm needed to be adapted. The
 respective changes got acks by their maintainers to be taken via armsoc
 (with Andrew Morton substituting for Alessandro Zummo as rtc maintainer).
 
 Compared to the previous pull request there was another patch added that
 fixes a (non-critical) regression on ixp4xx. Olof Johansson asked to not
 squash this fix into the original commit to save him from the need to
 reverify the series.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIcBAABCAAGBQJTA8PeAAoJEOLc3ZEyZpvW5GEP/iz+HIx8Rkf3exUOorZB0Kef
 dPC1Bmc4SThffhgmmXTjSapTzjfnuC8xq8dni008L7QR0LFJsC/rw8bR9GqYhTDs
 EP7Sk0vDJcTUw9dvlIG0jpBioxdsPY7isU8K85tr2a+dzi4JA2h8iv6gE7bsOf1c
 b18hIWp2ZZdeYQX3OcuzPeVfvXuMaayBJChq0akoW7zqxG2nHG9j1vCSOhBtrgpc
 xCTuEqPoaDOdXjdhyda//3SKkIYh1eMf+RWMgW38vz2uHEI3AsMn/EWe6pNRKzRt
 JdVC6LWFl5tl1Dz73NoGFQO+ztTBb2pTrmqggc+Hi4iTekJSmJSFU51D/E0hdJFj
 KmWDWPLiUdAItjPuRz/HyeZxoIZQjg9PJ8MkjwVNAz4f4Vmw2xNnAV1Eur3k9JyV
 fo55eaBvy2KIGzBB+/ksMUvs4HzMJ7Z/dVPzZYRF8VxlYFJXExT0O42oeJ8KsfH7
 dJ1bjk+3VIWPLH3DHyyiIfBL1oxe4MemqrAREFnN2QxYHyCipXLwH35uNZXAqvcU
 jverroWnCdrpOn9KI+vpnp/kuE7Qc1IH/AwAZngPj2xhaFapiH6h1JK/xWcWjijR
 AKv1DhFJMqSp9fvclr/ZAb7o35V/LG0rpCs+oZumCCARwpxkbo8xXgG0CfPsYFrG
 KwLWPz5zwySGwvDZ2wub
 =g6PN
 -----END PGP SIGNATURE-----

Merge tag 'dropmachtimexh-v2' of git://git.pengutronix.de/git/ukl/linux

This cleanup series gets rid of <mach/timex.h> for platforms not using
ARCH_MULTIPLATFORM. (For multi-platform code it's already unused since
387798b (ARM: initial multiplatform support).)

To make this work some code out of arch/arm needed to be adapted. The
respective changes got acks by their maintainers to be taken via armsoc
(with Andrew Morton substituting for Alessandro Zummo as rtc maintainer).

Compared to the previous pull request there was another patch added that
fixes a (non-critical) regression on ixp4xx. Olof Johansson asked to not
squash this fix into the original commit to save him from the need to
reverify the series.

Conflicts:
	arch/arm/mach-at91/at91sam9260.c
	arch/arm/mach-at91/at91sam9261.c
	arch/arm/mach-at91/at91sam9263.c
	arch/arm/mach-at91/at91sam9rl.c
	arch/arm/mach-mmp/time.c
	arch/arm/mach-sa1100/time.c
2014-02-24 10:06:56 +01:00
..
include/mach This cleanup series gets rid of <mach/timex.h> for platforms not using 2014-02-24 10:06:56 +01:00
common.c ACPI and power management updates for 3.14-rc1 2014-01-24 15:51:02 -08:00
common.h ACPI and power management updates for 3.14-rc1 2014-01-24 15:51:02 -08:00
cpuidle.c ACPI and power management updates for 3.14-rc1 2014-01-24 15:51:02 -08:00
exynos-smc.S ARM: EXYNOS: Add support for secure monitor calls 2013-04-09 01:52:06 +09:00
firmware.c ARM: EXYNOS: Remove check for device tree presence 2013-06-15 09:33:21 +09:00
headsmp.S arm: delete __cpuinit/__CPUINIT usage from all ARM users 2013-07-14 19:36:52 -04:00
hotplug.c ARM: EXYNOS: local regs-pmu.h header file 2013-12-19 05:21:14 +09:00
Kconfig ARM: EXYNOS: Consolidate selection of PM_GENERIC_DOMAINS for Exynos4 2013-12-21 06:40:36 +09:00
mach-exynos4-dt.c cpufreq: exynos: Convert exynos-cpufreq to platform driver 2014-01-06 14:29:24 +01:00
mach-exynos5-dt.c ACPI and power management updates for 3.14-rc1 2014-01-24 15:51:02 -08:00
Makefile ARM: EXYNOS: remove CONFIG_MACH_EXYNOS[4, 5]_DT config options 2013-10-21 06:35:47 +09:00
Makefile.boot ARM: dts: Add basic dts file for Samsung Trats board 2012-09-21 10:50:27 +09:00
platsmp.c Samsung cleanup 2nd for v3.14 2013-12-28 15:12:07 -08:00
pm_domains.c ARM: EXYNOS: Kill exynos_pm_late_initcall() 2013-12-21 06:40:44 +09:00
pm.c ARM: EXYNOS: local definitions for pm.c into mach-exynos dir 2013-12-19 05:21:17 +09:00
pmu.c ARM: EXYNOS: remove <mach/regs-clock.h> for exynos 2013-12-19 05:21:20 +09:00
regs-pmu.h ARM: EXYNOS: remove inclusion <mach/regs-pmu.h> into another headers 2013-12-19 05:21:07 +09:00
smc.h ARM: EXYNOS: Add support for secure monitor calls 2013-04-09 01:52:06 +09:00