Update 32-bit Marvell EBU NAND DT nodes with new bindings
v2 cover Update 32-bit Marvell EBU NAND DT nodes with new bindings
Hello,
As part of a previous work, the bindings for the Marvell NAND controller have changed and various DT got updated accordingly. I asked Gregory not to take the DT patches updating the NAND nodes of the 32-bit Marvell EBU platforms from the last series because of the need to update one property after a review from Rob Herring.
My apologies to this very late new version of the patches, they are now ready to be merged.
Thank you,
Miqu?l
Changes since v1
================
* s/marvell,rb/nand-rb/ DT property.
* Reworded a bit the commit messages.
Miquel Raynal (4):
ARM: dts: armada-370-xp: update NAND node with new bindings
ARM: dts: armada-375: update NAND node with new bindings
ARM: dts: armada-38x: update NAND node with new bindings
ARM: dts: armada-39x: update NAND node with new bindings
arch/arm/boot/dts/armada-370-db.dts | 57 ++++---- arch/arm/boot/dts/armada-370-dlink-dns327l.dts | 120 ++++++++-------- arch/arm/boot/dts/armada-370-mirabox.dts | 51 ++++--- arch/arm/boot/dts/armada-370-netgear-rn102.dts | 90 ++++++------ arch/arm/boot/dts/armada-370-netgear-rn104.dts | 90 ++++++------ arch/arm/boot/dts/armada-370-rd.dts | 52 ++++--- arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi | 64 +++++---- arch/arm/boot/dts/armada-370-xp.dtsi | 6 +- arch/arm/boot/dts/armada-375-db.dts | 48 ++++--- arch/arm/boot/dts/armada-375.dtsi | 6 +- arch/arm/boot/dts/armada-385-db-ap.dts | 69 ++++----- arch/arm/boot/dts/armada-385-linksys-caiman.dts | 127 +++++++++-------- arch/arm/boot/dts/armada-385-linksys-cobra.dts | 127 +++++++++-------- arch/arm/boot/dts/armada-385-linksys-rango.dts | 119 ++++++++-------- arch/arm/boot/dts/armada-385-linksys-shelby.dts | 127 +++++++++-------- arch/arm/boot/dts/armada-385-linksys.dtsi | 16 ++- arch/arm/boot/dts/armada-388-db.dts | 55 +++++--- arch/arm/boot/dts/armada-38x.dtsi | 6 +- arch/arm/boot/dts/armada-390-db.dts | 66 +++++---- arch/arm/boot/dts/armada-395-gp.dts | 74 +++++----- arch/arm/boot/dts/armada-398-db.dts | 60 ++++---- arch/arm/boot/dts/armada-39x.dtsi | 6 +- arch/arm/boot/dts/armada-xp-db-dxbc2.dts | 2 +- arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts | 2 +- arch/arm/boot/dts/armada-xp-db.dts | 2 +- arch/arm/boot/dts/armada-xp-gp.dts | 2 +- arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 2 +- arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 156 +++++++++++---------- arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 90 ++++++------ 29 files changed, 920 insertions(+), 772 deletions(-)
Signature · 1 line
2.14.1
PATCH v2 1/4 ARM: dts: armada-370-xp: update NAND node with new bindings
Use the new bindings of the Marvell NAND controller driver. Also adapt the NAND controller node organization to distinguish which property is relevant for the controller, and which one is NAND chip specific. Expose the partitions as a subnode of the NAND chip.
Remove the 'marvell,nand-enable-arbiter' property, not needed anymore as the new driver activates the arbiter by default for all boards which is either needed or harmless.
--- arch/arm/boot/dts/armada-370-db.dts | 57 ++++---- arch/arm/boot/dts/armada-370-dlink-dns327l.dts | 120 ++++++++-------- arch/arm/boot/dts/armada-370-mirabox.dts | 51 ++++--- arch/arm/boot/dts/armada-370-netgear-rn102.dts | 90 ++++++------ arch/arm/boot/dts/armada-370-netgear-rn104.dts | 90 ++++++------ arch/arm/boot/dts/armada-370-rd.dts | 52 ++++--- arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi | 64 +++++---- arch/arm/boot/dts/armada-370-xp.dtsi | 6 +- arch/arm/boot/dts/armada-xp-db-dxbc2.dts | 2 +- arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts | 2 +- arch/arm/boot/dts/armada-xp-db.dts | 2 +- arch/arm/boot/dts/armada-xp-gp.dts | 2 +- arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 2 +- arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 156 +++++++++++---------- arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 90 ++++++------ 15 files changed, 434 insertions(+), 352 deletions(-)
arch/arm/boot/dts/armada-370-db.dts +30 -27
@@ -105,33 +105,6 @@ usb at 51000 { status = "okay"; }; - - nand at d0000 { - status = "okay"; - num-cs = <1>; - marvell,nand-keep-config; - marvell,nand-enable-arbiter; - nand-on-flash-bbt; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition at 0 { - label = "U-Boot"; - reg = <0 0x800000>; - }; - partition at 800000 { - label = "Linux"; - reg = <0x800000 0x800000>; - }; - partition at 1000000 { - label = "Filesystem"; - reg = <0x1000000 0x3f000000>; - }; - }; - }; }; };
@@ -239,3 +212,33 @@ }; }; +&nand_controller { + status = "okay"; + + nand at 0 { + reg = <0>; + label = "pxa3xx_nand-0"; + nand-rb = <0>; + marvell,nand-keep-config; + nand-on-flash-bbt; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition at 0 { + label = "U-Boot"; + reg = <0 0x800000>; + }; + partition at 800000 { + label = "Linux"; + reg = <0x800000 0x800000>; + }; + partition at 1000000 { + label = "Filesystem"; + reg = <0x1000000 0x3f000000>; + }; + }; + }; +};
arch/arm/boot/dts/armada-370-dlink-dns327l.dts +65 -55
129 lines not on this page · raw message
arch/arm/boot/dts/armada-370-mirabox.dts +30 -21
60 lines not on this page · raw message
arch/arm/boot/dts/armada-370-netgear-rn102.dts +50 -40
99 lines not on this page · raw message
arch/arm/boot/dts/armada-370-netgear-rn104.dts +50 -40
99 lines not on this page · raw message
arch/arm/boot/dts/armada-370-rd.dts +31 -21
61 lines not on this page · raw message
arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi +37 -27
73 lines not on this page · raw message
arch/arm/boot/dts/armada-370-xp.dtsi +3 -3
@@ -244,11 +244,11 @@ status = "disabled"; }; - nand: nand at d0000 { - compatible = "marvell,armada370-nand"; + nand_controller: nand-controller at d0000 { + compatible = "marvell,armada370-nand-controller"; reg = <0xd0000 0x54>; #address-cells = <1>; - #size-cells = <1>; + #size-cells = <0>; interrupts = <113>; clocks = <&coredivclk 0>; status = "disabled";
arch/arm/boot/dts/armada-xp-db-dxbc2.dts +1 -1
@@ -70,9 +70,9 @@ &nand { status = "okay"; + label = "pxa3xx_nand-0"; num-cs = <1>; marvell,nand-keep-config; - marvell,nand-enable-arbiter; nand-on-flash-bbt; nand-ecc-strength = <4>; nand-ecc-step-size = <512>;
arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts +1 -1
@@ -69,9 +69,9 @@ &nand { status = "okay"; + label = "pxa3xx_nand-0"; num-cs = <1>; marvell,nand-keep-config; - marvell,nand-enable-arbiter; nand-on-flash-bbt; nand-ecc-strength = <4>; nand-ecc-step-size = <512>;
arch/arm/boot/dts/armada-xp-db.dts +1 -1
@@ -146,9 +146,9 @@ nand at d0000 { status = "okay"; + label = "pxa3xx_nand-0"; num-cs = <1>; marvell,nand-keep-config; - marvell,nand-enable-arbiter; nand-on-flash-bbt; partitions {
arch/arm/boot/dts/armada-xp-gp.dts +1 -1
@@ -162,9 +162,9 @@ nand at d0000 { status = "okay"; + label = "pxa3xx_nand-0"; num-cs = <1>; marvell,nand-keep-config; - marvell,nand-enable-arbiter; nand-on-flash-bbt; }; };
arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts +1 -1
@@ -83,9 +83,9 @@ nand at d0000 { status = "okay"; + label = "pxa3xx_nand-0"; num-cs = <1>; marvell,nand-keep-config; - marvell,nand-enable-arbiter; nand-on-flash-bbt; partitions {
arch/arm/boot/dts/armada-xp-linksys-mamba.dts +83 -73
165 lines not on this page · raw message
arch/arm/boot/dts/armada-xp-netgear-rn2120.dts +50 -40
99 lines not on this page · raw message
Signature · 1 line
2.14.1
PATCH v2 2/4 ARM: dts: armada-375: update NAND node with new bindings
In reply to Miquel RaynalUse the new bindings of the Marvell NAND controller driver. Also adapt the NAND controller node organization to distinguish which property is relevant for the controller, and which one is NAND chip specific. Expose the partitions as a subnode of the NAND chip.
Remove the 'marvell,nand-enable-arbiter' property, not needed anymore as the new driver activates the arbiter by default for all boards which is either needed or harmless.
--- arch/arm/boot/dts/armada-375-db.dts | 48 ++++++++++++++++++++++--------------- arch/arm/boot/dts/armada-375.dtsi | 6 ++--- 2 files changed, 32 insertions(+), 22 deletions(-)
arch/arm/boot/dts/armada-375-db.dts +29 -19
@@ -103,28 +103,38 @@ nr-ports = <2>; }; -&nand { +&nand_controller { + status = "okay"; pinctrl-0 = <&nand_pins>; pinctrl-names = "default"; - status = "okay"; - num-cs = <1>; - marvell,nand-keep-config; - marvell,nand-enable-arbiter; - nand-on-flash-bbt; - nand-ecc-strength = <4>; - nand-ecc-step-size = <512>; - partition at 0 { - label = "U-Boot"; - reg = <0 0x800000>; - }; - partition at 800000 { - label = "Linux"; - reg = <0x800000 0x800000>; - }; - partition at 1000000 { - label = "Filesystem"; - reg = <0x1000000 0x3f000000>; + nand at 0 { + reg = <0>; + label = "pxa3xx_nand-0"; + nand-rb = <0>; + marvell,nand-keep-config; + nand-on-flash-bbt; + nand-ecc-strength = <4>; + nand-ecc-step-size = <512>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition at 0 { + label = "U-Boot"; + reg = <0 0x800000>; + }; + partition at 800000 { + label = "Linux"; + reg = <0x800000 0x800000>; + }; + partition at 1000000 { + label = "Filesystem"; + reg = <0x1000000 0x3f000000>; + }; + }; }; };
arch/arm/boot/dts/armada-375.dtsi +3 -3
@@ -502,11 +502,11 @@ status = "disabled"; }; - nand: nand at d0000 { - compatible = "marvell,armada370-nand"; + nand_controller: nand-controller at d0000 { + compatible = "marvell,armada370-nand-controller"; reg = <0xd0000 0x54>; #address-cells = <1>; - #size-cells = <1>; + #size-cells = <0>; interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>; clocks = <&gateclk 11>; status = "disabled";
Signature · 1 line
2.14.1
PATCH v2 3/4 ARM: dts: armada-38x: update NAND node with new bindings
In reply to Miquel RaynalUse the new bindings of the Marvell NAND controller driver. Also adapt the NAND controller node organization to distinguish which property is relevant for the controller, and which one is NAND chip specific. Expose the partitions as a subnode of the NAND chip.
Remove the 'marvell,nand-enable-arbiter' property, not needed anymore as the new driver activates the arbiter by default for all boards which is either needed or harmless.
--- arch/arm/boot/dts/armada-385-db-ap.dts | 69 +++++++------ arch/arm/boot/dts/armada-385-linksys-caiman.dts | 127 ++++++++++++------------ arch/arm/boot/dts/armada-385-linksys-cobra.dts | 127 ++++++++++++------------ arch/arm/boot/dts/armada-385-linksys-rango.dts | 119 +++++++++++----------- arch/arm/boot/dts/armada-385-linksys-shelby.dts | 127 ++++++++++++------------ arch/arm/boot/dts/armada-385-linksys.dtsi | 16 ++- arch/arm/boot/dts/armada-388-db.dts | 55 +++++----- arch/arm/boot/dts/armada-38x.dtsi | 6 +- 8 files changed, 342 insertions(+), 304 deletions(-)
arch/arm/boot/dts/armada-385-db-ap.dts +36 -33
@@ -135,39 +135,6 @@ status = "okay"; }; - nfc: flash at d0000 { - status = "okay"; - num-cs = <1>; - nand-ecc-strength = <4>; - nand-ecc-step-size = <512>; - marvell,nand-keep-config; - marvell,nand-enable-arbiter; - nand-on-flash-bbt; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition at 0 { - label = "U-Boot"; - reg = <0x00000000 0x00800000>; - read-only; - }; - - partition at 800000 { - label = "uImage"; - reg = <0x00800000 0x00400000>; - read-only; - }; - - partition at c00000 { - label = "Root"; - reg = <0x00c00000 0x3f400000>; - }; - }; - }; - usb3 at f0000 { status = "okay"; usb-phy = <&usb3_phy>;
@@ -233,3 +200,39 @@ spi-max-frequency = <54000000>; }; }; + +&nand_controller { + status = "okay"; + + nand at 0 { + reg = <0>; + label = "pxa3xx_nand-0"; + nand-rb = <0>; + nand-on-flash-bbt; + nand-ecc-strength = <4>; + nand-ecc-step-size = <512>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition at 0 { + label = "U-Boot"; + reg = <0x00000000 0x00800000>; + read-only; + }; + + partition at 800000 { + label = "uImage"; + reg = <0x00800000 0x00400000>; + read-only; + }; + + partition at c00000 { + label = "Root"; + reg = <0x00c00000 0x3f400000>; + }; + }; + }; +};
arch/arm/boot/dts/armada-385-linksys-caiman.dts +66 -61
133 lines not on this page · raw message
arch/arm/boot/dts/armada-385-linksys-cobra.dts +66 -61
133 lines not on this page · raw message
arch/arm/boot/dts/armada-385-linksys-rango.dts +62 -57
136 lines not on this page · raw message
arch/arm/boot/dts/armada-385-linksys-shelby.dts +66 -61
133 lines not on this page · raw message
arch/arm/boot/dts/armada-385-linksys.dtsi +11 -5
@@ -138,13 +138,19 @@ }; }; -&nand { +&nand_controller { /* 128MiB or 256MiB */ status = "okay"; - num-cs = <1>; - marvell,nand-keep-config; - marvell,nand-enable-arbiter; - nand-on-flash-bbt; + #address-cells = <1>; + #size-cells = <0>; + + nand: nand at 0 { + reg = <0>; + label = "pxa3xx_nand-0"; + nand-rb = <0>; + marvell,nand-keep-config; + nand-on-flash-bbt; + }; }; &mdio {
arch/arm/boot/dts/armada-388-db.dts +32 -23
64 lines not on this page · raw message
arch/arm/boot/dts/armada-38x.dtsi +3 -3
@@ -551,11 +551,11 @@ status = "okay"; }; - nand: flash at d0000 { - compatible = "marvell,armada370-nand"; + nand_controller: nand-controller at d0000 { + compatible = "marvell,armada370-nand-controller"; reg = <0xd0000 0x54>; #address-cells = <1>; - #size-cells = <1>; + #size-cells = <0>; interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>; clocks = <&coredivclk 0>; status = "disabled";
Signature · 1 line
2.14.1
PATCH v2 4/4 ARM: dts: armada-39x: update NAND node with new bindings
In reply to Miquel RaynalUse the new bindings of the Marvell NAND controller driver. Also adapt the NAND controller node organization to distinguish which property is relevant for the controller, and which one is NAND chip specific. Expose the partitions as a subnode of the NAND chip.
Remove the 'marvell,nand-enable-arbiter' property, not needed anymore as the new driver activates the arbiter by default for all boards which is either needed or harmless.
--- arch/arm/boot/dts/armada-390-db.dts | 66 +++++++++++++++++---------------- arch/arm/boot/dts/armada-395-gp.dts | 74 +++++++++++++++++++------------------ arch/arm/boot/dts/armada-398-db.dts | 60 +++++++++++++++++------------- arch/arm/boot/dts/armada-39x.dtsi | 6 +-- 4 files changed, 112 insertions(+), 94 deletions(-)
arch/arm/boot/dts/armada-390-db.dts +35 -31
@@ -49,37 +49,6 @@ status = "okay"; }; - flash at d0000 { - status = "okay"; - pinctrl-0 = <&nand_pins>; - pinctrl-names = "default"; - num-cs = <1>; - marvell,nand-keep-config; - marvell,nand-enable-arbiter; - nand-on-flash-bbt; - nand-ecc-strength = <8>; - nand-ecc-step-size = <512>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition at 0 { - label = "U-Boot"; - reg = <0 0x800000>; - }; - partition at 800000 { - label = "Linux"; - reg = <0x800000 0x800000>; - }; - partition at 1000000 { - label = "Filesystem"; - reg = <0x1000000 0x3f000000>; - }; - }; - }; - /* CON98 */ usb3 at f8000 { status = "okay";
@@ -136,3 +105,38 @@ }; }; }; + +&nand_controller { + status = "okay"; + pinctrl-0 = <&nand_pins>; + pinctrl-names = "default"; + + nand at 0 { + reg = <0>; + label = "pxa3xx_nand-0"; + nand-rb = <0>; + marvell,nand-keep-config; + nand-on-flash-bbt; + nand-ecc-strength = <8>; + nand-ecc-step-size = <512>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition at 0 { + label = "U-Boot"; + reg = <0 0x800000>; + }; + partition at 800000 { + label = "Linux"; + reg = <0x800000 0x800000>; + }; + partition at 1000000 { + label = "Filesystem"; + reg = <0x1000000 0x3f000000>; + }; + }; + }; +};
arch/arm/boot/dts/armada-395-gp.dts +39 -35
83 lines not on this page · raw message
arch/arm/boot/dts/armada-398-db.dts +35 -25
69 lines not on this page · raw message
arch/arm/boot/dts/armada-39x.dtsi +3 -3
@@ -367,11 +367,11 @@ interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>; }; - flash at d0000 { - compatible = "marvell,armada370-nand"; + nand_controller: nand-controller at d0000 { + compatible = "marvell,armada370-nand-controller"; reg = <0xd0000 0x54>; #address-cells = <1>; - #size-cells = <1>; + #size-cells = <0>; interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>; clocks = <&coredivclk 0>; status = "disabled";
Signature · 1 line
2.14.1
v2 cover Update 32-bit Marvell EBU NAND DT nodes with new bindings
In reply to Miquel RaynalHi Miquel,
Quoted 20 lines · Miquel Raynal
Hello,
As part of a previous work, the bindings for the Marvell NAND controller have changed and various DT got updated accordingly. I asked Gregory not to take the DT patches updating the NAND nodes of the 32-bit Marvell EBU platforms from the last series because of the need to update one property after a review from Rob Herring.
My apologies to this very late new version of the patches, they are now ready to be merged.
Thank you,
Miqu?lChanges since v1
================
* s/marvell,rb/nand-rb/ DT property.
* Reworded a bit the commit messages.
Quoted 5 lines
Miquel Raynal (4):
ARM: dts: armada-370-xp: update NAND node with new bindings
ARM: dts: armada-375: update NAND node with new bindings
ARM: dts: armada-38x: update NAND node with new bindings
ARM: dts: armada-39x: update NAND node with new bindings
The four patches are now applied on mvebu/dt
Thanks,
Gregory
Quoted 35 lines
arch/arm/boot/dts/armada-370-db.dts | 57 ++++---- arch/arm/boot/dts/armada-370-dlink-dns327l.dts | 120 ++++++++-------- arch/arm/boot/dts/armada-370-mirabox.dts | 51 ++++--- arch/arm/boot/dts/armada-370-netgear-rn102.dts | 90 ++++++------ arch/arm/boot/dts/armada-370-netgear-rn104.dts | 90 ++++++------ arch/arm/boot/dts/armada-370-rd.dts | 52 ++++--- arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi | 64 +++++---- arch/arm/boot/dts/armada-370-xp.dtsi | 6 +- arch/arm/boot/dts/armada-375-db.dts | 48 ++++--- arch/arm/boot/dts/armada-375.dtsi | 6 +- arch/arm/boot/dts/armada-385-db-ap.dts | 69 ++++----- arch/arm/boot/dts/armada-385-linksys-caiman.dts | 127 +++++++++-------- arch/arm/boot/dts/armada-385-linksys-cobra.dts | 127 +++++++++-------- arch/arm/boot/dts/armada-385-linksys-rango.dts | 119 ++++++++-------- arch/arm/boot/dts/armada-385-linksys-shelby.dts | 127 +++++++++-------- arch/arm/boot/dts/armada-385-linksys.dtsi | 16 ++- arch/arm/boot/dts/armada-388-db.dts | 55 +++++--- arch/arm/boot/dts/armada-38x.dtsi | 6 +- arch/arm/boot/dts/armada-390-db.dts | 66 +++++---- arch/arm/boot/dts/armada-395-gp.dts | 74 +++++----- arch/arm/boot/dts/armada-398-db.dts | 60 ++++---- arch/arm/boot/dts/armada-39x.dtsi | 6 +- arch/arm/boot/dts/armada-xp-db-dxbc2.dts | 2 +- arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts | 2 +- arch/arm/boot/dts/armada-xp-db.dts | 2 +- arch/arm/boot/dts/armada-xp-gp.dts | 2 +- arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 2 +- arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 156 +++++++++++---------- arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 90 ++++++------ 29 files changed, 920 insertions(+), 772 deletions(-)Signature · 1 line
2.14.1
Signature · 3 lines
Gregory Clement, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering http://bootlin.com