Subject: [PATCH 4/9] ARM: ux500: Move Snowball's thermal DT node into existing PRCMU one

From: [email-masked] (Lee Jones)
Date: Thu, 4 Apr 2013 08:20:16 +0100

On Wed, 03 Apr 2013, Linus Walleij wrote:

> On Wed, Apr 3, 2013 at 10:38 PM, Linus Walleij <[email-masked]> wrote:
> > On Tue, Apr 2, 2013 at 3:21 PM, Lee Jones <[email-masked]> wrote:
> >
> >> When the thermal DT node was inserted a new PRCMU node was created;
> >> however, one already exists in the Snowball DTS file. Here we
> >> amalgamate the two into a single consolidated node.
> >>
> >> Signed-off-by: Lee Jones <[email-masked]>
> >
> > Patch applied.
> 
> After applying this I get this:
> 
>   DTC     arch/arm/boot/dts/snowball.dtb
> Error: /home/elinwal/linux-stericsson/arch/arm/boot/dts/snowball.dts:351.3-352.1
> syntax error
> FATAL ERROR: Unable to parse input tree
> make[3]: *** [arch/arm/boot/dts/snowball.dtb] Error 1
> make[2]: *** [dtbs] Error 2
> make[1]: *** [sub-make] Error 2
> make[1]: Leaving directory `/home/elinwal/linux-stericsson'
> make: *** [build-dtbs] Error 2
> 
> Does not appear prior to applying patch.

That doesn't really tell me anything.

Can you paste the hunk to which the error is referring please?

> It doesn't quiet apply cleanly either, what is this based on?

It's based on 'arm-soc/fixes', which should be appearing in Mainline
rc:s any day now.

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog