leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1b7bd28cbb
linux/arch/arm/plat-s5p/include/plat
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
..
camport.h ARM: S5P: Add platform helpers for camera GPIO configuration 2011-03-11 15:49:00 +09:00
ehci.h ARM: S5P: Add usb ehci device 2011-04-13 16:50:44 -07:00
exynos4.h ARM: EXYNOS4: Add EXYNOS4 CPU initialization support 2011-02-22 13:51:14 +09:00
irqs.h ARM: S5P: Fix missed IRQ_EINT_BIT() 2010-10-25 15:51:33 +09:00
map-s5p.h ARM: EXYNOS4: Add external GIC io memory mapping 2011-07-20 23:28:06 +09:00
mfc.h ARM: S5P: Add support for MFC device 2011-07-21 17:29:00 +09:00
mipi_csis.h ARM: S5P: Extend MIPI-CSIS platform_data with the PHY control callback 2011-03-11 15:49:00 +09:00
pll.h ARM: S5P64X0: Update Clock for S5P6440 and S5P6450 2010-10-18 18:33:02 +09:00
regs-srom.h ARM: S5P: Add SROM bank 4 and 5 register offsets 2010-12-30 09:37:48 +09:00
reset.h ARM: S5P: Add s5p_reset_hook() for perform reset using SWRESET on S5P SoCs 2010-08-05 18:30:22 +09:00
s5p6440.h ARM: S5P64X0: Add S5P64X0(S5P6440 and S5P6450) initialization support 2010-10-18 18:29:51 +09:00
s5p6450.h ARM: S5P64X0: Add S5P64X0(S5P6440 and S5P6450) initialization support 2010-10-18 18:29:51 +09:00
s5p-clock.h ARM: SAMSUNG: Move duplicate code for SPDIF ops 2011-07-21 02:10:04 +09:00
s5p-time.h ARM: S5P: HRT support 2011-03-12 08:02:07 +09:00
s5pc100.h ARM: SAMSUNG: move S5PC100 support from plat-s5pc1xx to plat-s5p framework 2010-05-20 15:28:32 +09:00
s5pv210.h ARM: S5PV210: Add Samsung S5PV210 CPU support 2010-02-24 22:47:21 +00:00
sysmmu.h ARM: EXYNOS4: Enhancement of System MMU driver 2011-03-15 21:37:25 +09:00
system-reset.h ARM: S5P: Add s5p_reset_hook() for perform reset using SWRESET on S5P SoCs 2010-08-05 18:30:22 +09:00
usb-phy.h ARM: EXYNOS4: Add usb host phy control 2011-04-13 16:50:44 -07:00