android_kernel_xiaomi_sdm845/arch/arm/mach-mx2
Uwe Kleine-König 9b1489e989 Merge branch 'mxc-master' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/master
Removed selection of COMMON_CLKDEV by CONFIG_ARCH_MX5.  This is handled
in 03e09cd890.

arch/arm/plat-mxc/iomux-mx1-mx2.c was moved to
arch/arm/plat-mxc/iomux-v1.c in 5e2e95f520
and got bug fixed in 5c17ef878f.  The bug
in arch/arm/plat-mxc/iomux-v1.c isn't present any more since
bac3fcfad5, so
arch/arm/plat-mxc/iomux-mx1-mx2.c is simply deleted.

Conflicts:
	arch/arm/plat-mxc/Kconfig
	arch/arm/plat-mxc/Makefile
	arch/arm/plat-mxc/iomux-mx1-mx2.c

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-02-25 14:01:49 +01:00
..
clock_imx21.c imx: mangle addresses after adding the offset 2010-01-08 16:45:20 +01:00
clock_imx27.c imx: mangle addresses after adding the offset 2010-01-08 16:45:20 +01:00
cpu_imx27.c imx27: define and use MX27_IO_ADDRESS 2010-01-08 16:41:25 +01:00
devices.c arm/mx2: define seperate gpio port descriptions for imx21 and imx27 2010-02-24 10:06:51 +01:00
devices.h arm/mx2: use per-SOC nand device 2010-02-24 10:05:38 +01:00
eukrea_mbimx27-baseboard.c arm/imx: let platform files include the SoC-specific iomux header 2010-02-24 10:07:15 +01:00
Kconfig i.MX27 pcm038: Add USB support 2010-02-04 17:29:35 +01:00
mach-cpuimx27.c arm/imx: let platform files include the SoC-specific iomux header 2010-02-24 10:07:15 +01:00
mach-imx27lite.c arm/imx: let platform files include the SoC-specific iomux header 2010-02-24 10:07:15 +01:00
mach-mx21ads.c arm/imx: let platform files include the SoC-specific iomux header 2010-02-24 10:07:15 +01:00
mach-mx27_3ds.c arm/imx: let platform files include the SoC-specific iomux header 2010-02-24 10:07:15 +01:00
mach-mx27ads.c arm/imx: let platform files include the SoC-specific iomux header 2010-02-24 10:07:15 +01:00
mach-mxt_td60.c arm/imx: let platform files include the SoC-specific iomux header 2010-02-24 10:07:15 +01:00
mach-pca100.c Merge branch 'mxc-master' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/master 2010-02-25 14:01:49 +01:00
mach-pcm038.c Merge branch 'mxc-master' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/master 2010-02-25 14:01:49 +01:00
Makefile arm/mx2: split generic.c into mm-imx2[17].c 2010-02-24 10:06:55 +01:00
Makefile.boot arm/imx21: add kbuild support for the Freescale i.MX21 2009-03-13 10:33:45 +01:00
mm-imx21.c arm/mx2: split generic.c into mm-imx2[17].c 2010-02-24 10:06:55 +01:00
mm-imx27.c arm/mx2: split generic.c into mm-imx2[17].c 2010-02-24 10:06:55 +01:00
pcm970-baseboard.c arm/imx: let platform files include the SoC-specific iomux header 2010-02-24 10:07:15 +01:00
serial.c imx2x: convert serial.c to use soc-prefixed constants 2010-02-02 09:07:58 +01:00