Hi Wolfram,
On Fri, May 28, 2021 at 4:07 PM Wolfram Sang <wsa@xxxxxxxxxx> wrote:
> On Fri, May 28, 2021 at 01:10:49PM +0200, Geert Uytterhoeven wrote:
> > The "reset-active-low" property was removed from the ssd1307fb bindings
> > in commit 519b4dba586198ee ("fbdev: ssd1307fb: Remove reset-active-low
> > from the DT binding document") and from the ssd1307fb binding examples
> > in commit 7d7e58d30e046d34 ("dt-bindings: display: ssd1307fb: Remove
> > reset-active-low from examples").
> >
> > Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
>
> Now we have a conflict with this series from Rob: "[PATCH v2 0/6]
> dt-bindings: Convert mux bindings to schema"
Sorry, I had checked that my patch applies to today's linux-next,
and wasn't aware of Rob's series.
> My suggestion would be that Rob adds this on top of his series?
> Or he provides an immutable branch for me, so I can apply this patch on
> top then?
Alternatively, can you just drop the second chunk?
> > --- a/Documentation/devicetree/bindings/i2c/i2c-mux-gpio.txt
> > +++ b/Documentation/devicetree/bindings/i2c/i2c-mux-gpio.txt
> > @@ -62,7 +62,6 @@ Example:
> > reg = <0x3c>;
> > pwms = <&pwm 4 3000>;
> > reset-gpios = <&gpio2 7 1>;
> > - reset-active-low;
> > };
> > };
This one is still valid.
> > --- a/Documentation/devicetree/bindings/i2c/i2c-mux-gpmux.txt
> > +++ b/Documentation/devicetree/bindings/i2c/i2c-mux-gpmux.txt
> > @@ -80,7 +80,6 @@ Example:
> > reg = <0x3c>;
> > pwms = <&pwm 4 3000>;
> > reset-gpios = <&gpio2 7 1>;
> > - reset-active-low;
> > };
> > };
This one no longer is, as Rob dropped the example during the conversion.
Thanks!
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
