FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-25 02:48:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
314ff52727
linux/arch/arm/mach-imx
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 dmaengine: Add Freescale i.MX SDMA support 2010-10-05 15:49:26 -07:00
cache-l2x0.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
clock-imx1.c MX1: Register clock for SPI2 2011-03-07 19:29:13 +01:00
clock-imx21.c Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
clock-imx25.c spi/imx: use soc name in spi device type naming scheme 2011-07-14 13:47:02 -06:00
clock-imx27.c Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
clock-imx31.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
clock-imx35.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
cpu-imx27.c ARM: imx: Get the silicon version from the IIM module 2010-11-28 19:51:47 +01:00
cpu-imx31.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
cpu-imx35.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
crmregs-imx31.h ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
devices-imx1.h ARM: imx: clean up the section marks of extern data 2011-05-19 13:11:11 +02:00
devices-imx21.h ARM: imx: clean up the section marks of extern data 2011-05-19 13:11:11 +02:00
devices-imx25.h ARM: imx: clean up the section marks of extern data 2011-05-19 13:11:11 +02:00
devices-imx27.h ARM: imx: clean up the section marks of extern data 2011-05-19 13:11:11 +02:00
devices-imx31.h ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
devices-imx35.h ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
dma-v1.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
ehci-imx25.c ARM i.MX ehci: factor out soc specific functions 2011-02-11 08:34:17 +01:00
ehci-imx27.c ARM i.MX ehci: factor out soc specific functions 2011-02-11 08:34:17 +01:00
ehci-imx31.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
ehci-imx35.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
eukrea_mbimx27-baseboard.c ARM: imx: convert to new leds-gpio registration helper 2011-07-07 09:59:57 +02:00
eukrea_mbimxsd25-baseboard.c ARM: imx: convert to new leds-gpio registration helper 2011-07-07 09:59:57 +02:00
eukrea_mbimxsd35-baseboard.c ARM: imx: convert to new leds-gpio registration helper 2011-07-07 09:59:57 +02:00
iomux-imx31.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
Kconfig ARM: mach-imx/mx27_3ds: Add LCD support 2011-07-07 10:01:10 +02:00
mach-apf9328.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
mach-armadillo5x0.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
mach-bug.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
mach-cpuimx27.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
mach-cpuimx35.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
mach-eukrea_cpuimx25.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
mach-imx27_visstrim_m10.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
mach-imx27ipcam.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
mach-imx27lite.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
mach-kzm_arm11_01.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
mach-mx1ads.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
mach-mx21ads.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
mach-mx25_3ds.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
mach-mx27_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
mach-mx27ads.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
mach-mx31_3ds.c 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
mach-mx31ads.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
mach-mx31lilly.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
mach-mx31lite.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
mach-mx31moboard.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
mach-mx35_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
mach-mxt_td60.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
mach-pca100.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
mach-pcm037_eet.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
mach-pcm037.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
mach-pcm038.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
mach-pcm043.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
mach-qong.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
mach-scb9328.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
mach-vpr200.c gpio/mxc: Change gpio-mxc into an upstanding gpio driver 2011-06-06 10:01:19 -06:00
Makefile ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
Makefile.boot ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
mm-imx1.c gpio/mxc: get rid of the uses of cpu_is_mx() 2011-07-08 12:38:12 -06:00
mm-imx21.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
mm-imx25.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
mm-imx27.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
mm-imx31.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
mm-imx35.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
mx1-camera-fiq-ksym.c
mx1-camera-fiq.S
mx31lilly-db.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
mx31lite-db.c ARM: imx: convert to new leds-gpio registration helper 2011-07-07 09:59:57 +02:00
mx31moboard-devboard.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
mx31moboard-marxbot.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
mx31moboard-smartbot.c ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
pcm037.h ARM: imx: move mx3 support to mach-imx 2011-05-19 13:11:38 +02:00
pcm970-baseboard.c ARM: imx: remove now empty devices.h 2010-11-17 10:01:34 +01:00
pm-imx27.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00