Vladimir Zapolskiy
6dc2d6bf51
imx31: fix parent clock for rtc
...
According to imx31 reference manual the signal from external low
frequency clock is sent to RTC clock.
The patch makes redundant the previously defined mxc_rtc clock.
Signed-off-by: Vladimir Zapolskiy <vzapolskiy@gmail.com >
Cc: Sascha Hauer <s.hauer@pengutronix.de >
Cc: Daniel Mack <daniel@caiaq.de >
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de >
2010-03-25 08:29:41 +01:00
Russell King
988addf82e
Merge branch 'origin' into devel-stable
...
Conflicts:
arch/arm/mach-mx2/devices.c
arch/arm/mach-mx2/devices.h
sound/soc/pxa/pxa-ssp.c
2010-03-08 20:21:04 +00:00
Uwe Kleine-König
1273e7686f
imx31: define and use MX31_IO_ADDRESS
...
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: Daniel Mack <daniel@caiaq.de >
Cc: Greg Kroah-Hartman <gregkh@suse.de >
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com >
Cc: Magnus Lilja <lilja.magnus@gmail.com >
2010-01-08 16:41:26 +01:00
Uwe Kleine-König
60d644cae9
imx/mx3: rename clock.c and iomux.c to {clock,iomux}-imx31.c
...
These files are only used on imx31. This makes the name consistent with
the imx35 files.
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: Daniel Mack <daniel@caiaq.de >
Cc: Fabio Estevam <fabio.estevam@freescale.com >
Cc: Valentin Longchamp <valentin.longchamp@epfl.ch >
2010-01-05 10:10:07 +01:00
