From: lee.jones@linaro.org (Lee Jones)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/8] ARM: ux500: Remove duplicate DT_MACHINE_START - make u8500 for generic
Date: Thu, 25 Oct 2012 10:57:06 +0100 [thread overview]
Message-ID: <1351159031-25391-4-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1351159031-25391-1-git-send-email-lee.jones@linaro.org>
The u8500 and u9540 DT_MACHINE_START calls are almost identical
at the moment, referencing exactly the same function pointers.
Until this changes we may as well convert the original one to
be more generic and use that instead.
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
arch/arm/mach-ux500/cpu-db8500.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index 6e9a06d..472b49f 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -338,7 +338,7 @@ static const char * u8500_dt_board_compat[] = {
NULL,
};
-DT_MACHINE_START(U8500_DT, "ST-Ericsson U8500 platform (Device Tree Support)")
+DT_MACHINE_START(U8500_DT, "ST-Ericsson Ux5x0 platform (Device Tree Support)")
.map_io = u8500_map_io,
.init_irq = ux500_init_irq,
/* we re-use nomadik timer here */
@@ -349,14 +349,4 @@ DT_MACHINE_START(U8500_DT, "ST-Ericsson U8500 platform (Device Tree Support)")
.dt_compat = u8500_dt_board_compat,
MACHINE_END
-DT_MACHINE_START(U9540_DT, "ST-Ericsson 9540 platform (Device Tree Support)")
- .map_io = u8500_map_io,
- .init_irq = ux500_init_irq,
- .timer = &ux500_timer,
- .handle_irq = gic_handle_irq,
- .init_machine = u8500_init_machine,
- .init_late = NULL,
- .dt_compat = u8500_dt_board_compat,
-MACHINE_END
-
#endif
--
1.7.9.5
next prev parent reply other threads:[~2012-10-25 9:57 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-25 9:57 [PATCH 1/8] Ux5x0 patches loosely surrounding u9540 enablement Lee Jones
2012-10-25 9:57 ` [PATCH 1/8] ARM: ux500: Enable all MMC devices on the u9540 when booting with DT Lee Jones
2012-10-25 9:57 ` [PATCH 2/8] ARM: ux500: Rename references to the ccu9540 dev board accordingly Lee Jones
2012-10-25 9:57 ` Lee Jones [this message]
2012-10-25 9:57 ` [PATCH 4/8] ARM: ux500: List DT compatibility using platform names rather than by board Lee Jones
2012-10-25 9:57 ` [PATCH 5/8] ARM: ux500: Add node for the MMC GPIO regulator Lee Jones
2012-10-25 9:57 ` [PATCH 6/8] ARM: ux500: Change the type of interrupt to something compatible Lee Jones
2012-10-25 9:57 ` [PATCH 7/8] ARM: ux500: CONFIG: Enable GPIO Regulators Lee Jones
2012-10-25 9:57 ` [PATCH 8/8] ARM: ux500: Convert DT_MACHINE_START to use SMP operations Lee Jones
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=1351159031-25391-4-git-send-email-lee.jones@linaro.org \
--to=lee.jones@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).