openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/arch/arm/mach-pxa/include/mach
History
Linus Torvalds 69f1d1a6ac Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 
* 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (128 commits)
  ARM: S5P64X0: External Interrupt Support
  ARM: EXYNOS4: Enable MFC on Samsung NURI
  ARM: EXYNOS4: Enable MFC on universal_c210
  ARM: S5PV210: Enable MFC on Goni
  ARM: S5P: Add support for MFC device
  ARM: EXYNOS4: Add support FIMD on SMDKC210
  ARM: EXYNOS4: Add platform device and helper functions for FIMD
  ARM: EXYNOS4: Add resource definition for FIMD
  ARM: EXYNOS4: Change devname for FIMD clkdev
  ARM: SAMSUNG: Add IRQ_I2S0 definition
  ARM: SAMSUNG: Add platform device for idma
  ARM: EXYNOS4: Add more registers to be saved and restored for PM
  ARM: EXYNOS4: Add more register addresses of CMU
  ARM: EXYNOS4: Add platform device for dwmci driver
  ARM: EXYNOS4: configure rtc-s3c on NURI
  ARM: EXYNOS4: configure MAX8903 secondary charger on NURI
  ARM: EXYNOS4: configure ADC on NURI
  ARM: EXYNOS4: configure MAX17042 fuel gauge on NURI
  ARM: EXYNOS4: configure regulators and PMIC(MAX8997) on NURI
  ARM: EXYNOS4: Increase NR_IRQS for devices with more IRQs
  ...

Fix up tons of silly conflicts:
 - arch/arm/mach-davinci/include/mach/psc.h
 - arch/arm/mach-exynos4/Kconfig
 - arch/arm/mach-exynos4/mach-smdkc210.c
 - arch/arm/mach-exynos4/pm.c
 - arch/arm/mach-imx/mm-imx1.c
 - arch/arm/mach-imx/mm-imx21.c
 - arch/arm/mach-imx/mm-imx25.c
 - arch/arm/mach-imx/mm-imx27.c
 - arch/arm/mach-imx/mm-imx31.c
 - arch/arm/mach-imx/mm-imx35.c
 - arch/arm/mach-mx5/mm.c
 - arch/arm/mach-s5pv210/mach-goni.c
 - arch/arm/mm/Kconfig
 		2011-07-26 17:41:04 -07:00
..
addr-map.h ARM: pxa: introduce addr-map.h for large bus addresses and ranges 2010-12-16 14:31:15 +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 ARM: pxa: Add Balloon3 NAND ready check 2010-12-20 23:14:09 +08: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 treewide: transciever/transceiver spelling fixes 2011-06-24 11:20:14 +02:00
csb726.h [ARM] pxa: add initial support for Cogent CSB726 board 2009-03-13 17:10:44 +08:00
debug-macro.S arm: return both physical and virtual addresses from addruart 2010-10-20 00:27:33 -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
entry-macro.S [ARM] pxa: fix interrupts number calculation when CONFIG_PXA_HAVE_ISA_IRQS=y 2009-11-13 16:25:46 +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: convert incorrect IRQ_TO_IRQ() to irq_to_gpio() 2011-04-13 09:30:40 +08:00
gumstix.h [ARM] pxa: removing dead ARCH_GUMSTIX_ORIG 2010-08-05 14:32:31 +08:00
h5000.h [ARM] pxa: add basic support for HP iPAQ h5000 2008-12-02 14:43:50 +08:00
hardware.h ARM: convert PCI defines to variables 2011-07-12 11:19:29 -05:00
hx4700.h ARM: pxa: encode IRQ number into .nr_irqs 2010-10-08 16:21:17 +08:00
idp.h
…
io.h arm: fix "arm: fix pci_set_consistent_dma_mask for dmabounce devices" 2010-09-22 17:22:38 -07: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: move declarations from generic.h to <soc>.h 2011-07-12 19:50:32 +08:00
littleton.h ARM: pxa: encode IRQ number into .nr_irqs 2010-10-08 16:21:17 +08:00
lpd270.h ARM: pxa: encode IRQ number into .nr_irqs 2010-10-08 16:21:17 +08:00
lubbock.h ARM: pxa: encode IRQ number into .nr_irqs 2010-10-08 16:21:17 +08:00
magician.h ARM: pxa/magician: fix MAGICIAN_EGPIO_BASE, align with NR_BUILTIN_GPIO 2011-07-11 14:43:29 +08:00
mainstone.h ARM: pxa: encode IRQ number into .nr_irqs 2010-10-08 16:21:17 +08:00
memory.h ARM: mach-pxa: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size 2011-07-18 15:30:01 -04: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: simplify the LCD pin configuration for pxa27x platforms 2010-03-02 07:40:47 +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: separate definitions from pxa-regs.h and remove it finally 2009-03-09 21:22:40 +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/palm: Introduce Palm27x 2010-08-05 14:32:39 +08:00
palmasoc.h [ARM] pxa/palm27x: General fix for Palm27x aSoC driver 2009-04-19 21:56:54 +08:00
palmld.h tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
palmt5.h tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
palmtc.h tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01: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 tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01: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: encode IRQ number into .nr_irqs 2010-10-08 16:21:17 +08:00
pcm990_baseboard.h
…
pm.h ARM: pm: allow suspend finisher to return error codes 2011-07-02 09:54:01 +01:00
poodle.h ARM: pxa: encode IRQ number into .nr_irqs 2010-10-08 16:21:17 +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: enable MULTI_IRQ_HANDLER for all boards 2011-07-12 19:50:33 +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.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
pxafb.h ARM: pxa: clean up set_pxa_fb_info 2011-03-16 16:32:47 +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: Access SMEMC via virtual addresses 2010-12-16 14:31:16 +08:00
spitz.h [ARM] pxa/spitz: Rework spitz 2010-08-05 14:32:41 +08:00
system.h [ARM] pass reboot command line to arch_reset() 2009-03-19 16:20:24 +00: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.h ARM: pxa: encode IRQ number into .nr_irqs 2010-10-08 16:21:17 +08:00
tosa_bt.h
…
trizeps4.h [ARM] 5204/1: Trizeps4 SOM update 2008-10-01 22:33:11 +01: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
vmalloc.h ARM: 5928/1: Change type of VMALLOC_END to unsigned long. 2010-02-15 21:40:33 +00: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 Fix common misspellings 2011-03-31 11:26:23 -03:00
zylonite.h ARM: pxa: encode IRQ number into .nr_irqs 2010-10-08 16:21:17 +08:00