renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-24 05:04:00 +08:00
Code
820d41cf0c
linux-next/arch/arm/mach-at91
History
Linus Torvalds 820d41cf0c ARM: cleanups of io includes 
Rob Herring has done a sweeping change cleaning up all of the mach/io.h includes,
 moving some of the oft-repeated macros to a common location and removing a bunch of
 boiler plate. This is another step closer to a common zImage for multiple platforms.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJPcpqHAAoJEIwa5zzehBx3xCMP/2evrPQyorzMBztrFB4Ry9Ol
 qNkSVNsemZjdtkY2dnJv+zJ/Xb0PPDU9EuBHr/SpqmVrRZEZeJND42wZK/OTFCBZ
 Ufi7KP1qE30daO5H3YmL+58/Ixir5fTHqggqolHhTcEYU2hnHgLBI4rIFu92kSO7
 TMyrAUs14jSkTVZc6HSF83w3PfQWhMzWvspJVHQ6RebZRruETAr7v9weVMbgxcDk
 jQ5XJ9y73rGs2AF8bZTpUdFPzkcac7UiHn3/XyqoZs8RNCL98BGpskzhILyTARf5
 X90c9mqQF+AEbb9QSDDd52uYFsJ/5COJvWdlExRI9gZZDI8Pd05ijZBR9IdGJg/B
 NsVsl98wvZ/zjHJ/Sb2qt5ruet7PiQUGhkshB42jVHsaWfRM030sKGYxQ8pX5Tsa
 cSagnfBCvAZ9VjDLkXrnEbWRNTz8LSwn9l63z0jmtm5D8+vbpMtgvtWARtuZ4RNn
 D8wIWoyT0ytVZnosu5441TEgCejtcKOEFzThvKDYMeMJZ/rqVkAbcznapoC2qUd4
 fceNlLfQFvW7xpY1MY8mhlwC0ki4hM9MSDieaXUyefvAU/hoSp8MveVUH5UspYfb
 0FpkEhzklW/g0/fuq0DJQIrMn7dajjUvVZIUQtiVQuFHOr6RUbFG5vmXuCbAyx10
 PE2K4rnKz+PC8bKab7v9
 =YIsn
 -----END PGP SIGNATURE-----

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull "ARM: cleanups of io includes" from Olof Johansson:
 "Rob Herring has done a sweeping change cleaning up all of the
  mach/io.h includes, moving some of the oft-repeated macros to a common
  location and removing a bunch of boiler plate.  This is another step
  closer to a common zImage for multiple platforms."

Fix up various fairly trivial conflicts (<mach/io.h> removal vs changes
around it, tegra localtimer.o is *still* gone, yadda-yadda).

* tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (29 commits)
  ARM: tegra: Include assembler.h in sleep.S to fix build break
  ARM: pxa: use common IOMEM definition
  ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbol
  ARM: __io abuse cleanup
  ARM: create a common IOMEM definition
  ARM: iop13xx: fix missing declaration of iop13xx_init_early
  ARM: fix ioremap/iounmap for !CONFIG_MMU
  ARM: kill off __mem_pci
  ARM: remove bunch of now unused mach/io.h files
  ARM: make mach/io.h include optional
  ARM: clps711x: remove unneeded include of mach/io.h
  ARM: dove: add explicit include of dove.h to addr-map.c
  ARM: at91: add explicit include of hardware.h to uncompressor
  ARM: ep93xx: clean-up mach/io.h
  ARM: tegra: clean-up mach/io.h
  ARM: orion5x: clean-up mach/io.h
  ARM: davinci: remove unneeded mach/io.h include
  [media] davinci: remove includes of mach/io.h
  ARM: OMAP: Remove remaining includes for mach/io.h
  ARM: msm: clean-up mach/io.h
  ...
