On Mon, Sep 06, 2021 at 10:02:26AM +0100, Lee Jones wrote:
> On Fri, 03 Sep 2021, Rob Herring wrote:
> 
> > On Wed, 01 Sep 2021 11:18:29 +0200, Maxime Ripard wrote:
> > > The X-Powers AXP PMICs are supported by Linux thanks to its device tree
> > > binding.
> > > 
> > > Now that we have the DT validation in place, let's convert the device
> > > tree bindings for that driver over to a YAML schema.
> > > 
> > > Cc: Chen-Yu Tsai <wens@csie.org>
> > > Cc: Lee Jones <lee.jones@linaro.org>
> > > Signed-off-by: Maxime Ripard <maxime@cerno.tech>
> > > 
> > > ---
> > > 
> > > Changes from v1:
> > >   - Add GPIO example
> > >   - Remove the limitation on regulator-ramp-delay
> > > ---
> > >  .../i2c/allwinner,sun6i-a31-p2wi.yaml         |   2 +-
> > >  .../devicetree/bindings/mfd/axp20x.txt        | 273 ------------
> > >  .../bindings/mfd/x-powers,axp152.yaml         | 400 ++++++++++++++++++
> > >  3 files changed, 401 insertions(+), 274 deletions(-)
> > >  delete mode 100644 Documentation/devicetree/bindings/mfd/axp20x.txt
> > >  create mode 100644 Documentation/devicetree/bindings/mfd/x-powers,axp152.yaml
> > > 
> > 
> > Reviewed-by: Rob Herring <robh@kernel.org>
> > 
> > Note that the gpio child schema needs to be applied with this one.
> 
> Not sure I'm in possession of that.

So, how do you want to merge that? Through the DT tree?

Maxime