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-at91
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
at91_aic.h arm: at91 move at91_aic.h to arch/arm/mach-at91 2012-11-06 20:29:41 +08:00
at91_rstc.h ARM: at91: remove trailing semicolon from macros 2013-04-08 17:47:44 +02:00
at91_shdwc.h ARM: at91: remove trailing semicolon from macros 2013-04-08 17:47:44 +02:00
at91_tc.h arn: at91: move at91_tc.h to arch/arm/mach-at91 2012-11-06 20:29:44 +08:00
at91rm9200_devices.c ARM: at91: don't use <mach/timex.h> 2013-12-20 11:44:20 +01:00
at91rm9200_time.c This cleanup series gets rid of <mach/timex.h> for platforms not using 2014-02-24 10:06:56 +01:00
at91rm9200.c This cleanup series gets rid of <mach/timex.h> for platforms not using 2014-02-24 10:06:56 +01:00
at91sam9_alt_reset.S arm: at91: move reset controller header to arm/arm/mach-at91 2012-11-06 20:30:48 +08:00
at91sam9g45_devices.c ARM: at91: don't use <mach/timex.h> 2013-12-20 11:44:20 +01:00
at91sam9g45_reset.S ARM: at91: sam9g45: shutdown ddr1 too when rebooting 2013-09-30 09:58:44 -07:00
at91sam9g45.c This cleanup series gets rid of <mach/timex.h> for platforms not using 2014-02-24 10:06:56 +01:00
at91sam9n12.c ARM: at91: move at91_pmc.h to include/linux/clk/at91_pmc.h 2013-12-02 15:22:15 +01:00
at91sam9rl_devices.c ARM: at91: don't use <mach/timex.h> 2013-12-20 11:44:20 +01:00
at91sam9rl.c This cleanup series gets rid of <mach/timex.h> for platforms not using 2014-02-24 10:06:56 +01:00
at91sam9x5.c ARM: at91: move at91_pmc.h to include/linux/clk/at91_pmc.h 2013-12-02 15:22:15 +01:00
at91sam926x_time.c This cleanup series gets rid of <mach/timex.h> for platforms not using 2014-02-24 10:06:56 +01:00
at91sam9260_devices.c ARM: at91: don't use <mach/timex.h> 2013-12-20 11:44:20 +01:00
at91sam9260.c This cleanup series gets rid of <mach/timex.h> for platforms not using 2014-02-24 10:06:56 +01:00
at91sam9261_devices.c ARM: at91: don't use <mach/timex.h> 2013-12-20 11:44:20 +01:00
at91sam9261.c This cleanup series gets rid of <mach/timex.h> for platforms not using 2014-02-24 10:06:56 +01:00
at91sam9263_devices.c ARM: at91: don't use <mach/timex.h> 2013-12-20 11:44:20 +01:00
at91sam9263.c This cleanup series gets rid of <mach/timex.h> for platforms not using 2014-02-24 10:06:56 +01:00
at91x40_time.c ARM: at91: don't use <mach/timex.h> 2013-12-20 11:44:20 +01:00
at91x40.c ARM: at91: don't use <mach/timex.h> 2013-12-20 11:44:20 +01:00
board-1arm.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-afeb-9260v1.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-cam60.c ARM: at91: cam60: fix incorrect placement of __initdata tag 2013-09-30 17:50:51 +02:00
board-carmeva.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-cpu9krea.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-cpuat91.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-csb337.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-csb637.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-dt-rm9200.c ARM: at91: remove init_machine() as default is suitable 2013-10-16 15:47:08 +02:00
board-dt-sam9.c ARM: at91: remove init_machine() as default is suitable 2013-10-16 15:47:08 +02:00
board-dt-sama5.c ARM: at91: prepare sama5 dt boards transition to common clk 2013-12-02 15:31:27 +01:00
board-eb01.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-eb9200.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-ecbat91.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-eco920.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-flexibity.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-foxg20.c ARM: w1-gpio: fix erroneous gpio requests 2013-03-12 16:20:45 -07:00
board-gsia18s.c ARM: at91: don't use <mach/timex.h> 2013-12-20 11:44:20 +01:00
board-kafa.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-kb9202.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-pcontrol-g20.c ARM: at91: don't use <mach/timex.h> 2013-12-20 11:44:20 +01:00
board-picotux200.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-rm9200ek.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-rsi-ews.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-sam9-l9260.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-sam9g20ek.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board-sam9m10g45ek.c video: atmel_lcdfb: fix platform data struct 2013-09-27 09:26:19 +03:00
board-sam9rlek.c video: atmel_lcdfb: pass the pdata as params 2013-09-27 09:26:20 +03:00
board-sam9260ek.c misc: (at24) move header to linux/platform_data/ 2013-09-30 06:02:34 +02:00
board-sam9261ek.c video: atmel_lcdfb: pass the pdata as params 2013-09-27 09:26:20 +03:00
board-sam9263ek.c Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 2013-11-18 15:50:07 -08:00
board-snapper9260.c gpio: (gpio-pca953x) move header to linux/platform_data/ 2013-08-29 12:33:52 -07:00
board-stamp9g20.c ARM: at91: don't use <mach/timex.h> 2013-12-20 11:44:20 +01:00
board-yl-9200.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
board.h video: atmel_lcdfb: fix platform data struct 2013-09-27 09:26:19 +03:00
clock.c ARM: at91: remove AT91_PROGRAMMABLE_CLOCKS configuration option 2013-12-12 09:57:42 -08:00
clock.h ARM: at91: introduce SAMA5 support 2013-03-26 12:18:04 +01:00
generic.h ARM: at91: add Kconfig options for common clk support 2013-12-02 15:22:52 +01:00
gpio.c arm: Move chained_irq_(enter|exit) to a generic file 2013-03-26 16:11:43 +00:00
gsia18s.h arm: at91: move board header to arch/arm/mach-at91 2012-11-06 20:29:48 +08:00
irq.c ARM: at91: fix at91_extern_irq usage for non-dt boards 2013-06-21 16:35:26 +02:00
Kconfig ARM: SoC platform changes for 3.14 2014-01-23 18:40:49 -08:00
Kconfig.non_dt ARM: SoC cleanups for 3.14 2014-01-23 18:36:55 -08:00
leds.c arm: at91 move board.h to arch/arm/mach-at91 2012-11-06 20:29:37 +08:00
Makefile ARM: at91: switch Calao QIL-A9260 board to DT 2013-12-19 17:27:30 +01:00
Makefile.boot ARM: move all dtb targets out of Makefile.boot 2012-09-14 09:22:04 -05:00
pm_slowclock.S ARM: at91: move at91_pmc.h to include/linux/clk/at91_pmc.h 2013-12-02 15:22:15 +01:00
pm.c This cleanup series gets rid of <mach/timex.h> for platforms not using 2014-02-24 10:06:56 +01:00
pm.h ARM: at91: fixed unresolved symbol "at91_pm_set_standby" when built without CONFIG_PM 2013-12-02 14:24:40 +01:00
sam9_smc.c ARM: at91: smc: bug fix in sam9_smc_cs_read() 2014-01-14 10:15:55 -08:00
sam9_smc.h ARM: at91: add accessor to manage SMC 2012-02-13 18:31:36 +01:00
sama5d3.c ARM: at91/dt: remove old clk material 2013-12-02 15:31:29 +01:00
setup.c ARM: SoC platform changes for 3.14 2014-01-23 18:40:49 -08:00
soc.h ARM: at91: fix at91_extern_irq usage for non-dt boards 2013-06-21 16:35:26 +02:00
stamp9g20.h arm: at91: move board header to arch/arm/mach-at91 2012-11-06 20:29:48 +08:00
sysirq_mask.c ARM: at91: fix hanged boot due to early rtt-interrupt 2013-11-15 12:13:33 +01:00