2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 20:23:57 +08:00
linux-next/arch/arm/mach-s3c64xx
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: remove bunch of now unused mach/io.h files 2012-03-06 21:34:44 -06:00
clock.c Merge branch 'next/devel-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc 2012-03-10 09:51:26 -08:00
common.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
common.h ARM: S3C64XX: use static declaration when it is not used in other files 2012-01-21 12:02:31 +09:00
cpuidle.c ARM: S3C64XX: Reduce residency requirement for cpuidle WFI mode 2012-02-11 08:02:43 +09:00
dev-audio.c arm: Add export.h to ARM specific files as required. 2011-10-31 19:30:50 -04:00
dev-uart.c ARM: SAMSUNG: Remove uart irq handling from plaform code 2011-08-23 10:48:31 -07:00
dma.c arm: convert sysdev_class to a regular subsystem 2011-12-21 16:01:38 -08:00
irq-pm.c ARM: S3C64XX: use static declaration when it is not used in other files 2012-01-21 12:02:31 +09:00
Kconfig ARM: board specific updates 2012-03-27 16:27:28 -07:00
mach-anw6410.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-crag6410-module.c MFD changes for 3.4 2012-03-28 13:56:35 -07:00
mach-crag6410.c ARM: board specific updates 2012-03-27 16:27:28 -07:00
mach-hmt.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-mini6410.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-ncp.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-real6410.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-smartq5.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-smartq7.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-smartq.c ARM: S3C64XX: Add usb otg phy control 2012-03-09 07:31:30 -08:00
mach-smartq.h ARM: S3C6410: Add basic support for SmartQ machines 2010-05-20 19:42:15 +09:00
mach-smdk6400.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-smdk6410.c ARM: S3C64XX: Add usb otg phy control 2012-03-09 07:31:30 -08:00
Makefile ARM: S3C64XX: Add usb otg phy control 2012-03-09 07:31:30 -08:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
pm.c ARM: S3C64XX: Remove unconditional power domain disables 2012-01-12 02:16:21 +09:00
s3c6400.c Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core 2012-01-07 12:03:30 -08:00
s3c6410.c Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core 2012-01-07 12:03:30 -08:00
setup-fb-24bpp.c ARM: S3C64XX: Remove extern from definition of framebuffer setup call 2011-12-02 14:17:36 +09:00
setup-i2c0.c ARM: S3C64XX: Remove gpio-bank-X header files 2011-05-06 09:37:36 +09:00
setup-i2c1.c ARM: S3C64XX: Remove gpio-bank-X header files 2011-05-06 09:37:36 +09:00
setup-ide.c ARM: S3C64XX: Ensure s3c64xx_ide_setup_gpio() is prototyped 2010-10-25 16:04:33 +09:00
setup-keypad.c ARM: S3C64XX: Fix keypad setup to configure correct number of rows 2011-03-04 15:46:26 +09:00
setup-sdhci-gpio.c ARM: S3C64XX: Change to using s3c_gpio_cfgrange_nopull() 2010-10-23 11:51:37 +09:00
setup-spi.c ARM: S3C64XX: Modified files for SPI consolidation work 2011-12-23 10:50:00 +09:00
setup-usb-phy.c ARM: S3C64XX: Add usb otg phy control 2012-03-09 07:31:30 -08:00
sleep.S ARM: pm: samsung: move cpu_suspend into C code 2011-06-24 08:48:44 +01:00