FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-21 00:42:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
ae4c42e4e4
linux/arch/arm/mach-imx
History
Linus Torvalds ae4c42e4e4 Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 
* 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (133 commits)
  ARM: EXYNOS4: Change devname for FIMD clkdev
  ARM: S3C64XX: Cleanup mach/regs-fb.h from mach-s3c64xx
  ARM: S5PV210: Cleanup mach/regs-fb.h from mach-s5pv210
  ARM: S5PC100: Cleanup mach/regs-fb.h from mach-s5pc100
  ARM: S3C24XX: Use generic s3c_set_platdata for devices
  ARM: S3C64XX: Use generic s3c_set_platdata for OneNAND
  ARM: SAMSUNG: Use generic s3c_set_platdata for NAND
  ARM: SAMSUNG: Use generic s3c_set_platdata for USB OHCI
  ARM: SAMSUNG: Use generic s3c_set_platdata for HWMON
  ARM: SAMSUNG: Use generic s3c_set_platdata for FB
  ARM: SAMSUNG: Use generic s3c_set_platdata for TS
  ARM: S3C64XX: Add PWM backlight support on SMDK6410
  ARM: S5P64X0: Add PWM backlight support on SMDK6450
  ARM: S5P64X0: Add PWM backlight support on SMDK6440
  ARM: S5PC100: Add PWM backlight support on SMDKC100
  ARM: S5PV210: Add PWM backlight support on SMDKV210
  ARM: EXYNOS4: Add PWM backlight support on SMDKC210
  ARM: EXYNOS4: Add PWM backlight support on SMDKV310
  ARM: SAMSUNG: Create a common infrastructure for PWM backlight support
  clocksource: convert 32-bit down counting clocksource on S5PV210/S5P64X0
  ...

Fix up trivial conflict in arch/arm/mach-imx/mach-scb9328.c
2011-07-25 12:38:42 -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: imx: convert to new leds-gpio registration helper 2011-07-07 09:59:57 +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 gpio/mxc: get rid of the uses of cpu_is_mx() 2011-07-08 12:38:12 -06:00
mm-imx25.c gpio/mxc: get rid of the uses of cpu_is_mx() 2011-07-08 12:38:12 -06:00
mm-imx27.c gpio/mxc: get rid of the uses of cpu_is_mx() 2011-07-08 12:38:12 -06:00
mm-imx31.c gpio/mxc: get rid of the uses of cpu_is_mx() 2011-07-08 12:38:12 -06:00
mm-imx35.c gpio/mxc: get rid of the uses of cpu_is_mx() 2011-07-08 12:38:12 -06:00
mx1-camera-fiq-ksym.c ARM: imx: move mx1 support to mach-imx 2010-06-30 08:59:44 +02:00
mx1-camera-fiq.S ARM: imx: move mx1 support to mach-imx 2010-06-30 08:59:44 +02:00
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