[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1431506288.3157.11.camel@pengutronix.de>
Date: Wed, 13 May 2015 10:38:08 +0200
From: Philipp Zabel <p.zabel@...gutronix.de>
To: Antoine Tenart <antoine.tenart@...e-electrons.com>,
sebastian.hesselbarth@...il.com
Cc: jszhang@...vell.com, zmxu@...vell.com,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2 03/10] reset: berlin: convert to a platform driver
Hi Antoine, Sebastian,
Am Dienstag, den 12.05.2015, 16:43 +0200 schrieb Antoine Tenart:
> On Tue, Mar 10, 2015 at 10:57:13AM +0100, Antoine Tenart wrote:
> > On Mon, Mar 09, 2015 at 11:16:26AM +0100, Philipp Zabel wrote:
> > >
> > > Am Freitag, den 06.03.2015, 16:05 +0100 schrieb Antoine Tenart:
> > > > The Berlin reset controller was introduced without being a platform
> > > > driver because of a needed DT rework: the node describing the reset
> > > > controller also describes the pinctrl and clk controllers...
> > > >
> > > > The DT issue being solved thanks to the addition of the Berlin
> > > > controller mfd driver, it is now possible to convert the Berlin reset
> > > > driver to a plaftorm driver.
> > > >
> > > > Signed-off-by: Antoine Tenart <antoine.tenart@...e-electrons.com>
> > >
> > > Looks good to me. Do you want to merge this together with the rest of
> > > the series, or should I queue the reset patch?
> >
> > I think we better wait for the simple-mfd patch to make it to ARM SoC
> > first.
>
> simple-mfd just got pulled into next/drivers.
>
> > Once this is done, you can queue the reset patch (unless Sebastian wants
> > to take it alongside the series).
>
> Antoine
I just noticed that we'll create a small merge conflict in
Documentation/devicetree/bindings/arm/marvell,berlin.txt if I were to
merge patches 3 and 4.
It would be nice to have the reset driver patch merged in the vicinity
of this documentation change. Since there won't be any conflicting
changes in drivers/reset/reset-berlin.c, I'd be in favor of keeping the
series together. So patches 3 and 4
Acked-by: Philipp Zabel <p.zabel@...gutronix.de>
best regards
Philipp
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists