[PATCH] ARM: zynq: Do not include full zynq-7000.dtsi to cse-nor configuration

[PATCH] ARM: zynq: Do not include full zynq-7000.dtsi to cse-nor configuration

[Michal Simek]

There is no real need to include full DT when only some nodes are enough to
use. It will save some space.

Retested with FSBL for initial SoC setup. SPL didn't work.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 arch/arm/dts/zynq-cse-nor.dts | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/arch/arm/dts/zynq-cse-nor.dts b/arch/arm/dts/zynq-cse-nor.dts
index 9710abadcf02..4030851eb36d 100644
--- a/arch/arm/dts/zynq-cse-nor.dts
+++ b/arch/arm/dts/zynq-cse-nor.dts
@@ -5,7 +5,6 @@
  * Copyright (C) 2018 Xilinx, Inc.
  */
 /dts-v1/;
-#include "zynq-7000.dtsi"
 
 / {
 	#address-cells = <1>;
@@ -33,27 +32,21 @@
 	};
 
 	amba: amba {
+		u-boot,dm-pre-reloc;
 		compatible = "simple-bus";
 		#address-cells = <1>;
 		#size-cells = <1>;
-		interrupt-parent = <&intc>;
 		ranges;
 
-		intc: interrupt-controller at f8f01000 {
-			compatible = "arm,cortex-a9-gic";
-			#interrupt-cells = <3>;
-			interrupt-controller;
-			reg = <0xF8F01000 0x1000>,
-			      <0xF8F00100 0x100>;
-		};
-
 		slcr: slcr at f8000000 {
+			u-boot,dm-pre-reloc;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			compatible = "xlnx,zynq-slcr", "syscon", "simple-bus";
 			reg = <0xF8000000 0x1000>;
 			ranges;
 			clkc: clkc at 100 {
+				u-boot,dm-pre-reloc;
 				#clock-cells = <1>;
 				compatible = "xlnx,ps7-clkc";
 				clock-output-names = "armpll", "ddrpll",
-- 
2.25.1

[PATCH] ARM: zynq: Do not include full zynq-7000.dtsi to cse-nor configuration

[Michal Simek]

st 26. 2. 2020 v 11:34 odes?latel Michal Simek <michal.simek@xilinx.com> napsal:
>
> There is no real need to include full DT when only some nodes are enough to
> use. It will save some space.
>
> Retested with FSBL for initial SoC setup. SPL didn't work.
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
>
>  arch/arm/dts/zynq-cse-nor.dts | 13 +++----------
>  1 file changed, 3 insertions(+), 10 deletions(-)
>
> diff --git a/arch/arm/dts/zynq-cse-nor.dts b/arch/arm/dts/zynq-cse-nor.dts
> index 9710abadcf02..4030851eb36d 100644
> --- a/arch/arm/dts/zynq-cse-nor.dts
> +++ b/arch/arm/dts/zynq-cse-nor.dts
> @@ -5,7 +5,6 @@
>   * Copyright (C) 2018 Xilinx, Inc.
>   */
>  /dts-v1/;
> -#include "zynq-7000.dtsi"
>
>  / {
>         #address-cells = <1>;
> @@ -33,27 +32,21 @@
>         };
>
>         amba: amba {
> +               u-boot,dm-pre-reloc;
>                 compatible = "simple-bus";
>                 #address-cells = <1>;
>                 #size-cells = <1>;
> -               interrupt-parent = <&intc>;
>                 ranges;
>
> -               intc: interrupt-controller at f8f01000 {
> -                       compatible = "arm,cortex-a9-gic";
> -                       #interrupt-cells = <3>;
> -                       interrupt-controller;
> -                       reg = <0xF8F01000 0x1000>,
> -                             <0xF8F00100 0x100>;
> -               };
> -
>                 slcr: slcr at f8000000 {
> +                       u-boot,dm-pre-reloc;
>                         #address-cells = <1>;
>                         #size-cells = <1>;
>                         compatible = "xlnx,zynq-slcr", "syscon", "simple-bus";
>                         reg = <0xF8000000 0x1000>;
>                         ranges;
>                         clkc: clkc at 100 {
> +                               u-boot,dm-pre-reloc;
>                                 #clock-cells = <1>;
>                                 compatible = "xlnx,ps7-clkc";
>                                 clock-output-names = "armpll", "ddrpll",
> --
> 2.25.1
>

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