[PATCH] ARM: zynq: Fix addresses in partition definitions

[Michal Simek]

st 19. 2. 2020 v 11:28 odesílatel Michal Simek <michal.simek at xilinx.com> napsal:
>
> Node name should be <name>@<address> which is not how partitions are
> described.
>
> Signed-off-by: Michal Simek <michal.simek at xilinx.com>
> ---
>
>  arch/arm/dts/zynq-cse-qspi.dtsi   | 10 +++++-----
>  arch/arm/dts/zynq-topic-miami.dts | 10 +++++-----
>  2 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/arch/arm/dts/zynq-cse-qspi.dtsi b/arch/arm/dts/zynq-cse-qspi.dtsi
> index 65af4081ff4f..eb0e29e6cb6e 100644
> --- a/arch/arm/dts/zynq-cse-qspi.dtsi
> +++ b/arch/arm/dts/zynq-cse-qspi.dtsi
> @@ -67,23 +67,23 @@
>                                 spi-max-frequency = <50000000>;
>                                 #address-cells = <1>;
>                                 #size-cells = <1>;
> -                               partition at qspi-fsbl-uboot {
> +                               partition at 0 {
>                                         label = "qspi-fsbl-uboot";
>                                         reg = <0x0 0x100000>;
>                                 };
> -                               partition at qspi-linux {
> +                               partition at 100000 {
>                                         label = "qspi-linux";
>                                         reg = <0x100000 0x500000>;
>                                 };
> -                               partition at qspi-device-tree {
> +                               partition at 600000 {
>                                         label = "qspi-device-tree";
>                                         reg = <0x600000 0x20000>;
>                                 };
> -                               partition at qspi-rootfs {
> +                               partition at 620000 {
>                                         label = "qspi-rootfs";
>                                         reg = <0x620000 0x5E0000>;
>                                 };
> -                               partition at qspi-bitstream {
> +                               partition at c00000 {
>                                         label = "qspi-bitstream";
>                                         reg = <0xC00000 0x400000>;
>                                 };
> diff --git a/arch/arm/dts/zynq-topic-miami.dts b/arch/arm/dts/zynq-topic-miami.dts
> index f6f10fe1a15d..ab6bde95fed9 100644
> --- a/arch/arm/dts/zynq-topic-miami.dts
> +++ b/arch/arm/dts/zynq-topic-miami.dts
> @@ -44,23 +44,23 @@
>                 spi-max-frequency = <100000000>;
>                 #address-cells = <1>;
>                 #size-cells = <1>;
> -               partition at qspi-u-boot-spl {
> +               partition at 0 {
>                         label = "qspi-u-boot-spl";
>                         reg = <0x00000 0x10000>;
>                 };
> -               partition at qspi-u-boot-img {
> +               partition at 10000 {
>                         label = "qspi-u-boot-img";
>                         reg = <0x10000 0x60000>;
>                 };
> -               partition at qspi-device-tree {
> +               partition at 70000 {
>                         label = "qspi-device-tree";
>                         reg = <0x70000 0x10000>;
>                 };
> -               partition at qspi-linux {
> +               partition at 80000 {
>                         label = "qspi-linux";
>                         reg = <0x80000 0x400000>;
>                 };
> -               partition at qspi-rootfs {
> +               partition at 480000 {
>                         label = "qspi-rootfs";
>                         reg = <0x480000 0x1b80000>;
>                 };
> --
> 2.25.0
>

Applied.
M

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs