lantiq: dts: move partitions into partition node

Signed-off-by: Mathias Kresin <dev@kresin.me>
This commit is contained in:
Mathias Kresin 2019-01-27 14:05:38 +01:00
parent 7685ed59c5
commit 2ec59c173f
4 changed files with 95 additions and 80 deletions

View File

@ -17,22 +17,26 @@
compatible = "lantiq,nor"; compatible = "lantiq,nor";
bank-width = <2>; bank-width = <2>;
reg = <0x0 0x4000000>; reg = <0x0 0x4000000>;
#address-cells = <1>;
#size-cells = <1>;
partition@0 { partitions {
label = "uboot"; compatible = "fixed-partitions";
reg = <0x00000 0x40000>; #address-cells = <1>;
}; #size-cells = <1>;
partition@10000 { partition@0 {
label = "uboot_env"; label = "uboot";
reg = <0x40000 0x40000>; reg = <0x00000 0x40000>;
}; };
partition@20000 { partition@10000 {
label = "linux"; label = "uboot_env";
reg = <0x80000 0x3d0000>; reg = <0x40000 0x40000>;
};
partition@20000 {
label = "linux";
reg = <0x80000 0x3d0000>;
};
}; };
}; };
}; };

View File

@ -261,28 +261,32 @@
pinctrl-0 = <&pins_spi_default>; pinctrl-0 = <&pins_spi_default>;
m25p80@4 { m25p80@4 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "jedec,spi-nor"; compatible = "jedec,spi-nor";
reg = <4>; reg = <4>;
spi-max-frequency = <1000000>; spi-max-frequency = <1000000>;
urlader: partition@0 { partitions {
reg = <0x0 0x20000>; compatible = "fixed-partitions";
label = "urlader"; #address-cells = <1>;
read-only; #size-cells = <1>;
};
partition@20000 { urlader: partition@0 {
reg = <0x20000 0x10000>; reg = <0x0 0x20000>;
label = "tffs (1)"; label = "urlader";
read-only; read-only;
}; };
partition@30000 { partition@20000 {
reg = <0x30000 0x10000>; reg = <0x20000 0x10000>;
label = "tffs (2)"; label = "tffs (1)";
read-only; read-only;
};
partition@30000 {
reg = <0x30000 0x10000>;
label = "tffs (2)";
read-only;
};
}; };
}; };
}; };

View File

@ -264,49 +264,52 @@
pinctrl-0 = <&pins_spi_default>; pinctrl-0 = <&pins_spi_default>;
m25p80@4 { m25p80@4 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "jedec,spi-nor"; compatible = "jedec,spi-nor";
reg = <4>; reg = <4>;
spi-max-frequency = <20000000>; spi-max-frequency = <20000000>;
partition@0 { partitions {
reg = <0x0 0x10000>; #address-cells = <1>;
label = "u-boot"; #size-cells = <1>;
read-only;
};
partition@10000 { partition@0 {
reg = <0x10000 0x10000>; reg = <0x0 0x10000>;
label = "gphyfirmware"; label = "u-boot";
read-only; read-only;
}; };
partition@20000 { partition@10000 {
reg = <0x20000 0x80000>; reg = <0x10000 0x10000>;
label = "dsl_fw"; label = "gphyfirmware";
}; read-only;
};
partition@de0000 { partition@20000 {
reg = <0xa0000 0xf40000>; reg = <0x20000 0x80000>;
label = "firmware"; label = "dsl_fw";
}; };
partition@fe0000 { partition@de0000 {
reg = <0xfe0000 0x10000>; reg = <0xa0000 0xf40000>;
label = "sysconfig"; label = "firmware";
read-only; };
};
partition@ff0000 { partition@fe0000 {
reg = <0xff0000 0x2000>; reg = <0xfe0000 0x10000>;
label = "ubootconfig"; label = "sysconfig";
}; read-only;
};
partition@ff3000 { partition@ff0000 {
reg = <0xff3000 0x2000>; reg = <0xff0000 0x2000>;
label = "board_config"; label = "ubootconfig";
read-only; };
partition@ff3000 {
reg = <0xff3000 0x2000>;
label = "board_config";
read-only;
};
}; };
}; };
}; };

View File

@ -5,33 +5,37 @@
compatible = "lantiq,sflash-falcon", "simple-bus"; compatible = "lantiq,sflash-falcon", "simple-bus";
flash@0 { flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spansion,s25fl129p0", "spansion,s25fl129p1"; compatible = "spansion,s25fl129p0", "spansion,s25fl129p1";
reg = <0 0>; reg = <0 0>;
linux,mtd-name = "sflash"; linux,mtd-name = "sflash";
spi-max-frequency = <80000000>; spi-max-frequency = <80000000>;
m25p,fast-read; m25p,fast-read;
partition@0 { partitions {
reg = <0x0 0x40000>; compatible = "fixed-partitions";
label = "uboot"; #address-cells = <1>;
read-only; #size-cells = <1>;
};
partition@40000 { partition@0 {
reg = <0x40000 0x80000>; reg = <0x0 0x40000>;
label = "uboot_env"; label = "uboot";
}; read-only;
};
partition@C0000 { partition@40000 {
reg = <0xC0000 0x740000>; reg = <0x40000 0x80000>;
label = "image0"; label = "uboot_env";
}; };
partition@800000 { partition@C0000 {
reg = <0x800000 0x800000>; reg = <0xC0000 0x740000>;
label = "image1"; label = "image0";
};
partition@800000 {
reg = <0x800000 0x800000>;
label = "image1";
};
}; };
}; };
}; };