Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-18 18:11:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
fee926bb0d
linux/arch/arm/mach-mxs
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
..
devices Merge branch 'next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-25 11:53:35 -07:00
include/mach Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:12:10 -07:00
clock-mx23.c mx23: register clocks for mmc 2011-05-19 13:11:35 +02:00
clock-mx28.c ARM: mxs/clock-mx28: fix up name##_set_rate 2011-04-12 09:48:02 +02:00
clock.c ARM i.MX23/28: remove secondary field from struct clk. It's unused 2011-01-24 09:01:48 +01:00
devices-mx23.h ARM: mxs: dynamically allocate mmc device 2011-03-25 08:36:55 +01:00
devices-mx28.h ARM: mxs: fix naming of struct holding info for mxs-i2c devices 2011-05-19 13:11:23 +02:00
devices.c gpio/mxs: Change gpio-mxs into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
icoll.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
iomux.c ARM: mxs: Add iomux support 2010-12-20 17:29:58 +01:00
Kconfig arm: mxs: add mmc-device for mach-tx28 2011-07-07 10:01:14 +02:00
mach-mx23evk.c ARM: mxs/mach-mx2[38]evk: Set the initial value on gpio_request_one 2011-05-19 13:11:10 +02:00
mach-mx28evk.c ARM: mxs/mx28evk: add leds-gpio device for heartbeat 2011-07-07 10:01:07 +02:00
mach-stmp378x_devb.c ARM: mach-mxs: add stmp378x-devb 2011-05-02 19:08:54 +01:00
mach-tx28.c arm: mxs: add mmc-device for mach-tx28 2011-07-07 10:01:14 +02:00
Makefile gpio/mxs: Move Freescale mxs gpio driver to drivers/gpio 2011-06-06 09:37:58 -06:00
Makefile.boot ARM: mxs: Add build configuration for mxs 2010-12-20 17:30:44 +01:00
mm-mx23.c gpio/mxs: Change gpio-mxs into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
mm-mx28.c gpio/mxs: Change gpio-mxs into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
module-tx28.c ARM: mxs: configure and register the second FEC device on TX28/STK5-V4 2011-03-23 15:08:14 +01:00
module-tx28.h ARM: mxs: configure and register the second FEC device on TX28/STK5-V4 2011-03-23 15:08:14 +01:00
ocotp.c arm: mxs: include asm/processor.h for cpu_relax() 2011-06-06 09:50:04 +02:00
pm.c ARM: mxs: add initial pm support 2011-01-26 08:30:49 +01:00
regs-clkctrl-mx23.h ARM i.MX23: remove reserved register defines 2011-01-28 08:28:52 +01:00
regs-clkctrl-mx28.h ARM i.MX28: remove reserved register defines 2011-01-28 08:28:57 +01:00
system.c ARM: mxs: Add missing EXPORT_SYMBOL for mxs_reset_block 2011-03-07 19:29:06 +01:00
timer.c clocksource: convert MXS timrotv2 to 32-bit down counting clocksource 2011-05-23 18:04:52 +01:00