AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-05 08:46:43 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity
f5395480f5
linux_dsm_epyc7002/arch/arm/mach-s5pv210
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 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
cpu.c ARM: S5PV210: Support ADC 2011-07-20 23:39:22 +09:00
dev-audio.c ARM: SAMSUNG: Add IRQ_I2S0 definition 2011-07-21 17:27:28 +09:00
dev-spi.c ARM: SAMSUNG: Add tx_st_done variable 2011-07-06 15:03:08 +09:00
dma.c ARM: S5P: Reorder DMA platform device id 2010-10-25 16:10:47 +09:00
init.c ARM: S5PV210: Add Samsung S5PV210 CPU support 2010-02-24 22:47:21 +00:00
Kconfig 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
mach-aquila.c ARM: S5PV210: Cleanup mach/regs-fb.h from mach-s5pv210 2011-07-21 02:11:34 +09:00
mach-goni.c 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
mach-smdkc110.c ARM: S5P: Update machine of S5P64X0 and S5PV210 for HRT 2011-03-12 08:02:12 +09:00
mach-smdkv210.c 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
mach-torbreck.c ARM: S5P: Update machine of S5P64X0 and S5PV210 for HRT 2011-03-12 08:02:12 +09:00
Makefile [CPUFREQ] Move ARM Samsung cpufreq drivers to drivers/cpufreq/ 2011-07-13 18:29:51 -04:00
Makefile.boot ARM: S5PV210: Add Samsung S5PV210 CPU support 2010-02-24 22:47:21 +00:00
pm.c ARM: pm: samsung: move cpu_suspend into C code 2011-06-24 08:48:44 +01:00
setup-fb-24bpp.c ARM: S5PV210: Cleanup mach/regs-fb.h from mach-s5pv210 2011-07-21 02:11:34 +09:00
setup-fimc.c ARM: S5P: Add platform helpers for camera GPIO configuration 2011-03-11 15:49:00 +09:00
setup-i2c0.c ARM: S5PV210: 2nd Change to using s3c_gpio_cfgall_range() 2010-10-23 11:51:09 +09:00
setup-i2c1.c ARM: S5PV210: 2nd Change to using s3c_gpio_cfgall_range() 2010-10-23 11:51:09 +09:00
setup-i2c2.c ARM: S5PV210: 2nd Change to using s3c_gpio_cfgall_range() 2010-10-23 11:51:09 +09:00
setup-ide.c ARM: S5PV210: 2nd Change to using s3c_gpio_cfgrange_nopull() 2010-10-23 11:52:26 +09:00
setup-keypad.c ARM: S5PV210: 2nd Change to using s3c_gpio_cfgrange_nopull() 2010-10-23 11:52:26 +09:00
setup-sdhci-gpio.c Fix common misspellings 2011-03-31 11:26:23 -03:00
setup-sdhci.c Fix common misspellings 2011-03-31 11:26:23 -03:00
sleep.S ARM: pm: samsung: move cpu_suspend into C code 2011-06-24 08:48:44 +01:00