[PATCH v2 1/2] dt-bindings: mmc: remove identical phrase in disable-wp text

[PATCH v2 1/2] dt-bindings: mmc: remove identical phrase in disable-wp text

[Johan Jonker]

There are two identical phrases in the disable-wp text,
so remove one of them.

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
---
 Documentation/devicetree/bindings/mmc/mmc-controller.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/mmc/mmc-controller.yaml b/Documentation/devicetree/bindings/mmc/mmc-controller.yaml
index b130450c3..d668d0fbe 100644
--- a/Documentation/devicetree/bindings/mmc/mmc-controller.yaml
+++ b/Documentation/devicetree/bindings/mmc/mmc-controller.yaml
@@ -96,8 +96,7 @@ properties:
     description:
       When set, no physical write-protect line is present. This
       property should only be specified when the controller has a
-      dedicated write-protect detection logic. If a GPIO is always
-      used for the write-protect detection. If a GPIO is always used
+      dedicated write-protect detection logic. If a GPIO is always used
       for the write-protect detection logic, it is sufficient to not
       specify the wp-gpios property in the absence of a write-protect
       line.
-- 
2.11.0

[PATCH v2 2/2] dt-bindings: mmc: clarify disable-wp text

[Johan Jonker]

"disable-wp" has been removed from all Rockchip eMMC and SDIO dts nodes,
but people still continue to submit new patches with "disable-wp" added
to other nodes then for the SD card slot,
what it was designed for in the first place.
So clarify the "disable-wp" text by adding that this option should
not be used in combination with eMMC or SDIO.

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
---
 Documentation/devicetree/bindings/mmc/mmc-controller.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/mmc/mmc-controller.yaml b/Documentation/devicetree/bindings/mmc/mmc-controller.yaml
index d668d0fbe..3c0df4016 100644
--- a/Documentation/devicetree/bindings/mmc/mmc-controller.yaml
+++ b/Documentation/devicetree/bindings/mmc/mmc-controller.yaml
@@ -99,7 +99,7 @@ properties:
       dedicated write-protect detection logic. If a GPIO is always used
       for the write-protect detection logic, it is sufficient to not
       specify the wp-gpios property in the absence of a write-protect
-      line.
+      line. Not used in combination with eMMC or SDIO.
 
   wp-gpios:
     description:
-- 
2.11.0

Re: [PATCH v2 2/2] dt-bindings: mmc: clarify disable-wp text

[Rob Herring]

On Sat, 28 Dec 2019 10:30:59 +0100, Johan Jonker wrote:
> "disable-wp" has been removed from all Rockchip eMMC and SDIO dts nodes,
> but people still continue to submit new patches with "disable-wp" added
> to other nodes then for the SD card slot,
> what it was designed for in the first place.
> So clarify the "disable-wp" text by adding that this option should
> not be used in combination with eMMC or SDIO.
> 
> Signed-off-by: Johan Jonker <jbx6244@gmail.com>
> ---
>  Documentation/devicetree/bindings/mmc/mmc-controller.yaml | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 

Applied, thanks.

Rob

Re: [PATCH v2 1/2] dt-bindings: mmc: remove identical phrase in disable-wp text

[Rob Herring]

On Sat, 28 Dec 2019 10:30:58 +0100, Johan Jonker wrote:
> There are two identical phrases in the disable-wp text,
> so remove one of them.
> 
> Signed-off-by: Johan Jonker <jbx6244@gmail.com>
> ---
>  Documentation/devicetree/bindings/mmc/mmc-controller.yaml | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 

Applied, thanks.

Rob

Re: [PATCH v2 1/2] dt-bindings: mmc: remove identical phrase in disable-wp text

[Ulf Hansson]

On Sat, 4 Jan 2020 at 22:55, Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> wrote:
>
> On Sat, 28 Dec 2019 10:30:58 +0100, Johan Jonker wrote:
> > There are two identical phrases in the disable-wp text,
> > so remove one of them.
> >
> > Signed-off-by: Johan Jonker <jbx6244-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> > ---
> >  Documentation/devicetree/bindings/mmc/mmc-controller.yaml | 3 +--
> >  1 file changed, 1 insertion(+), 2 deletions(-)
> >
>
> Applied, thanks.
>
> Rob

Rob,

Normally I pick up the DT doc changes for mmc whenever you have acked
them (at least more non-trivial changes). I regards to the
mmc-controller.yaml file, I have no queued changes in my tree for this
cycle so this should be fine in regards to conflicts.

Going forward, do you prefer to pick the DT doc changes for mmc, or
can I consider this as a single occasion thingy?

Kind regards
Uffe

Re: [PATCH v2 1/2] dt-bindings: mmc: remove identical phrase in disable-wp text

[Rob Herring]

On Thu, Jan 16, 2020 at 5:17 AM Ulf Hansson <ulf.hansson@linaro.org> wrote:
>
> On Sat, 4 Jan 2020 at 22:55, Rob Herring <robh@kernel.org> wrote:
> >
> > On Sat, 28 Dec 2019 10:30:58 +0100, Johan Jonker wrote:
> > > There are two identical phrases in the disable-wp text,
> > > so remove one of them.
> > >
> > > Signed-off-by: Johan Jonker <jbx6244@gmail.com>
> > > ---
> > >  Documentation/devicetree/bindings/mmc/mmc-controller.yaml | 3 +--
> > >  1 file changed, 1 insertion(+), 2 deletions(-)
> > >
> >
> > Applied, thanks.
> >
> > Rob
>
> Rob,
>
> Normally I pick up the DT doc changes for mmc whenever you have acked
> them (at least more non-trivial changes). I regards to the
> mmc-controller.yaml file, I have no queued changes in my tree for this
> cycle so this should be fine in regards to conflicts.
>
> Going forward, do you prefer to pick the DT doc changes for mmc, or
> can I consider this as a single occasion thingy?

I usually only pick up small changes if they are a binding only series
and if they haven't been picked up already.

Though I've been picking up a few schema conversions primarily so I
can check that they validate. Hopefully that's temporary.

Rob