Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code »

Commit 3209f3f69eeb187d5174f253b1b91fbdbf264f33

Authored by Moritz Fischer
Committed by Greg Kroah-Hartman
1 parent e3603533ae
Exists in smarct4x-processor-sdk-04.01.00.06 and in 1 other branch smarct3x-processor-sdk-04.01.00.06

ARM64: zynqmp: Fix i2c node's compatible string 

[ Upstream commit c415f9e8304a1d235ef118d912f374ee2e46c45d ]

The Zynq Ultrascale MP uses version 1.4 of the Cadence IP core
which fixes some silicon bugs that needed software workarounds
in Version 1.0 that was used on Zynq systems.

Signed-off-by: Moritz Fischer <mdf@kernel.org>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Sören Brinkmann <soren.brinkmann@xilinx.com>
Cc: Rob Herring <robh+dt@kernel.org>
Acked-by: Sören Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

arch/arm64/boot/dts/xilinx/zynqmp.dtsi
Diff comments   View file @ 3209f3f
... ... @@ -175,7 +175,7 @@
175 175 };
176 176  
177 177 i2c0: i2c@ff020000 {
178   - compatible = "cdns,i2c-r1p10";
  178 + compatible = "cdns,i2c-r1p14", "cdns,i2c-r1p10";
179 179 status = "disabled";
180 180 interrupt-parent = <&gic>;
181 181 interrupts = <0 17 4>;
... ... @@ -185,7 +185,7 @@
185 185 };
186 186  
187 187 i2c1: i2c@ff030000 {
188   - compatible = "cdns,i2c-r1p10";
  188 + compatible = "cdns,i2c-r1p14", "cdns,i2c-r1p10";
189 189 status = "disabled";
190 190 interrupt-parent = <&gic>;
191 191 interrupts = <0 18 4>;