dt-bindings: i2c: i2c-mux: Remove reset-active-low from ssd1307fb examples

Message ID 20210528111049.1804800-1-geert@linux-m68k.org
State New
Headers show
Series
  • dt-bindings: i2c: i2c-mux: Remove reset-active-low from ssd1307fb examples
Related show

Commit Message

Geert Uytterhoeven May 28, 2021, 11:10 a.m.
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@linux-m68k.org>
---
 Documentation/devicetree/bindings/i2c/i2c-mux-gpio.txt  | 1 -
 Documentation/devicetree/bindings/i2c/i2c-mux-gpmux.txt | 1 -
 2 files changed, 2 deletions(-)

Comments

Wolfram Sang May 28, 2021, 2:07 p.m. | #1
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@linux-m68k.org>

Now we have a conflict with this series from Rob: "[PATCH v2 0/6]
dt-bindings: Convert mux bindings to schema"

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?

> ---
>  Documentation/devicetree/bindings/i2c/i2c-mux-gpio.txt  | 1 -
>  Documentation/devicetree/bindings/i2c/i2c-mux-gpmux.txt | 1 -
>  2 files changed, 2 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/i2c/i2c-mux-gpio.txt b/Documentation/devicetree/bindings/i2c/i2c-mux-gpio.txt
> index 21da3ecbb3700c06..1bf267302251bb63 100644
> --- 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;
>  			};
>  		};
>  
> diff --git a/Documentation/devicetree/bindings/i2c/i2c-mux-gpmux.txt b/Documentation/devicetree/bindings/i2c/i2c-mux-gpmux.txt
> index 8b444b94e92fde83..51356fdf2becc3f6 100644
> --- 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;
>  			};
>  		};
>  
> -- 
> 2.25.1
>
Geert Uytterhoeven May 28, 2021, 2:25 p.m. | #2
Hi Wolfram,

On Fri, May 28, 2021 at 4:07 PM Wolfram Sang <wsa@kernel.org> 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@linux-m68k.org>
>
> 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
Wolfram Sang May 28, 2021, 2:51 p.m. | #3
> > 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.

No worries. That's what maintainers are primarily for :)

> Alternatively, can you just drop the second chunk?

That I can do as well.
Wolfram Sang June 4, 2021, 8:41 p.m. | #4
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@linux-m68k.org>


Applied the first chunk to for-next, thanks!

Patch

diff --git a/Documentation/devicetree/bindings/i2c/i2c-mux-gpio.txt b/Documentation/devicetree/bindings/i2c/i2c-mux-gpio.txt
index 21da3ecbb3700c06..1bf267302251bb63 100644
--- 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;
 			};
 		};
 
diff --git a/Documentation/devicetree/bindings/i2c/i2c-mux-gpmux.txt b/Documentation/devicetree/bindings/i2c/i2c-mux-gpmux.txt
index 8b444b94e92fde83..51356fdf2becc3f6 100644
--- 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;
 			};
 		};