Re: linux-next: manual merge of the arm-soc tree with the arm tree

[Stephen Rothwell]

Hi Stephen,

On Sun, 11 Sep 2011 19:18:53 -0700 Stephen Boyd <sboyd@xxxxxxxxxxxxxx> wrote:
>
> The device tree machine description also needs to have the .fixup and
> .reserve callbacks added to it so that the device tree machines boot
> properly. Perhaps the soc tree needs to pull in Russell's tree at some
> point to resolve this subtle logical conflict or when the trees are
> merged together someone will need to do an evil merge and add the
> callbacks in the merge commit.

Ah, right.  I have added this merge fixup for today and can carry it as
necessary.

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Tue, 13 Sep 2011 11:51:48 +1000
Subject: [PATCH] arm-soc: merge fixup for fixup/reserve being added to
 MACHINE descriptions

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 arch/arm/mach-msm/board-msm8x60.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-msm/board-msm8x60.c b/arch/arm/mach-msm/board-msm8x60.c
index 328df27..4ad2afb 100644
--- a/arch/arm/mach-msm/board-msm8x60.c
+++ b/arch/arm/mach-msm/board-msm8x60.c
@@ -153,6 +153,8 @@ MACHINE_END
 #ifdef CONFIG_OF
 /* TODO: General device tree support for all MSM. */
 DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)")
+	.fixup = msm8x60_fixup,
+	.reserve = msm8x60_reserve,
 	.map_io = msm8x60_map_io,
 	.init_irq = msm8x60_init_irq,
 	.init_machine = msm8x60_dt_init,
-- 
1.7.5.4

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/