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;
MIME-Version: 1.0
References: <cc294ae1a79ef845af6809ddb4049f0c0f5bb87a.1598259551.git.michal.simek@xilinx.com>
In-Reply-To: <cc294ae1a79ef845af6809ddb4049f0c0f5bb87a.1598259551.git.michal.simek@xilinx.com>
From:   Michal Simek <monstr@monstr.eu>
Date:   Tue, 29 Sep 2020 12:56:39 +0200
Message-ID: <CAHTX3dLF1GRi2nMCt0u8TQc96bu3a4OoxKjwQB54MRx87DOn4w@mail.gmail.com>
Subject: Re: [PATCH] arm64: dts: zynqmp: Remove additional compatible string
 for i2c IPs
To:     LKML <linux-kernel@vger.kernel.org>,
        Michal Simek <monstr@monstr.eu>, git <git@xilinx.com>
Cc:     Krzysztof Kozlowski <krzk@kernel.org>,
        Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
        Manish Narani <manish.narani@xilinx.com>,
        Michael Tretter <m.tretter@pengutronix.de>,
        Moritz Fischer <mdf@kernel.org>,
        Nava kishore Manne <nava.manne@xilinx.com>,
        Rajan Vaja <rajan.vaja@xilinx.com>,
        Rob Herring <robh+dt@kernel.org>,
        =?UTF-8?Q?S=C3=B6ren_Brinkmann?= <soren.brinkmann@xilinx.com>,
        DTML <devicetree@vger.kernel.org>,
        linux-arm <linux-arm-kernel@lists.infradead.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

po 24. 8. 2020 v 10:59 odes=C3=ADlatel Michal Simek <michal.simek@xilinx.co=
m> napsal:
>
> DT binding permits only one compatible string which was decribed in past =
by
> commit 63cab195bf49 ("i2c: removed work arounds in i2c driver for Zynq
> Ultrascale+ MPSoC").
> The commit aea37006e183 ("dt-bindings: i2c: cadence: Migrate i2c-cadence
> documentation to YAML") has converted binding to yaml and the following
> issues is reported:
> ...: i2c@ff030000: compatible: Additional items are not allowed
> ('cdns,i2c-r1p10' was unexpected)
>         From schema:
> .../Documentation/devicetree/bindings/i2c/cdns,i2c-r1p10.yaml fds
> ...: i2c@ff030000: compatible: ['cdns,i2c-r1p14', 'cdns,i2c-r1p10'] is to=
o
> long
>
> The commit c415f9e8304a ("ARM64: zynqmp: Fix i2c node's compatible string=
")
> has added the second compatible string but without removing origin one.
> The patch is only keeping one compatible string "cdns,i2c-r1p14".
>
> Fixes: c415f9e8304a ("ARM64: zynqmp: Fix i2c node's compatible string")
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
>
>  arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts=
/xilinx/zynqmp.dtsi
> index 6a8ff4bcc09b..165a95a106c8 100644
> --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> @@ -500,7 +500,7 @@ gpio: gpio@ff0a0000 {
>                 };
>
>                 i2c0: i2c@ff020000 {
> -                       compatible =3D "cdns,i2c-r1p14", "cdns,i2c-r1p10"=
;
> +                       compatible =3D "cdns,i2c-r1p14";
>                         status =3D "disabled";
>                         interrupt-parent =3D <&gic>;
>                         interrupts =3D <0 17 4>;
> @@ -511,7 +511,7 @@ i2c0: i2c@ff020000 {
>                 };
>
>                 i2c1: i2c@ff030000 {
> -                       compatible =3D "cdns,i2c-r1p14", "cdns,i2c-r1p10"=
;
> +                       compatible =3D "cdns,i2c-r1p14";
>                         status =3D "disabled";
>                         interrupt-parent =3D <&gic>;
>                         interrupts =3D <0 18 4>;
> --
> 2.28.0
>

Applied.
M

--=20
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs