OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
243,253 Commits 4 Branches 0 Tags 2 GiB
Commit Graph

9 Commits

Author SHA1 Message Date
Richard Zhao c23eb89ef7 ARM: imx3x: clean up ARCH_MX3X 
Move to SOC_SOC_IMX3X.
Leave ARCH_MX31/35 definitions there, in case some place prevent multi-soc
single image.

Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
 2011-03-07 19:29:43 +01:00
Richard Zhao 7685167128 ARM: imx5x: clean up ARCH_MX5X 
Move to SOC_SOC_IMX5X. Leave only places which prevent multi-soc
using ARCH_MX5X.

Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
 2011-03-07 19:29:42 +01:00
Sascha Hauer 0e44e05958 Merge commit 'v2.6.37-rc4' into imx-for-2.6.38 
Done to resolve merge conflict:

Conflicts:
	arch/arm/mach-mx25/devices-imx25.h

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
 2010-12-06 09:36:17 +01:00
Fabio Estevam d94ed1287e ARM: mx5: introduce SOC_IMX51 
Introduce SOC_IMX51 to keep consistency with the other i.MX devices

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
 2010-12-03 11:05:13 +01:00
Sascha Hauer 4e5cf41eeb ARM i.MX SDMA: Add ROM script addresses to platform_data 
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
 2010-12-03 11:05:08 +01:00
Uwe Kleine-König a528bc8784 ARM: mx3: introduce SOC_IMX31 and SOC_IMX35 
Additionally convert some known to be good usages to the new
names.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
 2010-11-19 21:54:35 +01:00
Uwe Kleine-König 972cc48207 ARM: imx: use SOC_IMX25 instead of ARCH_MX25 for multi-SoC 
Some usages of ARCH_MX25 are assuming that if it is
defined the other SoCs are undefined.  Use SOC_IMX25 for the save
places.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
 2010-11-19 21:54:34 +01:00
Sascha Hauer 415d34195b ARM i.MX: sdma is merged, so remove #ifdef SDMA_IS_MERGED 
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
 2010-11-15 09:25:02 +01:00
Uwe Kleine-König 8a8d20600d ARM: imx: fix/define clocks and create devices for imx dma 
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
 2010-10-11 15:30:31 +02:00