korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-28 13:34:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
48e93e402a
linux/arch/arm/mach-mx5
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
..
board-cpuimx51.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
board-cpuimx51sd.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
board-mx50_rdp.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
board-mx51_3ds.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
board-mx51_babbage.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
board-mx51_efikamx.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
board-mx51_efikasb.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
board-mx53_ard.c ARM: mach-mx5/mx53_ard: Add gpio_keys support 2011-07-07 10:01:14 +02:00
board-mx53_evk.c ARM: mx5/mx53_evk: Add support for LED 2011-07-07 10:01:06 +02:00
board-mx53_loco.c ARM:mach-mx5/board-mx53_loco: Add CD and WP GPIOs 2011-07-07 10:01:08 +02:00
board-mx53_smd.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
clock-mx51-mx53.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_op-mx51.c cpufreq for freescale mx51 2010-10-22 08:24:14 +02:00
cpu_op-mx51.h cpufreq for freescale mx51 2010-10-22 08:24:14 +02:00
cpu.c ARM: mx53: Print silicon revision on boot 2011-05-19 13:11:00 +02:00
crm_regs.h ARM: mx53: Add support for missing UARTs 2011-07-07 10:01:12 +02:00
devices-imx50.h ARM: imx: clean up the section marks of extern data 2011-05-19 13:11:11 +02:00
devices-imx51.h ARM: mx51: Remove imx51_add_gpio_keys 2011-05-19 13:11:25 +02:00
devices-imx53.h ARM: mx53: Add keypad support 2011-07-07 10:01:13 +02:00
devices.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
devices.h ARM: mx5: dynamically allocate imx-keypad devices 2011-01-12 14:50:45 +01:00
efika.h efikamx: add usb h1 support 2011-02-18 10:56:38 +01:00
ehci.c ARM i.MX ehci: factor out soc specific functions 2011-02-11 08:34:17 +01:00
eukrea_mbimx51-baseboard.c ARM i.MX: get rid of wrong MXC_INTERNAL_IRQ usage 2011-07-07 10:00:00 +02:00
eukrea_mbimxsd-baseboard.c ARM: mx5: convert to new leds-gpio registration helper 2011-07-07 09:59:57 +02:00
Kconfig ARM: mach-mx5/mx53_ard: Add gpio_keys support 2011-07-07 10:01:14 +02:00
Makefile ARM: mx51: Add support for low power suspend on MX51 2011-07-07 10:01:10 +02:00
Makefile.boot ARM i.MX53: Make MX53 EVK bootable 2011-01-04 12:00:23 +01:00
mm-mx50.c gpio/mxc: get rid of the uses of cpu_is_mx() 2011-07-08 12:38:12 -06:00
mm.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
mx51_efika.c ARM: imx: remove #includes already available from devices-common.h 2011-05-19 13:11:08 +02:00
pm-imx5.c ARM: mx51: Add support for low power suspend on MX51 2011-07-07 10:01:10 +02:00
system.c ARM: mx51: Implement code to allow mx51 to enter WFI 2011-03-23 15:08:15 +01:00