On Sat, Nov 28, 2015 at 12:14:06PM +0100, Sebastian Hesselbarth wrote:
> NAND flash partitions should be part of a partitions sub-node
> not the flash node itself. Move the partitions which will also
> allow different bootloaders get rid of the stock partitions
> easily by removing the partitions node.
>
> Signed-off-by: Sebastian Hesselbarth <[email protected]>
Humm, did not know that. Quoting
Documentation/devicetree/bindings/mtd/partition.txt:
The partition table should be a subnode of the mtd node and
should be named 'partitions'. Partitions are defined in subnodes
of the partitions node.
For backwards compatibility partitions as direct subnodes of the
mtd device are supported. This use is discouraged.
It also looks like none of the other MVEBU maintainers know that
either, since a quick look at the .dts files shows very few have a
partitions node.
Acked-by: Andrew Lunn <[email protected]>
Thanks
Andrew
> ---
> Cc: Jason Cooper <[email protected]>
> Cc: Andrew Lunn <[email protected]>
> Cc: Gregory Clement <[email protected]>
> Cc: Rob Herring <[email protected]>
> Cc: Pawel Moll <[email protected]>
> Cc: Mark Rutland <[email protected]>
> Cc: Ian Campbell <[email protected]>
> Cc: Kumar Gala <[email protected]>
> Cc: Russell King <[email protected]>
> Cc: Benoit Masson <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> ---
> arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 67
> +++++++++++++------------
> 1 file changed, 36 insertions(+), 31 deletions(-)
>
> diff --git a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
> b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
> index 30a0a6eac645..76781fd18624 100644
> --- a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
> +++ b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
> @@ -151,37 +151,42 @@
> marvell,nand-enable-arbiter;
> nand-on-flash-bbt;
>
> - partition@0 {
> - label = "u-boot";
> - reg = <0x0000000 0xe0000>;
> - read-only;
> - };
> -
> - partition@e0000 {
> - label = "u-boot-env";
> - reg = <0xe0000 0x20000>;
> - read-only;
> - };
> -
> - partition@100000 {
> - label = "u-boot-env2";
> - reg = <0x100000 0x20000>;
> - read-only;
> - };
> -
> - partition@120000 {
> - label = "zImage";
> - reg = <0x120000 0x400000>;
> - };
> -
> - partition@520000 {
> - label = "initrd";
> - reg = <0x520000 0x400000>;
> - };
> -
> - partition@xE00000 {
> - label = "boot";
> - reg = <0xE00000 0x3F200000>;
> + partitions {
> + #address-cells = <1>;
> + #size-cells = <1>;
> +
> + partition@0 {
> + label = "u-boot";
> + reg = <0x0000000 0xe0000>;
> + read-only;
> + };
> +
> + partition@e0000 {
> + label = "u-boot-env";
> + reg = <0xe0000 0x20000>;
> + read-only;
> + };
> +
> + partition@100000 {
> + label = "u-boot-env2";
> + reg = <0x100000 0x20000>;
> + read-only;
> + };
> +
> + partition@120000 {
> + label = "zImage";
> + reg = <0x120000 0x400000>;
> + };
> +
> + partition@520000 {
> + label = "initrd";
> + reg = <0x520000 0x400000>;
> + };
> +
> + partition@xE00000 {
> + label = "boot";
> + reg = <0xE00000 0x3F200000>;
> + };
> };
> };
> };
> --
> 2.1.4
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
