Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-14 08:02:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
83a497cab1
linux/arch/arm/mach-s3c2410/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
..
anubis-cpld.h
anubis-irq.h
anubis-map.h
bast-cpld.h ARM: S3C: Update Simtec copyright statements from , to - 2009-12-01 01:33:51 +00:00
bast-irq.h ARM: S3C: Update Simtec copyright statements from , to - 2009-12-01 01:33:51 +00:00
bast-map.h ARM: S3C: Update Simtec copyright statements from , to - 2009-12-01 01:33:51 +00:00
bast-pmu.h ARM: S3C: Update Simtec copyright statements from , to - 2009-12-01 01:33:51 +00:00
debug-macro.S arm: return both physical and virtual addresses from addruart 2010-10-20 00:27:33 -04:00
dma.h Fix common misspellings 2011-03-31 11:26:23 -03:00
entry-macro.S
fb.h
gpio-fns.h ARM: mach-s3c2400: delete 2011-07-18 10:59:26 -04:00
gpio-nrs.h ARM: S3C24XX: Add note on GPIO bank sizes 2010-05-18 19:06:35 +09:00
gpio-track.h ARM: S3C24XX: Remove macros mapping GPIO number to base 2010-05-18 19:06:34 +09:00
gpio.h ARM: S3C24XX: Fix gpiolib support for ports K..M 2010-10-20 19:40:46 +09:00
h1940-latch.h ARM: h1940: Fix backlight and LCD power functions 2010-10-30 00:45:28 +01:00
h1940.h ARM: S3C2410: H1940: Use leds-gpio driver for LEDs managing 2011-03-20 23:14:55 +00:00
hardware.h [ARM] S3C24XX: GPIO: Move gpio functions out of <mach/hardware.h> 2009-05-18 16:25:40 +01:00
idle.h
io.h [ARM] Revert futher extraneous changes from the S3C header move 2009-03-11 18:28:24 +00:00
irqs.h ARM: S3C24XX: Add address map and clock definitions for HSMMC0 2011-01-06 14:09:18 +09:00
leds-gpio.h
map.h ARM: S3C24XX: Add plaform device definition for USB High-Speed gadget controller. 2011-05-10 14:16:54 -07:00
memory.h ARM: P2V: separate PHYS_OFFSET from platform definitions 2011-02-17 23:26:55 +00:00
osiris-cpld.h
osiris-map.h ARM: S3C: Fix Simtec copyright statements in Documentation/S3C24XX 2009-12-01 01:33:50 +00:00
otom-map.h
pm-core.h ARM: SAMSUNG: Add support for pre-sleep/post-restore gpio control 2011-07-20 23:13:20 +09:00
regs-clock.h ARM: S3C2416: Add basic clock support 2010-05-10 11:44:43 +09:00
regs-dsc.h ARM: S3C2416: Add S3C2416-specific registers definitions 2010-05-10 11:44:03 +09:00
regs-gpio.h ARM: mach-s3c2400: delete 2011-07-18 10:59:26 -04:00
regs-gpioj.h ARM: S3C24XX: Remove _INP macros in <mach/regs-gpioj.h> 2010-05-06 11:32:14 +09:00
regs-irq.h ARM: S3C2416: Add S3C2416-specific registers definitions 2010-05-10 11:44:03 +09:00
regs-lcd.h
regs-mem.h ARM: mach-s3c2400: delete 2011-07-18 10:59:26 -04:00
regs-power.h ARM: S3C: Update Simtec copyright statements from , to - 2009-12-01 01:33:51 +00:00
regs-s3c2412-mem.h ARM: S3C2412: Update memory register mapping and definitions 2009-07-30 23:22:54 +01:00
regs-s3c2412.h
regs-s3c2416-mem.h ARM: S3C2416: Add S3C2416-specific registers definitions 2010-05-10 11:44:03 +09:00
regs-s3c2416.h ARM: S3C2416: Add S3C2416-specific registers definitions 2010-05-10 11:44:03 +09:00
regs-s3c2443-clock.h ARM: S3C2416: Add USB Phy register definitions 2011-05-10 14:16:54 -07:00
regs-sdi.h
reset.h
spi.h spi_s3c24xx: add FIQ pseudo-DMA support 2009-12-17 08:57:01 -07:00
system-reset.h [ARM] S3C: Move watchdog system reset to own file. 2009-05-17 23:30:45 +01:00
system.h [ARM] Convert asm/io.h to linux/io.h 2008-09-06 12:10:45 +01:00
tick.h [ARM] S3C24XX: Split timer pending code out 2008-12-15 21:46:41 +00:00
timex.h ARM: SAMSUNG: Move include/mach files out of plat-s3c 2010-02-24 01:52:12 +00:00
uncompress.h ARM: S3C: Add S3C2416 detection to uncompress code 2010-05-06 11:37:17 +09:00
vmalloc.h ARM: S3C: Change VMALLOC_END to use more vmalloc()/ioremap() area 2010-10-25 16:11:44 +09:00
vr1000-cpld.h
vr1000-irq.h ARM: S3C: Update Simtec copyright statements from , to - 2009-12-01 01:33:51 +00:00
vr1000-map.h