lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.8 515/633] arm64: dts: zynqmp: Remove additional compatible string for i2c IPs
    Date
    From: Michal Simek <michal.simek@xilinx.com>

    [ Upstream commit 35292518cb0a626fcdcabf739aed75060a018ab5 ]

    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 too
    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>
    Link: https://lore.kernel.org/r/cc294ae1a79ef845af6809ddb4049f0c0f5bb87a.1598259551.git.michal.simek@xilinx.com
    Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 9174ddc76bdc3..b8d04c5748bf3 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 = "cdns,i2c-r1p14", "cdns,i2c-r1p10";
    + compatible = "cdns,i2c-r1p14";
    status = "disabled";
    interrupt-parent = <&gic>;
    interrupts = <0 17 4>;
    @@ -511,7 +511,7 @@ i2c0: i2c@ff020000 {
    };

    i2c1: i2c@ff030000 {
    - compatible = "cdns,i2c-r1p14", "cdns,i2c-r1p10";
    + compatible = "cdns,i2c-r1p14";
    status = "disabled";
    interrupt-parent = <&gic>;
    interrupts = <0 18 4>;
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 16:40    [W:2.586 / U:0.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site