p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
linux_old1/arch/arm/mach-s3c64xx/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
..
clkdev.h ARM: SAMSUNG: Added mach/clkdev.h 2011-07-21 02:04:14 +09:00
debug-macro.S arm: return both physical and virtual addresses from addruart 2010-10-20 00:27:33 -04:00
dma.h ARM: SAMSUNG: Remove dma-plat.h to allow plat-s3c64xx to be removed 2010-02-21 23:10:35 +00:00
entry-macro.S ARM: S3C64XX: Move IRQ support into mach-s3c64xx 2010-02-20 22:32:00 +00:00
gpio.h ARM: S3C64XX: Add initial support for board specific IRQs 2010-02-24 23:54:43 +00:00
hardware.h
…
io.h ARM: SAMSUNG: Move include/mach files out of plat-s3c 2010-02-24 01:52:12 +00:00
irqs.h Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
map.h ARM: S3C64XX: Add keypad device to the SMDK6410 board 2010-08-06 21:28:30 +09:00
memory.h ARM: P2V: separate PHYS_OFFSET from platform definitions 2011-02-17 23:26:55 +00:00
pll.h ARM: SAMSUNG: Move S3C6400 PLL code to <plat/pll.h> for re-use 2010-05-10 11:44:37 +09:00
pm-core.h ARM: SAMSUNG: Add support for pre-sleep/post-restore gpio control 2011-07-20 23:13:20 +09:00
pwm-clock.h
…
regs-clock.h ARM: S3C64XX: Add support for Compact Flash driver on SMDK6410 2010-08-05 18:32:50 +09:00
regs-gpio-memport.h ARM: S3C64XX: Move headers into machine include directory 2010-02-20 22:31:17 +00:00
regs-gpio.h ARM: S3C64XX: Move headers into machine include directory 2010-02-20 22:31:17 +00:00
regs-irq.h
…
regs-modem.h ARM: S3C64XX: Move headers into machine include directory 2010-02-20 22:31:17 +00:00
regs-srom.h ARM: S3C64XX: Move headers into machine include directory 2010-02-20 22:31:17 +00:00
regs-sys.h ARM: S3C64XX: Move headers into machine include directory 2010-02-20 22:31:17 +00:00
regs-syscon-power.h ARM: S3C64XX: Move headers into machine include directory 2010-02-20 22:31:17 +00:00
s3c6400.h ARM: S3C64XX: Combine the clock init code 2010-02-20 22:34:02 +00:00
s3c6410.h ARM: S3C64XX: Move core support to mach-s3c64xx 2010-02-20 22:33:54 +00:00
spi-clocks.h ARM: S3C64XX: Move device and device setup into mach-s3c64xx 2010-02-20 22:32:01 +00:00
system.h
…
tick.h
…
timex.h ARM: SAMSUNG: Move include/mach files out of plat-s3c 2010-02-24 01:52:12 +00:00
uncompress.h
…
vmalloc.h ARM: S3C: Change VMALLOC_END to use more vmalloc()/ioremap() area 2010-10-25 16:11:44 +09:00