diff options
| author | Jason Gunthorpe <jgunthorpe@obsidianresearch.com> | 2013-09-17 22:44:33 +0400 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2013-10-01 20:36:12 +0400 |
| commit | 7045ff5a5322fa7461d7255c15ad1896bd659440 (patch) | |
| tree | 47d92443d8b682a8b97f7cbfdb79df5a62367b8e /arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi | |
| parent | 34a300909e5e795500fcf7d3b971751fc65ed67b (diff) | |
| download | linux-7045ff5a5322fa7461d7255c15ad1896bd659440.tar.xz | |
ARM: kirkwood: Move the nand node under the mbus node
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>
Diffstat (limited to 'arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi index 5696b630b70b..1173d7fb31b2 100644 --- a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi +++ b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi @@ -48,27 +48,6 @@ pinctrl-names = "default"; status = "okay"; }; - - nand@3000000 { - pinctrl-0 = <&pmx_nand>; - pinctrl-names = "default"; - status = "okay"; - - partition@0 { - label = "u-boot"; - reg = <0x0000000 0x100000>; - }; - - partition@100000 { - label = "uImage"; - reg = <0x0100000 0x400000>; - }; - - partition@500000 { - label = "root"; - reg = <0x0500000 0x1fb00000>; - }; - }; }; regulators { @@ -92,6 +71,27 @@ }; }; +&nand { + pinctrl-0 = <&pmx_nand>; + pinctrl-names = "default"; + status = "okay"; + + partition@0 { + label = "u-boot"; + reg = <0x0000000 0x100000>; + }; + + partition@100000 { + label = "uImage"; + reg = <0x0100000 0x400000>; + }; + + partition@500000 { + label = "root"; + reg = <0x0500000 0x1fb00000>; + }; +}; + &mdio { status = "okay"; |