openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/arch/arm/mach-ux500
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
Kconfig ARM: More device tree support updates 2012-03-28 12:34:33 -07:00
Makefile ARM: timer cleanup work 2012-03-27 16:06:17 -07:00
Makefile.boot ARM: ux500: Initial Device Tree support for Snowball 2012-03-16 19:46:12 +00:00
board-mop500-pins.c bug.h: add include of it to various implicit C users 2012-02-29 17:15:08 -05:00
board-mop500-regulators.c ARM: ux500: Add audio-regulators 2012-02-29 16:32:37 +01:00
board-mop500-regulators.h mach-ux500: configure board for the TPS61052 regulator v2 2011-03-28 08:54:23 +02:00
board-mop500-sdi.c ARM: More SoC support updates 2012-03-28 12:24:40 -07:00
board-mop500-stuib.c mach-ux500: basic HREFv60 support v2 2011-03-14 14:05:16 +01:00
board-mop500-u8500uib.c ARM: ux500: included linux/gpio.h twice 2012-02-29 16:32:38 +01:00
board-mop500-uib.c mach-x500: fix SECTION warnings in uib 2011-06-22 13:26:49 +02:00
board-mop500.c ARM: More device tree support updates 2012-03-28 12:34:33 -07:00
board-mop500.h ARM: More SoC support updates 2012-03-28 12:24:40 -07:00
board-u5500-sdi.c ARM: ux500: pass parent pointer to each platform device 2012-02-13 06:31:29 +00:00
board-u5500.c ARM: ux500: move top level platform devices in sysfs to /sys/devices/socX 2012-02-13 06:31:44 +00:00
cache-l2x0.c ARM: ux500: Enable PL310 Level 2 Cache Controller in Device Tree 2012-03-16 19:48:46 +00:00
clock.c ARM: ux500: Add placeholder for clk_set_parent 2012-02-29 16:32:34 +01:00
clock.h ARM: ux500: Add placeholder for clk_set_parent 2012-02-29 16:32:34 +01:00
cpu-db5500.c ARM: ux500: move top level platform devices in sysfs to /sys/devices/socX 2012-02-13 06:31:44 +00:00
cpu-db8500.c ARM: ux500: move top level platform devices in sysfs to /sys/devices/socX 2012-02-13 06:31:44 +00:00
cpu.c ARM: More SoC support updates 2012-03-28 12:24:40 -07:00
devices-common.c Merge branch 'ux500/dt' into next/dt2 2012-03-16 19:51:30 +00:00
devices-common.h ARM: ux500: remove intermediary add_platform_device* functions 2012-02-13 06:31:53 +00:00
devices-db5500.h ARM: ux500: pass parent pointer to each platform device 2012-02-13 06:31:29 +00:00
devices-db8500.c ARM: ux500: Add DMA-channels for MSP 2012-02-29 16:32:36 +01:00
devices-db8500.h ARM: ux500: remove intermediary add_platform_device* functions 2012-02-13 06:31:53 +00:00
devices.c ux500: rework device registration 2010-12-08 13:14:06 +01:00
dma-db5500.c ARM: ux500: pass parent pointer to each platform device 2012-02-13 06:31:29 +00:00
headsmp.S ARM: ux500: add missing ENDPROC to headsmp.S 2012-01-16 08:36:03 -06:00
hotplug.c ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP 2012-01-23 10:20:05 +00:00
id.c ARM: ux500: support DB8520 2011-12-19 00:35:05 +01:00
mbox-db5500.c treewide: Fix iomap resource size miscalculations 2011-04-10 17:01:04 +02:00
modem-irq-db5500.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
pins-db5500.h ARM: 6371/1: ux500: add DB5500 pins 2010-09-19 12:12:26 +01:00
pins-db8500.h mach-ux500: remove pull-pinconfig and add SPI2 2011-08-30 09:23:11 +02:00
platsmp.c ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP 2012-01-23 10:20:05 +00:00
ste-dma40-db5500.h ARM: 6372/1: ux500: add DB5500 DMA event lines 2010-09-19 12:12:27 +01:00
ste-dma40-db8500.h ARM: 6418/1: ux500: rename DB8500 DMA event line macros 2010-10-04 19:46:07 +01:00
timer.c ARM: ux500: Provide local timer support for Device Tree 2012-03-16 19:48:48 +00:00
usb.c ARM: ux500: move top level platform devices in sysfs to /sys/devices/socX 2012-02-13 06:31:44 +00:00