| Message ID | 7c43d1d73390744f752ce83193818a5f7ee5e739.1603024480.git.baruch@tkos.co.il |
|---|---|
| State | Superseded |
| Delegated to: | Stefan Roese |
| Headers | show |
| Series | mtd: pxa3xx_nand: add support for Armada 8k | expand |
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 <baruch@tkos.co.il> Reviewed-by: Stefan Roese <sr@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
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"; };
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 <baruch@tkos.co.il> --- arch/arm/dts/armada-cp110-master.dtsi | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)