ARM: dts: armada-xp: fix Armada XP boards NAND description
Commithifive-unleashed-5.13b79919946
("ARM: dts: armada-370-xp: update NAND node with new bindings") updated some Marvell Armada DT description to use the new NAND controller bindings, but did it incorrectly for a number of boards: armada-xp-gp, armada-xp-db and armada-xp-lenovo-ix4-300d. Due to this, the NAND is no longer detected on those platforms. This commit fixes that by properly using the new NAND DT binding. This commit was runtime-tested on Armada XP GP, the two other platforms are only compile-tested. Fixes:3b79919946
("ARM: dts: armada-370-xp: update NAND node with new bindings") Cc: Miquel Raynal <miquel.raynal@bootlin.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
parent
b5f034845e
commit
6fc979179c
|
@ -144,30 +144,32 @@
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
nand@d0000 {
|
nand-controller@d0000 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
label = "pxa3xx_nand-0";
|
|
||||||
num-cs = <1>;
|
|
||||||
marvell,nand-keep-config;
|
|
||||||
nand-on-flash-bbt;
|
|
||||||
|
|
||||||
partitions {
|
nand@0 {
|
||||||
compatible = "fixed-partitions";
|
reg = <0>;
|
||||||
#address-cells = <1>;
|
label = "pxa3xx_nand-0";
|
||||||
#size-cells = <1>;
|
nand-rb = <0>;
|
||||||
|
nand-on-flash-bbt;
|
||||||
|
|
||||||
partition@0 {
|
partitions {
|
||||||
label = "U-Boot";
|
compatible = "fixed-partitions";
|
||||||
reg = <0 0x800000>;
|
#address-cells = <1>;
|
||||||
};
|
#size-cells = <1>;
|
||||||
partition@800000 {
|
|
||||||
label = "Linux";
|
|
||||||
reg = <0x800000 0x800000>;
|
|
||||||
};
|
|
||||||
partition@1000000 {
|
|
||||||
label = "Filesystem";
|
|
||||||
reg = <0x1000000 0x3f000000>;
|
|
||||||
|
|
||||||
|
partition@0 {
|
||||||
|
label = "U-Boot";
|
||||||
|
reg = <0 0x800000>;
|
||||||
|
};
|
||||||
|
partition@800000 {
|
||||||
|
label = "Linux";
|
||||||
|
reg = <0x800000 0x800000>;
|
||||||
|
};
|
||||||
|
partition@1000000 {
|
||||||
|
label = "Filesystem";
|
||||||
|
reg = <0x1000000 0x3f000000>;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -160,12 +160,15 @@
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
nand@d0000 {
|
nand-controller@d0000 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
label = "pxa3xx_nand-0";
|
|
||||||
num-cs = <1>;
|
nand@0 {
|
||||||
marvell,nand-keep-config;
|
reg = <0>;
|
||||||
nand-on-flash-bbt;
|
label = "pxa3xx_nand-0";
|
||||||
|
nand-rb = <0>;
|
||||||
|
nand-on-flash-bbt;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -81,49 +81,52 @@
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
nand@d0000 {
|
nand-controller@d0000 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
label = "pxa3xx_nand-0";
|
|
||||||
num-cs = <1>;
|
|
||||||
marvell,nand-keep-config;
|
|
||||||
nand-on-flash-bbt;
|
|
||||||
|
|
||||||
partitions {
|
nand@0 {
|
||||||
compatible = "fixed-partitions";
|
reg = <0>;
|
||||||
#address-cells = <1>;
|
label = "pxa3xx_nand-0";
|
||||||
#size-cells = <1>;
|
nand-rb = <0>;
|
||||||
|
nand-on-flash-bbt;
|
||||||
|
|
||||||
partition@0 {
|
partitions {
|
||||||
label = "u-boot";
|
compatible = "fixed-partitions";
|
||||||
reg = <0x00000000 0x000e0000>;
|
#address-cells = <1>;
|
||||||
read-only;
|
#size-cells = <1>;
|
||||||
};
|
|
||||||
|
|
||||||
partition@e0000 {
|
partition@0 {
|
||||||
label = "u-boot-env";
|
label = "u-boot";
|
||||||
reg = <0x000e0000 0x00020000>;
|
reg = <0x00000000 0x000e0000>;
|
||||||
read-only;
|
read-only;
|
||||||
};
|
};
|
||||||
|
|
||||||
partition@100000 {
|
partition@e0000 {
|
||||||
label = "u-boot-env2";
|
label = "u-boot-env";
|
||||||
reg = <0x00100000 0x00020000>;
|
reg = <0x000e0000 0x00020000>;
|
||||||
read-only;
|
read-only;
|
||||||
};
|
};
|
||||||
|
|
||||||
partition@120000 {
|
partition@100000 {
|
||||||
label = "zImage";
|
label = "u-boot-env2";
|
||||||
reg = <0x00120000 0x00400000>;
|
reg = <0x00100000 0x00020000>;
|
||||||
};
|
read-only;
|
||||||
|
};
|
||||||
|
|
||||||
partition@520000 {
|
partition@120000 {
|
||||||
label = "initrd";
|
label = "zImage";
|
||||||
reg = <0x00520000 0x00400000>;
|
reg = <0x00120000 0x00400000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
partition@e00000 {
|
partition@520000 {
|
||||||
label = "boot";
|
label = "initrd";
|
||||||
reg = <0x00e00000 0x3f200000>;
|
reg = <0x00520000 0x00400000>;
|
||||||
|
};
|
||||||
|
|
||||||
|
partition@e00000 {
|
||||||
|
label = "boot";
|
||||||
|
reg = <0x00e00000 0x3f200000>;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue