From: khilman@kernel•org (Kevin Hilman)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH resend 2/4] ARM: dts: sunxi: unify APB1 clock
Date: Mon, 24 Nov 2014 07:51:40 -0800 [thread overview]
Message-ID: <7ha93gmwab.fsf@deeprootsystems.com> (raw)
In-Reply-To: <20141122073515.GJ4752@lukather> (Maxime Ripard's message of "Sat, 22 Nov 2014 08:35:15 +0100")
Maxime Ripard <maxime.ripard@free-electrons•com> writes:
> Arnd,
>
> On Fri, Nov 21, 2014 at 05:08:08PM +0100, Arnd Bergmann wrote:
>> On Friday 21 November 2014 15:35:57 Arnd Bergmann wrote:
>> > On Friday 21 November 2014 15:29:03 Maxime Ripard wrote:
>> > > On Fri, Nov 21, 2014 at 12:57:02PM +0100, Arnd Bergmann wrote:
>> > > > On Thursday 20 November 2014 14:04:01 Kevin Hilman wrote:
>> > > > > Chen-Yu Tsai <wens@csie•org> writes:
>> > > > >
>> > > > > > From: Emilio L?pez <emilio@elopez•com.ar>
>> > > > > >
>> > > > > > With the new factors infrastructure in place, we can unify apb1 and
>> > > > > > apb1_mux as a single clock now.
>> > > > > >
>> > > > > > Signed-off-by: Emilio L?pez <emilio@elopez•com.ar>
>> > > > > > [wens at csie.org: Change apb1 node label to "apb1"; reword commit title]
>> > > > > > Signed-off-by: Chen-Yu Tsai <wens@csie•org>
>> > > > >
>> > > > > Boot breakage in arm-soc/for-next on sun4i-a10-cubieboard and
>> > > > > sun7i-a20-cubieboard2[1] was bisected down to this patch[1].
>> > > > >
>> > > > > Reverting $SUBJECT on top of arm-soc gets things booting again.
>> > > > >
>> > > >
>> > > > As this looks like it was intended as a cleanup without functional
>> > > > changes, I would go ahead and revert it in next/dt.
>> > > >
>> > > > Any objections?
>> > >
>> > > Yeah, you'd break linux-next as well doing so, as the clock driver now
>> > > requires this from the DT.
>> > >
>> > > I can merge it through the clock tree though if you prefer it that
>> > > way.
>> >
>> > Do you know why this commit breaks booting then?
>> >
>>
>> I have now reverted the entire branch, to get things working again.
>>
>> Please send a new pull request once you have a version that you
>> have actually tested.
>
> This was tested and working. And again, the linux-next proves it.
>
> I know very well why it doesn't work, and it's actually expected: some
> clock was refactored, the DT needed to be changed, only half of it was
> merged through arm-soc.
>
> It really is just because one part got through arm-soc, the other
> through the clock tree, nothing more.
Which branch (already in linux-next) would be needed in arm-soc/for-next
to resolve the dependency?
Kevin
next prev parent reply other threads:[~2014-11-24 15:51 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-06 3:40 [PATCH resend 0/4] clk: sunxi: Unify sun4i apb1 clock Chen-Yu Tsai
2014-11-06 3:40 ` [PATCH resend 1/4] clk: sunxi: unify APB1 clock Chen-Yu Tsai
2014-11-06 3:40 ` [PATCH resend 2/4] ARM: dts: " Chen-Yu Tsai
2014-11-20 22:04 ` Kevin Hilman
2014-11-21 10:04 ` Maxime Ripard
2014-11-21 11:57 ` Arnd Bergmann
2014-11-21 14:29 ` Maxime Ripard
2014-11-21 14:35 ` Arnd Bergmann
2014-11-21 16:08 ` Arnd Bergmann
2014-11-22 7:35 ` Maxime Ripard
2014-11-24 15:51 ` Kevin Hilman [this message]
2014-11-24 21:44 ` Maxime Ripard
2014-11-06 3:40 ` [PATCH resend 3/4] ARM: dts: sunxi: Use sun4i-a10-apb1-clk for sun6i/sun8i apb2 clocks Chen-Yu Tsai
2014-11-06 3:40 ` [PATCH resend 4/4] clk: sunxi: Removed unused/incorrect sun6i-a31-apb2-clk driver Chen-Yu Tsai
2014-11-11 14:55 ` [PATCH resend 0/4] clk: sunxi: Unify sun4i apb1 clock Maxime Ripard
2014-11-11 16:53 ` Chen-Yu Tsai
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=7ha93gmwab.fsf@deeprootsystems.com \
--to=khilman@kernel$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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