2012-03-29 18:02:10 -07:00
..
include/mach ARM: cleanups of io includes 2012-03-29 18:02:10 -07:00
at91rm9200_devices.c Merge branches 'depends/irqdomain' and 'at91/base2+cleanup' into next/dt 2012-03-02 13:22:19 +00:00
at91rm9200_time.c ARM: at91/ST: remove not needed casts 2012-02-23 09:26:31 +01:00
at91rm9200.c Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
at91sam9_alt_reset.S ARM: at91: make sdram/ddr register base soc independent 2012-02-23 14:57:56 +01:00
at91sam9g45_devices.c Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2012-03-29 15:34:57 -07:00
at91sam9g45_reset.S ARM: at91: make sdram/ddr register base soc independent 2012-02-23 14:57:56 +01:00
at91sam9g45.c Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
at91sam9rl_devices.c ARM: at91/dma: remove platform data from DMA controller 2012-02-29 18:20:38 +01:00
at91sam9rl.c Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
at91sam9x5.c ARM: at91: dt: enable usb ehci for sam9g45 and sam9x5 2012-03-16 00:40:59 +08:00
at91sam926x_time.c ARM: at91/pit: add traces in case of error 2012-03-01 13:38:48 +01:00
at91sam9260_devices.c Merge branch 'at91-3.4-cleanup2+DT' of git://github.com/at91linux/linux-at91 into next/dt 2012-03-02 13:22:28 +00:00
at91sam9260.c Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
at91sam9261_devices.c Merge branches 'depends/irqdomain' and 'at91/base2+cleanup' into next/dt 2012-03-02 13:22:19 +00:00
at91sam9261.c Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
at91sam9263_devices.c Merge branches 'depends/irqdomain' and 'at91/base2+cleanup' into next/dt 2012-03-02 13:22:19 +00:00
at91sam9263.c Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
at91x40_time.c ARM: at91/at91x40: remove use of at91_sys_read/write 2012-02-17 17:54:05 +01:00
at91x40.c ARM: at91/at91x40: remove use of at91_sys_read/write 2012-02-17 17:54:05 +01:00
board-1arm.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-afeb-9260v1.c ATMEL: fix nand ecc support 2012-03-15 23:26:32 +08:00
board-cam60.c ATMEL: fix nand ecc support 2012-03-15 23:26:32 +08:00
board-carmeva.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-cpu9krea.c ATMEL: fix nand ecc support 2012-03-15 23:26:32 +08:00
board-cpuat91.c ARM: at91: make sdram/ddr register base soc independent 2012-02-23 14:57:56 +01:00
board-csb337.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-csb637.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-dt.c ARM: at91/dt: add specific DT soc init 2012-03-15 23:30:05 +08:00
board-eb01.c at91: fix map_io init usage 2011-05-25 23:04:34 +08:00
board-eb9200.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-ecbat91.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-eco920.c ARM: at91: make sdram/ddr register base soc independent 2012-02-23 14:57:56 +01:00
board-flexibity.c ARM: at91: Add external RTC for Flexibity board 2012-02-03 13:45:17 +01:00
board-foxg20.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-gsia18s.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-kafa.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-kb9202.c ATMEL: fix nand ecc support 2012-03-15 23:26:32 +08:00
board-neocore926.c ATMEL: fix nand ecc support 2012-03-15 23:26:32 +08:00
board-pcontrol-g20.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-picotux200.c ARM: at91: make sdram/ddr register base soc independent 2012-02-23 14:57:56 +01:00
board-qil-a9260.c ARM: at91: enable on flash bbt for Atmel Reference and DT boards 2012-03-15 23:27:25 +08:00
board-rm9200dk.c ARM: at91: enable on flash bbt for Atmel Reference and DT boards 2012-03-15 23:27:25 +08:00
board-rm9200ek.c ARM: at91: make sdram/ddr register base soc independent 2012-02-23 14:57:56 +01:00
board-rsi-ews.c ARM: at91/boards: use -EINVAL for invalid gpio 2011-11-29 15:46:14 +00:00
board-sam9-l9260.c ATMEL: fix nand ecc support 2012-03-15 23:26:32 +08:00
board-sam9g20ek.c ARM: at91: enable on flash bbt for Atmel Reference and DT boards 2012-03-15 23:27:25 +08:00
board-sam9m10g45ek.c ARM: at91: enable on flash bbt for Atmel Reference and DT boards 2012-03-15 23:27:25 +08:00
board-sam9rlek.c ARM: at91: enable on flash bbt for Atmel Reference and DT boards 2012-03-15 23:27:25 +08:00
board-sam9260ek.c ARM: at91: enable on flash bbt for Atmel Reference and DT boards 2012-03-15 23:27:25 +08:00
board-sam9261ek.c ARM: at91: enable on flash bbt for Atmel Reference and DT boards 2012-03-15 23:27:25 +08:00
board-sam9263ek.c ARM: at91: enable on flash bbt for Atmel Reference and DT boards 2012-03-15 23:27:25 +08:00
board-snapper9260.c ATMEL: fix nand ecc support 2012-03-15 23:26:32 +08:00
board-stamp9g20.c ATMEL: fix nand ecc support 2012-03-15 23:26:32 +08:00
board-usb-a926x.c ARM: at91: enable on flash bbt for Atmel Reference and DT boards 2012-03-15 23:27:25 +08:00
board-yl-9200.c ATMEL: fix nand ecc support 2012-03-15 23:26:32 +08:00
clock.c ARM: at91: add pmc DT support 2012-03-15 23:31:14 +08:00
clock.h at91: switch to CLKDEV_LOOKUP 2011-05-25 23:04:34 +08:00
cpuidle.c ARM: at91: implement the standby function for pm/cpuidle 2012-02-03 13:42:19 +01:00
generic.h ARM: at91: add pmc DT support 2012-03-15 23:31:14 +08:00
gpio.c ARM: at91/pio: add new PIO3 features 2012-03-01 13:38:50 +01:00
irq.c ARM: at91: AIC and GPIO IRQ device tree initialization 2012-03-01 13:29:03 +01:00
Kconfig ARM: at91: always enable sam9 restart 2012-03-15 23:31:18 +08:00
leds.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
Makefile ARM: at91: add sam9_smc.o to at91sam9x5 build 2012-03-01 13:38:49 +01:00
Makefile.boot ARM: at91: properly sort dtb files in Makefile.boot 2012-02-23 14:58:00 +01:00
pm_slowclock.S ARM: at91/PMC: make register base soc independent 2012-02-23 14:57:57 +01:00
pm.c ARM: at91: add ram controller DT support 2012-03-15 23:37:56 +08:00
pm.h ARM: at91: make sdram/ddr register base soc independent 2012-02-23 14:57:56 +01:00
sam9_smc.c ARM: at91: add accessor to manage SMC 2012-02-13 18:31:36 +01:00
sam9_smc.h ARM: at91: add accessor to manage SMC 2012-02-13 18:31:36 +01:00
setup.c ARM: at91: add Shutdown Controller (SHDWC) DT support 2012-03-15 23:38:02 +08:00
soc.h ARM: at91: code removal of CAP9 SoC 2012-02-03 13:33:05 +01:00