mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-23 01:10:04 +00:00
Code Issues Releases Wiki Activity
199459 commits 104 branches 5070 tags 5.5 GiB
Commit graph

8 commits

Author SHA1 Message Date
Wolfram Sang
f13899da00 arm/mach-mx2: add watchdog device to Phytec-boards 
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
 2010-05-17 11:47:03 +02:00
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
Uwe Kleine-König
e835d88e71 arm/imx: let platform files include the SoC-specific iomux header 
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
 2010-02-24 10:07:15 +01:00
Uwe Kleine-König
3636a14532 arm/mx2: use per-SOC nand device 
The previous commit introduced one nand device per SoC.  Use this
directly instead of the compatibility macro that will break for
multi-SoC kernels.  And while at it remove the compatibility macro now
that all in-tree users are fixed.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
 2010-02-24 10:05:38 +01:00
Sascha Hauer
c8a6885f21 pca100: add sound support 
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
 2010-02-10 11:05:18 +01:00
Sascha Hauer
eee7c497d2 i.MX27 pca100: Add USB support 
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
 2010-02-04 17:29:34 +01:00
Uwe Kleine-König
34101237d9 imx: define per SOC ..._PHYS_OFFSET and use these in favour of PHYS_OFFSET 
This is a further step in allowing to build a kernel image for more
than one imx SOC.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
 2010-02-02 09:07:59 +01:00
Uwe Kleine-König
386c5cf7a9 imx/mx2: rename files defining a machine to mach-$mach.c 
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Eric Benard <eric@eukrea.com>
 2010-01-05 10:10:09 +01:00
Renamed from arch/arm/mach-mx2/pca100.c (Browse further)