FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-25 02:48:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
69f1d1a6ac
linux/arch/arm/mach-s3c64xx
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
..
include/mach 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
clock.c ARM: S3C64XX: Add clkdev support 2011-07-20 19:11:30 +09:00
cpu.c
dev-audio.c ASoC: Samsung: Rename AC97 platform device 2010-11-23 14:05:29 +00:00
dev-onenand1.c ARM: S3C64XX: Use generic s3c_set_platdata for OneNAND 2011-07-21 02:11:21 +09:00
dev-spi.c ARM: SAMSUNG: Add tx_st_done variable 2011-07-06 15:03:08 +09:00
dev-uart.c
dma.c ARM: SAMSUNG: DMA Cleanup as per sparse 2011-07-16 15:50:19 +09:00
gpiolib.c ARM: S3C64XX: Staticise non-exported GPIO to interrupt functions 2011-03-04 15:46:26 +09:00
irq-eint.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
irq-pm.c ARM / Samsung: Use struct syscore_ops for "core" power management 2011-04-24 19:16:10 +02:00
irq.c ARM: S3C64XX: Ensure VIC based IRQs can be resumed from 2011-07-20 23:12:22 +09:00
Kconfig Merge branch 'next/board' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:13:04 -07:00
mach-anw6410.c ARM: S3C64XX: Cleanup mach/regs-fb.h from mach-s3c64xx 2011-07-21 02:11:39 +09:00
mach-crag6410.c ARM: S3C64XX: Configure backup battery charger on Cragganmore 2011-07-21 01:26:24 +09:00
mach-hmt.c ARM: S3C64XX: Cleanup mach/regs-fb.h from mach-s3c64xx 2011-07-21 02:11:39 +09:00
mach-mini6410.c ARM: S3C64XX: Cleanup mach/regs-fb.h from mach-s3c64xx 2011-07-21 02:11:39 +09:00
mach-ncp.c ARM: S3C64XX: Cleanup mach/regs-fb.h from mach-s3c64xx 2011-07-21 02:11:39 +09:00
mach-real6410.c ARM: S3C64XX: Cleanup mach/regs-fb.h from mach-s3c64xx 2011-07-21 02:11:39 +09:00
mach-smartq5.c ARM: S3C64XX: Cleanup mach/regs-fb.h from mach-s3c64xx 2011-07-21 02:11:39 +09:00
mach-smartq7.c ARM: S3C64XX: Cleanup mach/regs-fb.h from mach-s3c64xx 2011-07-21 02:11:39 +09:00
mach-smartq.c ARM: 6351/1: s3c64xx: don't put smartq_bl_init in .init.text 2010-09-02 16:36:07 +01:00
mach-smartq.h ARM: S3C6410: Add basic support for SmartQ machines 2010-05-20 19:42:15 +09:00
mach-smdk6400.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-smdk6410.c ARM: S3C64XX: Cleanup mach/regs-fb.h from mach-s3c64xx 2011-07-21 02:11:39 +09:00
Makefile Merge branch 'next/board' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:13:04 -07:00
Makefile.boot
pm.c ARM: pm: allow suspend finisher to return error codes 2011-07-02 09:54:01 +01:00
s3c6400.c ARM: SAMSUNG: Add platform support code for OneNAND controller 2010-05-20 17:48:36 +09:00
s3c6410.c ARM: SAMSUNG: Implement set_name function for ADC devices 2010-08-05 18:32:50 +09:00
setup-fb-24bpp.c ARM: S3C64XX: Cleanup mach/regs-fb.h from mach-s3c64xx 2011-07-21 02:11:39 +09:00
setup-i2c0.c ARM: S3C64XX: Remove gpio-bank-X header files 2011-05-06 09:37:36 +09:00
setup-i2c1.c ARM: S3C64XX: Remove gpio-bank-X header files 2011-05-06 09:37:36 +09:00
setup-ide.c ARM: S3C64XX: Ensure s3c64xx_ide_setup_gpio() is prototyped 2010-10-25 16:04:33 +09:00
setup-keypad.c ARM: S3C64XX: Fix keypad setup to configure correct number of rows 2011-03-04 15:46:26 +09:00
setup-sdhci-gpio.c ARM: S3C64XX: Change to using s3c_gpio_cfgrange_nopull() 2010-10-23 11:51:37 +09:00
setup-sdhci.c ARM: S3C64XX: Tone down SDHCI debugging 2011-03-04 15:46:27 +09:00
sleep.S ARM: pm: samsung: move cpu_suspend into C code 2011-06-24 08:48:44 +01:00