From: Linus Walleij <linus.walleij@linaro.org>
To: Lee Jones <lee.jones@linaro.org>
Cc: "linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Arnd Bergmann <arnd@arndb.de>,
Linus WALLEIJ <linus.walleij@stericsson.com>
Subject: Re: [PATCH 4/9] ARM: ux500: Move Snowball's thermal DT node into existing PRCMU one
Date: Wed, 3 Apr 2013 23:45:10 +0200 [thread overview]
Message-ID: <CACRpkdYtxRbejCvEBRxSFd0FnvndLLQiJaWp1QJ3QBcfPw9msg@mail.gmail.com> (raw)
In-Reply-To: <CACRpkda08Joe9aXRgYDUs622GELL+O1vZSnzzCBa++m1zZZi=g@mail.gmail.com>
On Wed, Apr 3, 2013 at 11:36 PM, Linus Walleij <linus.walleij@linaro.org> wrote:
> On Wed, Apr 3, 2013 at 10:38 PM, Linus Walleij <linus.walleij@linaro.org> wrote:
>> On Tue, Apr 2, 2013 at 3:21 PM, Lee Jones <lee.jones@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@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
next prev parent reply other threads:[~2013-04-03 21:45 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-02 13:21 [PATCH 1/9] ARM: ux500: Increase the size of the PRCMU's TCPM size Lee Jones
2013-04-02 13:21 ` [PATCH 2/9] ARM: ux500: Remove incorrect DB9540 PRCMU TCDM base location Lee Jones
2013-04-03 20:33 ` Linus Walleij
2013-04-02 13:21 ` [PATCH 3/9] ARM: ux500: Supply a DTS file for the u8540 platform Lee Jones
2013-04-03 20:34 ` Linus Walleij
2013-04-04 7:29 ` [PATCH] " Lee Jones
2013-04-23 10:42 ` Linus Walleij
2013-04-23 10:58 ` Linus Walleij
2013-04-24 7:52 ` Lee Jones
2013-04-02 13:21 ` [PATCH 4/9] ARM: ux500: Move Snowball's thermal DT node into existing PRCMU one Lee Jones
2013-04-03 20:38 ` Linus Walleij
2013-04-03 21:36 ` Linus Walleij
2013-04-03 21:45 ` Linus Walleij [this message]
2013-04-04 7:20 ` Lee Jones
2013-04-02 13:21 ` [PATCH 5/9] ARM: ux500: Over-ride TCDM size when booting the DB8540 platform Lee Jones
2013-04-03 20:39 ` Linus Walleij
2013-04-04 7:33 ` [PATCH] " Lee Jones
2013-04-23 10:59 ` Linus Walleij
2013-04-23 15:09 ` Lee Jones
2013-04-02 13:21 ` [PATCH 6/9] ARM: ux500: Create a new of_dev_auxdata structure for u8540 enablement Lee Jones
2013-04-03 20:42 ` Linus Walleij
2013-04-02 13:21 ` [PATCH 7/9] ARM: ux500: Add a VQMMC (level-shifting) regulator DT node for Snowball Lee Jones
2013-04-03 20:44 ` Linus Walleij
2013-04-02 13:21 ` [PATCH 8/9] mfd: db8500-prcmu: Return early if the TCPM cannot be located Lee Jones
2013-04-03 20:46 ` Linus Walleij
2013-04-02 13:21 ` [PATCH 9/9] mfd: db8500-prcmu: Support platform dependant device selection Lee Jones
2013-04-03 20:47 ` Linus Walleij
2013-04-04 10:15 ` Lee Jones
2013-04-03 20:32 ` [PATCH 1/9] ARM: ux500: Increase the size of the PRCMU's TCPM size Linus Walleij
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=CACRpkdYtxRbejCvEBRxSFd0FnvndLLQiJaWp1QJ3QBcfPw9msg@mail.gmail.com \
--to=linus.walleij@linaro.org \
--cc=arnd@arndb.de \
--cc=lee.jones@linaro.org \
--cc=linus.walleij@stericsson.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.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
all inboxes | Powered by JetHome®