Skip to content

Commit

Permalink
ARM: kirkwood: Move the nand node under the mbus node
Browse files Browse the repository at this point in the history 
There should be no nodes that are not children of the mbus. Move
the nand node under the mbus, and rework the board .dts files
to use an & reference to the nand node.

Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Tested-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
  • Loading branch information
Jason Gunthorpe authored and Jason Cooper committed Oct 1, 2013
1 parent 34a3009 commit 7045ff5
Show file tree
Hide file tree
Showing 16 changed files with 418 additions and 417 deletions.
44 changes: 22 additions & 22 deletions arch/arm/boot/dts/kirkwood-db.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,28 +39,6 @@
status = "ok";
};

nand@3000000 {
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
chip-delay = <25>;
status = "okay";

partition@0 {
label = "uboot";
reg = <0x0 0x100000>;
};

partition@100000 {
label = "uImage";
reg = <0x100000 0x400000>;
};

partition@500000 {
label = "root";
reg = <0x500000 0x1fb00000>;
};
};

sata@80000 {
nr-ports = <2>;
status = "okay";
Expand All @@ -80,6 +58,28 @@
};
};

&nand {
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
chip-delay = <25>;
status = "okay";

partition@0 {
label = "uboot";
reg = <0x0 0x100000>;
};

partition@100000 {
label = "uImage";
reg = <0x100000 0x400000>;
};

partition@500000 {
label = "root";
reg = <0x500000 0x1fb00000>;
};
};

&mdio {
status = "okay";

Expand Down
76 changes: 38 additions & 38 deletions arch/arm/boot/dts/kirkwood-dnskw.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,44 +148,6 @@
status = "okay";
nr-ports = <2>;
};

nand@3000000 {
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
status = "okay";
chip-delay = <35>;

partition@0 {
label = "u-boot";
reg = <0x0000000 0x100000>;
read-only;
};

partition@100000 {
label = "uImage";
reg = <0x0100000 0x500000>;
};

partition@600000 {
label = "ramdisk";
reg = <0x0600000 0x500000>;
};

partition@b00000 {
label = "image";
reg = <0x0b00000 0x6600000>;
};

partition@7100000 {
label = "mini firmware";
reg = <0x7100000 0xa00000>;
};

partition@7b00000 {
label = "config";
reg = <0x7b00000 0x500000>;
};
};
};

regulators {
Expand Down Expand Up @@ -220,6 +182,44 @@
};
};

&nand {
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
status = "okay";
chip-delay = <35>;

partition@0 {
label = "u-boot";
reg = <0x0000000 0x100000>;
read-only;
};

partition@100000 {
label = "uImage";
reg = <0x0100000 0x500000>;
};

partition@600000 {
label = "ramdisk";
reg = <0x0600000 0x500000>;
};

partition@b00000 {
label = "image";
reg = <0x0b00000 0x6600000>;
};

partition@7100000 {
label = "mini firmware";
reg = <0x7100000 0xa00000>;
};

partition@7b00000 {
label = "config";
reg = <0x7b00000 0x500000>;
};
};

&mdio {
status = "okay";

Expand Down
40 changes: 20 additions & 20 deletions arch/arm/boot/dts/kirkwood-dockstar.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,26 +34,6 @@
serial@12000 {
status = "ok";
};

nand@3000000 {
status = "okay";

partition@0 {
label = "u-boot";
reg = <0x0000000 0x100000>;
read-only;
};

partition@100000 {
label = "uImage";
reg = <0x0100000 0x400000>;
};

partition@500000 {
label = "data";
reg = <0x0500000 0xfb00000>;
};
};
};
gpio-leds {
compatible = "gpio-leds";
Expand Down Expand Up @@ -91,6 +71,26 @@
};
};

&nand {
status = "okay";

partition@0 {
label = "u-boot";
reg = <0x0000000 0x100000>;
read-only;
};

partition@100000 {
label = "uImage";
reg = <0x0100000 0x400000>;
};

partition@500000 {
label = "data";
reg = <0x0500000 0xfb00000>;
};
};

&mdio {
status = "okay";

Expand Down
51 changes: 26 additions & 25 deletions arch/arm/boot/dts/kirkwood-goflexnet.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,31 +67,6 @@
status = "ok";
};

nand@3000000 {
chip-delay = <40>;
status = "okay";

partition@0 {
label = "u-boot";
reg = <0x0000000 0x100000>;
read-only;
};

partition@100000 {
label = "uImage";
reg = <0x0100000 0x400000>;
};

partition@500000 {
label = "pogoplug";
reg = <0x0500000 0x2000000>;
};

partition@2500000 {
label = "root";
reg = <0x02500000 0xd800000>;
};
};
sata@80000 {
status = "okay";
nr-ports = <2>;
Expand Down Expand Up @@ -171,6 +146,32 @@
};
};

&nand {
chip-delay = <40>;
status = "okay";

partition@0 {
label = "u-boot";
reg = <0x0000000 0x100000>;
read-only;
};

partition@100000 {
label = "uImage";
reg = <0x0100000 0x400000>;
};

partition@500000 {
label = "pogoplug";
reg = <0x0500000 0x2000000>;
};

partition@2500000 {
label = "root";
reg = <0x02500000 0xd800000>;
};
};

&mdio {
status = "okay";

Expand Down
40 changes: 20 additions & 20 deletions arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,26 +40,6 @@
status = "ok";
};

nand@3000000 {
status = "okay";

partition@0 {
label = "u-boot";
reg = <0x00000000 0x00100000>;
read-only;
};

partition@100000 {
label = "uImage";
reg = <0x00100000 0x00400000>;
};

partition@500000 {
label = "data";
reg = <0x00500000 0x1fb00000>;
};
};

sata@80000 {
status = "okay";
nr-ports = <1>;
Expand Down Expand Up @@ -97,6 +77,26 @@
};
};

&nand {
status = "okay";

partition@0 {
label = "u-boot";
reg = <0x00000000 0x00100000>;
read-only;
};

partition@100000 {
label = "uImage";
reg = <0x00100000 0x00400000>;
};

partition@500000 {
label = "data";
reg = <0x00500000 0x1fb00000>;
};
};

&mdio {
status = "okay";

Expand Down
44 changes: 22 additions & 22 deletions arch/arm/boot/dts/kirkwood-ib62x0.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,28 +51,6 @@
status = "okay";
nr-ports = <2>;
};

nand@3000000 {
status = "okay";
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";

partition@0 {
label = "u-boot";
reg = <0x0000000 0x100000>;
};

partition@100000 {
label = "uImage";
reg = <0x0100000 0x600000>;
};

partition@700000 {
label = "root";
reg = <0x0700000 0xf900000>;
};

};
};

gpio_keys {
Expand Down Expand Up @@ -123,6 +101,28 @@

};

&nand {
status = "okay";
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";

partition@0 {
label = "u-boot";
reg = <0x0000000 0x100000>;
};

partition@100000 {
label = "uImage";
reg = <0x0100000 0x600000>;
};

partition@700000 {
label = "root";
reg = <0x0700000 0xf900000>;
};

};

&mdio {
status = "okay";

Expand Down
Loading

0 comments on commit 7045ff5

Please sign in to comment.