On 18.10.20 14:56, Baruch Siach wrote:
Align node properties to kernel dts node.

The change of compatible property does not affect any currently
supported board.

Keep U-Boot specific nand-enable-arbiter, and num-cs for compatibility
with the current driver.

Signed-off-by: Baruch Siach <bar...@tkos.co.il>

Reviewed-by: Stefan Roese <s...@denx.de>

Thanks,
Stefan

---
  arch/arm/dts/armada-cp110-master.dtsi | 15 +++++++++------
  1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/arch/arm/dts/armada-cp110-master.dtsi 
b/arch/arm/dts/armada-cp110-master.dtsi
index cd5c974482e6..7d0d31da306d 100644
--- a/arch/arm/dts/armada-cp110-master.dtsi
+++ b/arch/arm/dts/armada-cp110-master.dtsi
@@ -285,15 +285,18 @@
                        };
cpm_nand: nand@720000 {
-                               compatible = "marvell,mvebu-pxa3xx-nand";
-                               reg = <0x720000 0x100>;
+                               compatible = 
"marvell,armada-8k-nand-controller",
+                                       "marvell,armada370-nand-controller";
+                               reg = <0x720000 0x54>;
                                #address-cells = <1>;
-
-                               clocks = <&cpm_syscon0 1 2>;
+                               #size-cells = <0>;
+                               interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>;
+                               clock-names = "core", "reg";
+                               clocks = <&cpm_syscon0 1 2>,
+                                        <&cpm_syscon0 1 17>;
+                               marvell,system-controller = <&cpm_syscon0>;
                                nand-enable-arbiter;
                                num-cs = <1>;
-                               nand-ecc-strength = <4>;
-                               nand-ecc-step-size = <512>;
                                status = "disabled";
                        };


Viele Grüße,
Stefan

--
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: s...@denx.de

Reply via email to