[U-Boot] [PATCH 09/16] ARM: zynq: Align spi and qspi node locations

[Nathan Rossi]

On Fri, Apr 8, 2016 at 3:01 AM, Michal Simek <michal.simek at xilinx.com> wrote:
> Keep nodes alphabelitally sorted.
>
> Signed-off-by: Michal Simek <michal.simek at xilinx.com>

Reviewed-by: Nathan Rossi <nathan at nathanrossi.com>

> ---
>
>  arch/arm/dts/zynq-zc702.dts       | 10 +++++-----
>  arch/arm/dts/zynq-zc706.dts       | 10 +++++-----
>  arch/arm/dts/zynq-zc770-xm010.dts | 42 +++++++++++++++++++--------------------
>  arch/arm/dts/zynq-zed.dts         |  6 +++---
>  arch/arm/dts/zynq-zybo.dts        |  6 +++---
>  5 files changed, 37 insertions(+), 37 deletions(-)
>
> diff --git a/arch/arm/dts/zynq-zc702.dts b/arch/arm/dts/zynq-zc702.dts
> index 8ad1db281de8..6585010f4bc8 100644
> --- a/arch/arm/dts/zynq-zc702.dts
> +++ b/arch/arm/dts/zynq-zc702.dts
> @@ -387,6 +387,11 @@
>         };
>  };
>
> +&qspi {
> +       u-boot,dm-pre-reloc;
> +       status = "okay";
> +};
> +
>  &sdhci0 {
>         u-boot,dm-pre-reloc;
>         status = "okay";
> @@ -401,11 +406,6 @@
>         pinctrl-0 = <&pinctrl_uart1_default>;
>  };
>
> -&qspi {
> -       u-boot,dm-pre-reloc;
> -       status = "okay";
> -};
> -
>  &usb0 {
>         status = "okay";
>         dr_mode = "host";
> diff --git a/arch/arm/dts/zynq-zc706.dts b/arch/arm/dts/zynq-zc706.dts
> index cefee253fb06..d04880a2cdd3 100644
> --- a/arch/arm/dts/zynq-zc706.dts
> +++ b/arch/arm/dts/zynq-zc706.dts
> @@ -306,6 +306,11 @@
>         };
>  };
>
> +&qspi {
> +       u-boot,dm-pre-reloc;
> +       status = "okay";
> +};
> +
>  &sdhci0 {
>         u-boot,dm-pre-reloc;
>         status = "okay";
> @@ -320,11 +325,6 @@
>         pinctrl-0 = <&pinctrl_uart1_default>;
>  };
>
> -&qspi {
> -       u-boot,dm-pre-reloc;
> -       status = "okay";
> -};
> -
>  &usb0 {
>         status = "okay";
>         dr_mode = "host";
> diff --git a/arch/arm/dts/zynq-zc770-xm010.dts b/arch/arm/dts/zynq-zc770-xm010.dts
> index 6dc7c89ddb2b..33524cb6def5 100644
> --- a/arch/arm/dts/zynq-zc770-xm010.dts
> +++ b/arch/arm/dts/zynq-zc770-xm010.dts
> @@ -36,27 +36,6 @@
>         };
>  };
>
> -&spi1 {
> -       status = "okay";
> -       num-cs = <4>;
> -       is-decoded-cs = <0>;
> -       flash at 0 {
> -               compatible = "sst25wf080";
> -               reg = <1>;
> -               spi-max-frequency = <1000000>;
> -               #address-cells = <1>;
> -               #size-cells = <1>;
> -               partition at test {
> -                       label = "spi-flash";
> -                       reg = <0x0 0x100000>;
> -               };
> -       };
> -};
> -
> -&qspi {
> -       status = "okay";
> -};
> -
>  &can0 {
>         status = "okay";
>  };
> @@ -82,10 +61,31 @@
>
>  };
>
> +&qspi {
> +       status = "okay";
> +};
> +
>  &sdhci0 {
>         status = "okay";
>  };
>
> +&spi1 {
> +       status = "okay";
> +       num-cs = <4>;
> +       is-decoded-cs = <0>;
> +       flash at 0 {
> +               compatible = "sst25wf080";
> +               reg = <1>;
> +               spi-max-frequency = <1000000>;
> +               #address-cells = <1>;
> +               #size-cells = <1>;
> +               partition at test {
> +                       label = "spi-flash";
> +                       reg = <0x0 0x100000>;
> +               };
> +       };
> +};
> +
>  &uart1 {
>         u-boot,dm-pre-reloc;
>         status = "okay";
> diff --git a/arch/arm/dts/zynq-zed.dts b/arch/arm/dts/zynq-zed.dts
> index b262d83ee672..4363a4fcaccb 100644
> --- a/arch/arm/dts/zynq-zed.dts
> +++ b/arch/arm/dts/zynq-zed.dts
> @@ -50,17 +50,17 @@
>         };
>  };
>
> -&sdhci0 {
> +&qspi {
>         u-boot,dm-pre-reloc;
>         status = "okay";
>  };
>
> -&uart1 {
> +&sdhci0 {
>         u-boot,dm-pre-reloc;
>         status = "okay";
>  };
>
> -&qspi {
> +&uart1 {
>         u-boot,dm-pre-reloc;
>         status = "okay";
>  };
> diff --git a/arch/arm/dts/zynq-zybo.dts b/arch/arm/dts/zynq-zybo.dts
> index acc6e42b46fc..f32923f5d25d 100644
> --- a/arch/arm/dts/zynq-zybo.dts
> +++ b/arch/arm/dts/zynq-zybo.dts
> @@ -51,17 +51,17 @@
>         };
>  };
>
> -&sdhci0 {
> +&qspi {
>         u-boot,dm-pre-reloc;
>         status = "okay";
>  };
>
> -&uart1 {
> +&sdhci0 {
>         u-boot,dm-pre-reloc;
>         status = "okay";
>  };
>
> -&qspi {
> +&uart1 {
>         u-boot,dm-pre-reloc;
>         status = "okay";
>  };
> --
> 1.9.1
>