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

[Linus Walleij]

On Wed, Apr 3, 2013 at 11:36 PM, Linus Walleij <linus.walleij at linaro.org> wrote:
> On Wed, Apr 3, 2013 at 10:38 PM, Linus Walleij <linus.walleij at linaro.org> wrote:
>> On Tue, Apr 2, 2013 at 3:21 PM, Lee Jones <lee.jones at linaro.org> 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 <lee.jones at linaro.org>
>>
>> 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.
>
> It doesn't quiet apply cleanly either, what is this based on?

Hm looking closer at this there are even more problems in DT-land.

The fixes that were sent to Torvalds for -rc5, i.e. this stuff:
http://marc.info/?l=linux-arm-kernel&m=136441825019562&w=2

Will conflict with
stuff that is already in ARM SoC, i.e. this stuff:
http://marc.info/?l=linux-arm-kernel&m=136217923611845&w=2

That in turn both conflicts with this new stuff.

I will hold off any DT patches until I have some kind of baseline
in ARM SoC that has e.g. merged in the RC fixes with the other
device tree stuff and got it to compile.

I'll just not take any more DT stuff except for fixes
until after the v3.10 merge window to cool things down. I think there
will be enough trouble as it is. There is no point in keepin a finger
on the fast-forward button all the time, this can surely wait for
v3.11 unless someone suggests something else.

Yours,
Linus Walleij