kevin/linux
1
Fork 0
Code
4c677e2eef
linux/arch/arm/plat-samsung
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/plat 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
adc.c ARM: SAMSUNG: Revise PM for 12-bit ADC operations 2011-07-20 23:39:12 +09:00
clock-clksrc.c ARM: SAMSUNG: Fix bug in clksrc-clk round_rate call. 2010-01-18 16:00:56 +09:00
clock.c Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-25 12:38:42 -07:00
dev-adc.c ARM: SAMSUNG: Moving ADC device definition to plat-samsung. 2010-05-18 13:38:44 +09:00
dev-asocdma.c ARM: SAMSUNG: Add platform device for idma 2011-07-21 14:12:19 +09:00
dev-backlight.c ARM: SAMSUNG: Create a common infrastructure for PWM backlight support 2011-07-21 02:10:16 +09:00
dev-fb.c ARM: SAMSUNG: Use generic s3c_set_platdata for FB 2011-07-21 02:11:01 +09:00
dev-hsmmc1.c ARM: SAMSUNG: Add clock types into platform data 2010-10-25 16:02:47 +09:00
dev-hsmmc2.c ARM: SAMSUNG: Add clock types into platform data 2010-10-25 16:02:47 +09:00
dev-hsmmc3.c ARM: SAMSUNG: Add clock types into platform data 2010-10-25 16:02:47 +09:00
dev-hsmmc.c ARM: SAMSUNG: Add clock types into platform data 2010-10-25 16:02:47 +09:00
dev-hwmon.c ARM: SAMSUNG: Use generic s3c_set_platdata for HWMON 2011-07-21 02:11:06 +09:00
dev-i2c0.c ARM: SAMSUNG: Cleanup I2C code in plat-samsung 2011-07-21 02:09:59 +09:00
dev-i2c1.c ARM: SAMSUNG: Cleanup I2C code in plat-samsung 2011-07-21 02:09:59 +09:00
dev-i2c2.c ARM: SAMSUNG: Cleanup I2C code in plat-samsung 2011-07-21 02:09:59 +09:00
dev-i2c3.c ARM: SAMSUNG: Cleanup I2C code in plat-samsung 2011-07-21 02:09:59 +09:00
dev-i2c4.c ARM: SAMSUNG: Cleanup I2C code in plat-samsung 2011-07-21 02:09:59 +09:00
dev-i2c5.c ARM: SAMSUNG: Cleanup I2C code in plat-samsung 2011-07-21 02:09:59 +09:00
dev-i2c6.c ARM: SAMSUNG: Cleanup I2C code in plat-samsung 2011-07-21 02:09:59 +09:00
dev-i2c7.c ARM: SAMSUNG: Cleanup I2C code in plat-samsung 2011-07-21 02:09:59 +09:00
dev-ide.c ARM: SAMSUNG: Add Compact Flash device support for Samsung SoCs 2010-08-05 18:32:50 +09:00
dev-keypad.c ARM: SAMSUNG: Add keypad device support 2010-08-06 21:27:50 +09:00
dev-nand.c ARM: SAMSUNG: Use generic s3c_set_platdata for NAND 2011-07-21 02:11:16 +09:00
dev-onenand.c ARM: SAMSUNG: Remove unused onenand plat functions 2011-06-03 16:45:02 -07:00
dev-pwm.c ARM: SAMSUNG: Move PWM device definition from plat-s3c24xx to plat-samsung 2011-03-03 10:09:58 +09:00
dev-rtc.c ARM: SAMSUNG: Move RTC device definitions in plat-samsung 2010-05-18 16:44:58 +09:00
dev-ts.c ARM: SAMSUNG: Use generic s3c_set_platdata for TS 2011-07-21 02:10:56 +09:00
dev-uart.c ARM: SAMSUNG: Include devs.h in dev-uart.c to prototype devices 2011-03-04 15:46:26 +09:00
dev-usb-hsotg.c ARM: SAMSUNG: Add DMA masks to hsotg device 2010-02-03 01:54:54 +00:00
dev-usb.c ARM: SAMSUNG: Use generic s3c_set_platdata for USB OHCI 2011-07-21 02:11:11 +09:00
dev-wdt.c ARM: SAMSUNG: Reduce virtual memory size for WDT device 2010-08-05 18:32:49 +09:00
dma.c ARM: SAMSUNG: DMA Cleanup as per sparse 2011-07-16 15:50:19 +09:00
gpio-config.c ARM: S3C2443: Implement GPIO pull-up/down configuration methods 2011-01-06 14:09:19 +09:00
gpio.c ARM: SAMSUNG: Add common samsung_gpiolib_to_irq function 2010-10-21 07:54:57 +09:00
init.c ARM: SAMSUNG: Fix CPU idmask 2011-03-28 16:17:54 +09:00
irq-uart.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
irq-vic-timer.c ARM: SAMSUNG: Check NULL return from irq_alloc_generic_chip 2011-07-16 11:13:47 +09:00
Kconfig ARM: SAMSUNG: Create a common infrastructure for PWM backlight support 2011-07-21 02:10:16 +09:00
Makefile ARM: SAMSUNG: Create a common infrastructure for PWM backlight support 2011-07-21 02:10:16 +09:00
pd.c ARM: SAMSUNG: Add support for Power Domain control 2010-12-30 09:36:52 +09:00
platformdata.c ARM: SAMSUNG: Add helper to clone and set platform data 2010-08-05 18:32:49 +09:00
pm-check.c treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00
pm-gpio.c ARM: S5PV210: Add Power Management Support 2010-10-21 07:54:57 +09:00
pm.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
pwm-clock.c ARM: S3C24XX: Add clkdev support 2011-07-20 19:11:29 +09:00
pwm.c ARM: SAMSUNG: Move PWM device definition from plat-s3c24xx to plat-samsung 2011-03-03 10:09:58 +09:00
s3c-pl330.c Fix common misspellings 2011-03-31 11:26:23 -03:00
time.c ARM: S3C24XX: Add clkdev support 2011-07-20 19:11:29 +09:00
wakeup-mask.c arm: plat-samsung: Use proper irq accessor functions 2011-03-29 14:47:53 +02:00