All of lore.kernel.org
 help / color / mirror / Atom feed
From: shawn.guo@linaro.org (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 12/13] ARM: mxs: merge imx23 and imx28 into one machine_desc
Date: Fri, 29 Mar 2013 16:55:48 +0800	[thread overview]
Message-ID: <1364547350-30498-13-git-send-email-shawn.guo@linaro.org> (raw)
In-Reply-To: <1364547350-30498-1-git-send-email-shawn.guo@linaro.org>

Most of the function hooks are same between imx23 and imx28
machine_desc, so merge them into one.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
 arch/arm/mach-mxs/mach-mxs.c |   43 +++++++++++++-----------------------------
 1 file changed, 13 insertions(+), 30 deletions(-)

diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
index 19f732f..b74f450 100644
--- a/arch/arm/mach-mxs/mach-mxs.c
+++ b/arch/arm/mach-mxs/mach-mxs.c
@@ -181,18 +181,6 @@ static struct of_dev_auxdata mxs_auxdata_lookup[] __initdata = {
 	{ /* sentinel */ }
 };
 
-static void __init imx23_timer_init(void)
-{
-	mx23_clocks_init();
-	clocksource_of_init();
-}
-
-static void __init imx28_timer_init(void)
-{
-	mx28_clocks_init();
-	clocksource_of_init();
-}
-
 #define OCOTP_WORD_OFFSET		0x20
 #define OCOTP_WORD_COUNT		0x20
 
@@ -573,32 +561,27 @@ soft:
 	soft_restart(0);
 }
 
-static const char *imx23_dt_compat[] __initdata = {
-	"fsl,imx23",
-	NULL,
-};
+static void __init mxs_timer_init(void)
+{
+	if (of_machine_is_compatible("fsl,imx23"))
+		mx23_clocks_init();
+	else
+		mx28_clocks_init();
+	clocksource_of_init();
+}
 
-static const char *imx28_dt_compat[] __initdata = {
+static const char *mxs_dt_compat[] __initdata = {
 	"fsl,imx28",
+	"fsl,imx23",
 	NULL,
 };
 
-DT_MACHINE_START(IMX23, "Freescale i.MX23 (Device Tree)")
-	.map_io		= debug_ll_io_init,
-	.init_irq	= irqchip_init,
-	.handle_irq	= icoll_handle_irq,
-	.init_time	= imx23_timer_init,
-	.init_machine	= mxs_machine_init,
-	.dt_compat	= imx23_dt_compat,
-	.restart	= mxs_restart,
-MACHINE_END
-
-DT_MACHINE_START(IMX28, "Freescale i.MX28 (Device Tree)")
+DT_MACHINE_START(MXS, "Freescale MXS (Device Tree)")
 	.map_io		= debug_ll_io_init,
 	.init_irq	= irqchip_init,
 	.handle_irq	= icoll_handle_irq,
-	.init_time	= imx28_timer_init,
+	.init_time	= mxs_timer_init,
 	.init_machine	= mxs_machine_init,
-	.dt_compat	= imx28_dt_compat,
+	.dt_compat	= mxs_dt_compat,
 	.restart	= mxs_restart,
 MACHINE_END
-- 
1.7.9.5

  parent reply	other threads:[~2013-03-29  8:55 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-29  8:55 [PATCH 00/13] mach-mxs header files cleanup Shawn Guo
2013-03-29  8:55 ` Shawn Guo
2013-03-29  8:55 ` Shawn Guo
2013-03-29  8:55 ` [PATCH 01/13] rtc: stmp3xxx: use stmp_reset_block() instead Shawn Guo
2013-03-29  8:55 ` [PATCH 02/13] iio: mxs-lradc: remove unneeded mach header inclusion Shawn Guo
2013-03-29  8:55   ` Shawn Guo
2013-03-29  9:28   ` Jonathan Cameron
2013-03-29  9:28     ` Jonathan Cameron
2013-03-29  8:55 ` [PATCH 03/13] ASoC: mxs-saif: remove " Shawn Guo
2013-03-29  8:55   ` Shawn Guo
2013-04-01 11:45   ` Mark Brown
2013-04-01 11:45     ` Mark Brown
2013-03-29  8:55 ` [PATCH 04/13] ARM: mxs: remove empty hardware.h Shawn Guo
2013-03-29  8:55 ` [PATCH 05/13] ARM: mxs: get reset address from device tree Shawn Guo
2013-03-29  8:55 ` [PATCH 06/13] ARM: mxs: remove system.c Shawn Guo
2013-03-29  8:55 ` [PATCH 07/13] ARM: mxs: get ocotp base address from device tree Shawn Guo
2013-03-29  8:55 ` [PATCH 08/13] ARM: mxs: use debug_ll_io_init for low-level debug Shawn Guo
2013-03-29  8:55 ` [PATCH 09/13] ARM: mxs: remove mm.c Shawn Guo
2013-03-29  8:55 ` [PATCH 10/13] ARM: mxs: move mxs_get_ocotp() into mach-mxs.c Shawn Guo
2013-03-29  8:55 ` [PATCH 11/13] ARM: mxs: remove common.h Shawn Guo
2013-03-29  8:55 ` Shawn Guo [this message]
2013-03-29  8:55 ` [PATCH 13/13] ARM: mxs: remove unused headers Shawn Guo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1364547350-30498-13-git-send-email-shawn.guo@linaro.org \
    --to=shawn.guo@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.