2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-17 01:34:00 +08:00
linux-next/arch/arm/mach-pxa/include/mach
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
..
addr-map.h ARM: pxa: use correct __iomem annotations 2011-10-08 21:03:07 +08:00
arcom-pcmcia.h [ARM] pxa/zeus: make Viper pcmcia support more generic to support Zeus 2009-12-13 21:42:58 +08:00
audio.h ALSA: Allow passing platform_data for pxa2xx-ac97 2009-08-13 22:19:37 +01:00
balloon3.h PCMCIA: pxa: convert PXA socket drivers to use new irq/gpio management 2012-02-04 14:32:22 +00:00
bitfield.h
camera.h pxa_camera: remove init() callback 2010-02-26 15:11:00 -03:00
colibri.h ARM: pxa/colibri: use correct SD detect pin 2011-02-09 23:05:03 +08:00
corgi.h ARM: pxa: rename NR_BUILTIN_GPIO 2011-11-14 21:07:59 +08:00
csb726.h ARM: pxa: rename gpio_to_irq and irq_to_gpio 2011-11-14 21:07:59 +08:00
debug-macro.S ARM: add an extra temp register to the low level debugging addruart macro 2011-09-26 10:11:25 -04:00
dma.h [ARM] pxa: introduce plat-pxa for PXA common code and add DMA support 2009-03-23 10:11:31 +08:00
eseries-gpio.h ASoC: machine support for Toshiba e740 PDA 2009-01-19 16:15:41 +00:00
eseries-irq.h ARM: pxa: encode IRQ number into .nr_irqs 2010-10-08 16:21:17 +08:00
gpio.h ARM: pxa: change gpio to platform device 2011-11-15 19:08:27 +08:00
gumstix.h ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ 2011-11-14 21:07:58 +08:00
h5000.h [ARM] pxa: add basic support for HP iPAQ h5000 2008-12-02 14:43:50 +08:00
hardware.h ARM: pxa: use common IOMEM definition 2012-03-25 14:36:31 -05:00
hx4700.h ARM: pxa: rename NR_BUILTIN_GPIO 2011-11-14 21:07:59 +08:00
idp.h ARM: pxa: change gpio to platform device 2011-11-15 19:08:27 +08:00
irda.h [ARM] pxa: add gpio_pwdown(_inverted) into pxaficp_ir.c 2009-09-10 18:49:39 +08:00
irqs.h ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
littleton.h ARM: pxa: change gpio to platform device 2011-11-15 19:08:27 +08:00
lpd270.h ARM: pxa: use correct __iomem annotations 2011-10-08 21:03:07 +08:00
lubbock.h ARM: pxa: encode IRQ number into .nr_irqs 2010-10-08 16:21:17 +08:00
magician.h ARM: pxa: rename NR_BUILTIN_GPIO 2011-11-14 21:07:59 +08:00
mainstone.h ARM: 7344/1: pxa: mainstone: add missing include for IRQ_BOARD_START 2012-02-23 22:15:26 +00:00
mfp-pxa2xx.h [ARM] pxa: add MFP_LPM_KEEP_OUTPUT flag to pin config 2010-05-11 17:24:59 +02:00
mfp-pxa3xx.h [ARM] pxa: move common MFP handling code into plat-pxa 2009-03-23 10:11:34 +08:00
mfp-pxa25x.h [ARM] pxa: simplify the LCD pin configuration for pxa25x platforms 2010-03-02 07:40:46 +08:00
mfp-pxa27x.h ARM: pxa/hx4700: Reduce sleep mode battery discharge by 35% 2012-03-14 16:46:13 +08:00
mfp-pxa300.h ARM: pxa: fix CI_HSYNC and CI_VSYNC MFP defines for pxa300 2010-08-30 09:59:43 +08:00
mfp-pxa320.h [ARM] pxa: add additional mfp definitions for pxa320 2009-06-05 10:32:55 +08:00
mfp-pxa930.h ARM: pxa: append tavorevb3 support 2010-10-09 17:07:24 +08:00
mfp.h [ARM] pxa: remove duplicate mfp definition in mach 2009-09-10 18:49:24 +08:00
mioa701.h [ARM] pxa/MioA701: discovered new gpio definitions. 2008-12-02 14:43:48 +08:00
mmc.h [ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecond 2010-05-11 17:25:04 +02:00
mtd-xip.h ARM: pxa: use correct __iomem annotations 2011-10-08 21:03:07 +08:00
mxm8x10.h [ARM] pxa: fix typo in mxm8x10.h 2010-03-02 10:24:14 +08:00
ohci.h [ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registers 2008-10-07 19:12:57 +01:00
palm27x.h ARM: pxa: fix inconsistent CONFIG_USB_PXA27X 2011-11-10 15:32:27 +08:00
palmasoc.h [ARM] pxa/palm27x: General fix for Palm27x aSoC driver 2009-04-19 21:56:54 +08:00
palmld.h ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ 2011-11-14 21:07:58 +08:00
palmt5.h ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ 2011-11-14 21:07:58 +08:00
palmtc.h ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ 2011-11-14 21:07:58 +08:00
palmte2.h tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
palmtreo.h [ARM] pxa/treo: add Palm Centro 685 support 2009-12-01 09:02:49 +08:00
palmtx.h ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ 2011-11-14 21:07:58 +08:00
palmz72.h ARM: pxa: PalmZ72: Add OV9640 camera support 2011-03-16 16:32:47 +08:00
pata_pxa.h [ARM] pata_pxa: DMA-capable PATA driver 2010-06-18 15:07:32 +08:00
pcm027.h ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ 2011-11-14 21:07:58 +08:00
pcm990_baseboard.h ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ 2011-11-14 21:07:58 +08:00
pm.h ARM: pm: allow suspend finisher to return error codes 2011-07-02 09:54:01 +01:00
poodle.h ARM: pxa: rename NR_BUILTIN_GPIO 2011-11-14 21:07:59 +08:00
pxa2xx-regs.h ARM: pxa: Access SMEMC via virtual addresses 2010-12-16 14:31:16 +08:00
pxa3xx-regs.h Fix common misspellings 2011-03-31 11:26:23 -03:00
pxa3xx-u2d.h ARM: pxa: add U2D controller and ULPI driver for pxa3xx 2010-10-08 16:21:17 +08:00
pxa3xx.h ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
pxa25x-udc.h
pxa25x.h ARM: pxa: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +08:00
pxa27x-udc.h treewide: transciever/transceiver spelling fixes 2011-06-24 11:20:14 +02:00
pxa27x.h ARM: pxa/z2: fix building error of pxa27x_cpu_suspend() no longer available 2011-10-08 21:02:44 +08:00
pxa95x.h ARM: pxa: pxa95x/saarb depends on pxa3xx code 2011-10-08 21:03:00 +08:00
pxa300.h ARM: pxa: add common header file for pxa3xx 2011-07-12 19:45:20 +08:00
pxa320.h ARM: pxa: add common header file for pxa3xx 2011-07-12 19:45:20 +08:00
pxa930_rotary.h Input: add support for enhanced rotary controller on pxa930 and pxa935 2008-12-29 04:59:16 -08:00
pxa930_trkball.h Input: add support for trackball on pxa930 and pxa935 2008-12-29 04:58:58 -08:00
pxa930.h ARM: pxa: add common header file for pxa3xx 2011-07-12 19:45:20 +08:00
pxafb.h ARM: pxa: make pxafb_smart_*() empty when not enabled 2011-10-08 21:03:04 +08:00
regs-ac97.h [ARM] pxa: fix missing of __REG() definition for ac97 registers access 2009-01-19 11:39:36 +08:00
regs-lcd.h [ARM] pxafb: add support for overlay1 and overlay2 as framebuffer devices 2008-12-29 18:00:04 +08:00
regs-ost.h [ARM] pxa: separate definitions from pxa-regs.h and remove it finally 2009-03-09 21:22:40 +08:00
regs-rtc.h [ARM] pxa: separate definitions from pxa-regs.h and remove it finally 2009-03-09 21:22:40 +08:00
regs-u2d.h [ARM] pxa: add missing new line to regs-u2d.h 2010-05-06 11:12:10 +08:00
regs-uart.h [ARM] pxa: move UART register definitions into dedicated regs-uart.h 2008-12-02 14:42:38 +08:00
reset.h [ARM] pxa: allow gpio_reset drive high during normal work 2009-05-18 21:52:09 +08:00
sharpsl_pm.h [ARM] pxa: removed mostly unused and confusing two sharpsl.h 2010-08-05 14:32:38 +08:00
smemc.h ARM: pxa: use correct __iomem annotations 2011-10-08 21:03:07 +08:00
spitz.h ARM: pxa: rename NR_BUILTIN_GPIO 2011-11-14 21:07:59 +08:00
timex.h [ARM] rtc-sa1100: don't assume CLOCK_TICK_RATE to be a constant 2008-12-29 17:57:48 +08:00
tosa_bt.h
tosa.h ARM: pxa: rename NR_BUILTIN_GPIO 2011-11-14 21:07:59 +08:00
trizeps4.h ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ 2011-11-14 21:07:58 +08:00
udc.h
uncompress.h ARM: zImage: remove the static qualifier from global data variables 2011-05-07 00:08:02 -04:00
viper.h [ARM] pxa/zeus: make Viper pcmcia support more generic to support Zeus 2009-12-13 21:42:58 +08:00
vpac270.h [ARM] pxa/vpac270: remove TS_IRQ magic number 2010-05-11 17:25:03 +02:00
z2.h ARM: PXA: Z2: Fix libertas init/tear down sequences 2011-03-16 14:56:02 +01:00
zeus.h ARM: pxa: use correct __iomem annotations 2011-10-08 21:03:07 +08:00
zylonite.h ARM: pxa: make zylonite_pxa*_init declaration match code 2011-10-08 21:02:57 +08:00