Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Fri, 15 Jan 2021 10:42:39 +0100
From:   Alexander Dahl <post@lespocky.de>
To:     Jeff LaBundy <jeff@labundy.com>
Cc:     Lee Jones <lee.jones@linaro.org>,
        Alexander Dahl <post@lespocky.de>,
        Rob Herring <robh+dt@kernel.org>,
        Alexander Dahl <ada@thorsis.com>, linux-leds@vger.kernel.org,
        devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org,
        linux-stm32@st-md-mailman.stormreply.com,
        linux-amlogic@lists.infradead.org, Rob Herring <robh@kernel.org>
Subject: Re: [PATCH v9 1/4] dt-bindings: mfd: Fix schema warnings for pwm-leds
Message-ID: <20210115094238.s36rrgmpq63a622p@falbala.internal.home.lespocky.de>
Mail-Followup-To: Jeff LaBundy <jeff@labundy.com>,
        Lee Jones <lee.jones@linaro.org>, Rob Herring <robh+dt@kernel.org>,
        Alexander Dahl <ada@thorsis.com>, linux-leds@vger.kernel.org,
        devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org,
        linux-stm32@st-md-mailman.stormreply.com,
        linux-amlogic@lists.infradead.org, Rob Herring <robh@kernel.org>
References: <20201228163217.32520-1-post@lespocky.de>
 <20201228163217.32520-2-post@lespocky.de>
 <20210114100312.GL3975472@dell>
 <20210115035050.GA27243@labundy.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="h2j7lras76hzpifw"
Content-Disposition: inline
In-Reply-To: <20210115035050.GA27243@labundy.com>
User-Agent: NeoMutt/20170113 (1.7.2)
Precedence: bulk


--h2j7lras76hzpifw
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hello Jeff,

On Thu, Jan 14, 2021 at 09:50:50PM -0600, Jeff LaBundy wrote:
> On Thu, Jan 14, 2021 at 10:03:12AM +0000, Lee Jones wrote:
> > On Mon, 28 Dec 2020, Alexander Dahl wrote:
> >=20
> > > The node names for devices using the pwm-leds driver follow a certain
> > > naming scheme (now).  Parent node name is not enforced, but recommend=
ed
> > > by DT project.
> > >=20
> > >   DTC     Documentation/devicetree/bindings/mfd/iqs62x.example.dt.yaml
> > >   CHECK   Documentation/devicetree/bindings/mfd/iqs62x.example.dt.yaml
> > > /home/alex/build/linux/Documentation/devicetree/bindings/mfd/iqs62x.e=
xample.dt.yaml: pwmleds: 'panel' does not match any of the regexes: '^led(-=
[0-9a-f]+)?$', 'pinctrl-[0-9]+'
> > >         From schema: /home/alex/src/linux/leds/Documentation/devicetr=
ee/bindings/leds/leds-pwm.yaml
> > >=20
> > > Signed-off-by: Alexander Dahl <post@lespocky.de>
> > > Acked-by: Jeff LaBundy <jeff@labundy.com>
> > > Acked-by: Rob Herring <robh@kernel.org>
> > > ---
> > >=20
> > > Notes:
> > >     v8 -> v9:
> > >       * added forgotten Acked-by (Jeff LaBundy)
> > >       * rebased on v5.11-rc1
> > >    =20
> > >     v7 -> v8:
> > >       * rebased on recent pavel/for-next (post v5.10-rc1)
> > >       * added Acked-by (Rob Herring)
> > >    =20
> > >     v6 -> v7:
> > >       * added warning message to commit message (Krzysztof Kozlowski)
> > >    =20
> > >     v6:
> > >       * added this patch to series
> > >=20
> > >  Documentation/devicetree/bindings/mfd/iqs62x.yaml | 5 +++--
> > >  1 file changed, 3 insertions(+), 2 deletions(-)
> >=20
> > Failed to apply:
> >=20
> > Applying: dt-bindings: mfd: Fix schema warnings for pwm-leds
> > Using index info to reconstruct a base tree...
> > M	Documentation/devicetree/bindings/mfd/iqs62x.yaml
> > /home/lee/projects/linux/kernel/.git/worktrees/mfd/rebase-apply/patch:3=
4: indent with spaces.
> >             led-1 {
> > /home/lee/projects/linux/kernel/.git/worktrees/mfd/rebase-apply/patch:3=
5: indent with spaces.
> >                     label =3D "panel";
> > warning: 2 lines add whitespace errors.
> > Falling back to patching base and 3-way merge...
> > Auto-merging Documentation/devicetree/bindings/mfd/iqs62x.yaml
> > CONFLICT (content): Merge conflict in Documentation/devicetree/bindings=
/mfd/iqs62x.yaml
> > Recorded preimage for 'Documentation/devicetree/bindings/mfd/iqs62x.yam=
l'
>=20
> It looks like the following patch already beat this to the punch:
>=20
> 8237e8382498 ("dt-bindings: mfd: Correct the node name of the panel LED")

Which tree is that commit on? This one?

https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git/

> That patch does not retain the LED's label or rename the parent node to
> led-controller, however. The label hardly matters for this example, but
> perhaps we still want the parent node change to follow leds-pwm.yaml.

Should I rework the patch then to have that change only?

Greets
Alex

--=20
/"\ ASCII RIBBON | =BBWith the first link, the chain is forged. The first
\ / CAMPAIGN     | speech censured, the first thought forbidden, the
 X  AGAINST      | first freedom denied, chains us all irrevocably.=AB
/ \ HTML MAIL    | (Jean-Luc Picard, quoting Judge Aaron Satie)

--h2j7lras76hzpifw
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEwo7muQJjlc+Prwj6NK3NAHIhXMYFAmABY4oACgkQNK3NAHIh
XMab+xAAiHeOZzBFG4YB0oYV5i8ACoy6/kajEnF698M7uAJyVfCdryYdg9vejNsY
N43fEtfkWgqaNph449fNAFJIzrfCez8Y7uz3HHXaSfPSYkXpDsM+248YuSUEBBV1
AMji0bj3CiUGh4WtVfLBR5L13xeSR/tKKoZqpIaFBgOlsii/8W+Dc7vw2CoFIE6U
Ac4eVKylR8D/619Oij//lMFT3YiEUEsKmH2oiQ21yKHL5IuYMmGJAMZJg3COgVf+
Abn1i7Dln8iz3OMdISlUgClhRpNv5DGXf8U1z3JeaWWK1f0EQYfgMWy8gz8zSmv9
v07Bx90iY8YABFkdIRXJTbm4kKfiZ9WQQepfN2sHuQXvnKM3aKORx6o43fIR/A1G
yaCIsU49ONg/zWQtdLMzXomLdIfhZNx0poREu01GhLVbWNQLtZzTCnVRNfp/tCkz
irqNzETxwk6MjHV2xgY1kJ3Sx4rM/BVX+sYO/fwdKT95v/voCJNob52H16w6TUue
hIKktspa97v9y31m7ejI/8WHMt9Qgb+aHWvRtFaNI7g3XF9UDUxGD5WRzor8a/Ii
MOh2Tr5tS9nl0BdR2iHn4FMWkSwnr8Q4DiQLkvdNW5e4/92ODuMN/q1A66kxiWm5
KrIpfaNcUmg/NBYoE9vnOKej5D8dNQryaiVb6TwSpbVYJ3vVJyE=
=wtKq
-----END PGP SIGNATURE-----

--h2j7lras76hzpifw--