[PATCH] xilinx: Remove simple-bus description from mini configurations

Michal Simek michal.simek at amd.com
Fri Jun 27 11:20:40 CEST 2025


simple bus node and drivers not bringing up any value for mini
configuration that's why remove it and disable drivers for it to save some
space.

Signed-off-by: Michal Simek <michal.simek at amd.com>
---

 arch/arm/dts/versal-mini-emmc0.dts            | 36 +++++-------
 arch/arm/dts/versal-mini-emmc1.dts            | 36 +++++-------
 arch/arm/dts/versal-mini-ospi.dtsi            | 52 ++++++++---------
 arch/arm/dts/versal-mini-qspi.dtsi            | 40 ++++++-------
 arch/arm/dts/versal-net-mini-emmc.dts         | 36 +++++-------
 arch/arm/dts/versal-net-mini-ospi.dtsi        | 56 ++++++++-----------
 arch/arm/dts/versal-net-mini-qspi.dtsi        | 42 ++++++--------
 arch/arm/dts/versal-net-mini.dts              | 26 +++------
 arch/arm/dts/zynqmp-mini-emmc0.dts            | 31 ++++------
 arch/arm/dts/zynqmp-mini-emmc1.dts            | 31 ++++------
 arch/arm/dts/zynqmp-mini-nand.dts             | 35 +++++-------
 arch/arm/dts/zynqmp-mini-qspi.dts             | 25 +++------
 configs/amd_versal2_mini_defconfig            |  1 +
 configs/amd_versal2_mini_emmc_defconfig       |  1 +
 configs/amd_versal2_mini_ospi_defconfig       |  1 +
 configs/amd_versal2_mini_qspi_defconfig       |  1 +
 configs/xilinx_versal_mini_defconfig          |  1 +
 configs/xilinx_versal_mini_emmc0_defconfig    |  1 +
 configs/xilinx_versal_mini_emmc1_defconfig    |  1 +
 configs/xilinx_versal_mini_ospi_defconfig     |  1 +
 configs/xilinx_versal_mini_qspi_defconfig     |  1 +
 configs/xilinx_versal_net_mini_defconfig      |  1 +
 configs/xilinx_versal_net_mini_emmc_defconfig |  1 +
 configs/xilinx_versal_net_mini_ospi_defconfig |  1 +
 configs/xilinx_versal_net_mini_qspi_defconfig |  1 +
 configs/xilinx_zynqmp_mini_defconfig          |  1 +
 configs/xilinx_zynqmp_mini_emmc0_defconfig    |  1 +
 configs/xilinx_zynqmp_mini_emmc1_defconfig    |  1 +
 configs/xilinx_zynqmp_mini_nand_defconfig     |  1 +
 .../xilinx_zynqmp_mini_nand_single_defconfig  |  1 +
 configs/xilinx_zynqmp_mini_qspi_defconfig     |  1 +
 31 files changed, 196 insertions(+), 269 deletions(-)

diff --git a/arch/arm/dts/versal-mini-emmc0.dts b/arch/arm/dts/versal-mini-emmc0.dts
index 179060c56eee..9044ef1889bb 100644
--- a/arch/arm/dts/versal-mini-emmc0.dts
+++ b/arch/arm/dts/versal-mini-emmc0.dts
@@ -28,28 +28,20 @@
 		bootph-all;
 	};
 
-	amba: axi {
-		bootph-all;
-		compatible = "simple-bus";
-		#address-cells = <0x2>;
-		#size-cells = <0x2>;
-		ranges;
-
-		sdhci0: sdhci at f1040000 {
-			compatible = "xlnx,versal-8.9a", "arasan,sdhci-8.9a";
-			status = "okay";
-			non-removable;
-			disable-wp;
-			no-sd;
-			no-sdio;
-			cap-mmc-hw-reset;
-			bus-width = <8>;
-			reg = <0x0 0xf1040000 0x0 0x10000>;
-			clock-names = "clk_xin", "clk_ahb";
-			clocks = <&clk200 &clk200>;
-			no-1-8-v;
-			xlnx,mio-bank = <0>;
-		};
+	sdhci0: sdhci at f1040000 {
+		compatible = "xlnx,versal-8.9a", "arasan,sdhci-8.9a";
+		status = "okay";
+		non-removable;
+		disable-wp;
+		no-sd;
+		no-sdio;
+		cap-mmc-hw-reset;
+		bus-width = <8>;
+		reg = <0x0 0xf1040000 0x0 0x10000>;
+		clock-names = "clk_xin", "clk_ahb";
+		clocks = <&clk200 &clk200>;
+		no-1-8-v;
+		xlnx,mio-bank = <0>;
 	};
 
 	aliases {
diff --git a/arch/arm/dts/versal-mini-emmc1.dts b/arch/arm/dts/versal-mini-emmc1.dts
index ffcc33345296..47f3b74c0655 100644
--- a/arch/arm/dts/versal-mini-emmc1.dts
+++ b/arch/arm/dts/versal-mini-emmc1.dts
@@ -28,28 +28,20 @@
 		bootph-all;
 	};
 
-	amba: axi {
-		bootph-all;
-		compatible = "simple-bus";
-		#address-cells = <0x2>;
-		#size-cells = <0x2>;
-		ranges;
-
-		sdhci1: sdhci at f1050000 {
-			compatible = "xlnx,versal-8.9a", "arasan,sdhci-8.9a";
-			status = "okay";
-			non-removable;
-			disable-wp;
-			no-sd;
-			no-sdio;
-			cap-mmc-hw-reset;
-			bus-width = <8>;
-			reg = <0x0 0xf1050000 0x0 0x10000>;
-			clock-names = "clk_xin", "clk_ahb";
-			clocks = <&clk200 &clk200>;
-			no-1-8-v;
-			xlnx,mio-bank = <0>;
-		};
+	sdhci1: sdhci at f1050000 {
+		compatible = "xlnx,versal-8.9a", "arasan,sdhci-8.9a";
+		status = "okay";
+		non-removable;
+		disable-wp;
+		no-sd;
+		no-sdio;
+		cap-mmc-hw-reset;
+		bus-width = <8>;
+		reg = <0x0 0xf1050000 0x0 0x10000>;
+		clock-names = "clk_xin", "clk_ahb";
+		clocks = <&clk200 &clk200>;
+		no-1-8-v;
+		xlnx,mio-bank = <0>;
 	};
 
 	aliases {
diff --git a/arch/arm/dts/versal-mini-ospi.dtsi b/arch/arm/dts/versal-mini-ospi.dtsi
index 9ca0cf3c027f..eec2a08e7c70 100644
--- a/arch/arm/dts/versal-mini-ospi.dtsi
+++ b/arch/arm/dts/versal-mini-ospi.dtsi
@@ -28,37 +28,29 @@
 		bootph-all;
 	};
 
-	amba: axi {
-		bootph-all;
-		compatible = "simple-bus";
-		#address-cells = <0x2>;
-		#size-cells = <0x2>;
-		ranges;
-
-		ospi: spi at f1010000 {
-			compatible = "cdns,qspi-nor";
-			status = "okay";
-			reg = <0 0xf1010000 0 0x10000 0 0xc0000000 0 0x20000000>;
-			clock-names = "ref_clk", "pclk";
-			clocks = <&clk125 &clk125>;
-			bus-num = <2>;
-			num-cs = <1>;
-			cdns,fifo-depth = <256>;
-			cdns,fifo-width = <4>;
-			cdns,is-dma = <1>;
-			cdns,trigger-address = <0xc0000000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
+	ospi: spi at f1010000 {
+		compatible = "cdns,qspi-nor";
+		status = "okay";
+		reg = <0 0xf1010000 0 0x10000 0 0xc0000000 0 0x20000000>;
+		clock-names = "ref_clk", "pclk";
+		clocks = <&clk125 &clk125>;
+		bus-num = <2>;
+		num-cs = <1>;
+		cdns,fifo-depth = <256>;
+		cdns,fifo-width = <4>;
+		cdns,is-dma = <1>;
+		cdns,trigger-address = <0xc0000000>;
+		#address-cells = <1>;
+		#size-cells = <0>;
 
-			flash0: flash at 0 {
-				compatible = "n25q512a", "micron,m25p80",
-					     "jedec,spi-nor";
-				reg = <0x0>;
-				spi-tx-bus-width = <8>;
-				spi-rx-bus-width = <8>;
-				spi-max-frequency = <20000000>;
-				no-wp;
-			};
+		flash0: flash at 0 {
+			compatible = "n25q512a", "micron,m25p80",
+				     "jedec,spi-nor";
+			reg = <0x0>;
+			spi-tx-bus-width = <8>;
+			spi-rx-bus-width = <8>;
+			spi-max-frequency = <20000000>;
+			no-wp;
 		};
 	};
 
diff --git a/arch/arm/dts/versal-mini-qspi.dtsi b/arch/arm/dts/versal-mini-qspi.dtsi
index 57427e099f9e..ec4eef74020b 100644
--- a/arch/arm/dts/versal-mini-qspi.dtsi
+++ b/arch/arm/dts/versal-mini-qspi.dtsi
@@ -28,31 +28,23 @@
 		bootph-all;
 	};
 
-	amba: axi {
-		bootph-all;
-		compatible = "simple-bus";
-		#address-cells = <0x2>;
-		#size-cells = <0x2>;
-		ranges;
-
-		qspi: spi at f1030000 {
-			compatible = "xlnx,versal-qspi-1.0";
-			status = "okay";
-			clock-names = "ref_clk", "pclk";
-			num-cs = <0x1>;
-			reg = <0x0 0xf1030000 0x0 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			clocks = <&clk150 &clk150>;
+	qspi: spi at f1030000 {
+		compatible = "xlnx,versal-qspi-1.0";
+		status = "okay";
+		clock-names = "ref_clk", "pclk";
+		num-cs = <0x1>;
+		reg = <0x0 0xf1030000 0x0 0x1000>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		clocks = <&clk150 &clk150>;
 
-			flash0: flash at 0 {
-				compatible = "n25q512a", "micron,m25p80",
-					     "jedec,spi-nor";
-				reg = <0x0>;
-				spi-tx-bus-width = <4>;
-				spi-rx-bus-width = <4>;
-				spi-max-frequency = <20000000>;
-			};
+		flash0: flash at 0 {
+			compatible = "n25q512a", "micron,m25p80",
+				     "jedec,spi-nor";
+			reg = <0x0>;
+			spi-tx-bus-width = <4>;
+			spi-rx-bus-width = <4>;
+			spi-max-frequency = <20000000>;
 		};
 	};
 
diff --git a/arch/arm/dts/versal-net-mini-emmc.dts b/arch/arm/dts/versal-net-mini-emmc.dts
index 20e4e2994048..567ceeb36a0b 100644
--- a/arch/arm/dts/versal-net-mini-emmc.dts
+++ b/arch/arm/dts/versal-net-mini-emmc.dts
@@ -2,7 +2,7 @@
 /*
  * dts file for Xilinx Versal NET Mini eMMC Configuration
  *
- * (C) Copyright 2023, Advanced Micro Devices, Inc.
+ * (C) Copyright 2023-2025, Advanced Micro Devices, Inc.
  *
  * Michal Simek <michal.simek at amd.com>
  * Ashok Reddy Soma <ashok.reddy.soma at amd.com>
@@ -42,26 +42,18 @@
 		bootph-all;
 	};
 
-	amba: axi {
-		bootph-all;
-		compatible = "simple-bus";
-		#address-cells = <2>;
-		#size-cells = <2>;
-		ranges;
-
-		sdhci1: mmc at f1050000 {
-			compatible = "xlnx,versal-net-emmc";
-			status = "okay";
-			non-removable;
-			disable-wp;
-			no-sd;
-			no-sdio;
-			cap-mmc-hw-reset;
-			bus-width = <8>;
-			reg = <0 0xf1050000 0 0x10000>;
-			clock-names = "clk_xin", "clk_ahb";
-			clocks = <&clk200>, <&clk200>;
-			xlnx,mio-bank = <0>;
-		};
+	sdhci1: mmc at f1050000 {
+		compatible = "xlnx,versal-net-emmc";
+		status = "okay";
+		non-removable;
+		disable-wp;
+		no-sd;
+		no-sdio;
+		cap-mmc-hw-reset;
+		bus-width = <8>;
+		reg = <0 0xf1050000 0 0x10000>;
+		clock-names = "clk_xin", "clk_ahb";
+		clocks = <&clk200>, <&clk200>;
+		xlnx,mio-bank = <0>;
 	};
 };
diff --git a/arch/arm/dts/versal-net-mini-ospi.dtsi b/arch/arm/dts/versal-net-mini-ospi.dtsi
index a9bf7cc42484..1c94b352dc97 100644
--- a/arch/arm/dts/versal-net-mini-ospi.dtsi
+++ b/arch/arm/dts/versal-net-mini-ospi.dtsi
@@ -2,7 +2,7 @@
 /*
  * dts file for Xilinx Versal NET Mini OSPI Configuration
  *
- * (C) Copyright 2023, Advanced Micro Devices, Inc.
+ * (C) Copyright 2023-2025, Advanced Micro Devices, Inc.
  *
  * Michal Simek <michal.simek at amd.com>
  * Ashok Reddy Soma <ashok.reddy.soma at amd.com>
@@ -42,38 +42,30 @@
 		bootph-all;
 	};
 
-	amba: axi {
-		bootph-all;
-		compatible = "simple-bus";
-		#address-cells = <0x2>;
-		#size-cells = <0x2>;
-		ranges;
-
-		ospi: spi at f1010000 {
-			compatible = "cdns,qspi-nor";
-			status = "okay";
-			reg = <0 0xf1010000 0 0x10000>, <0 0xc0000000 0 0x20000000>;
-			clock-names = "ref_clk", "pclk";
-			clocks = <&clk125>, <&clk125>;
-			bus-num = <2>;
-			num-cs = <1>;
-			cdns,fifo-depth = <256>;
-			cdns,fifo-width = <4>;
-			cdns,is-dma = <1>;
-			cdns,is-stig-pgm = <1>;
-			cdns,trigger-address = <0xc0000000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
+	ospi: spi at f1010000 {
+		compatible = "cdns,qspi-nor";
+		status = "okay";
+		reg = <0 0xf1010000 0 0x10000>, <0 0xc0000000 0 0x20000000>;
+		clock-names = "ref_clk", "pclk";
+		clocks = <&clk125>, <&clk125>;
+		bus-num = <2>;
+		num-cs = <1>;
+		cdns,fifo-depth = <256>;
+		cdns,fifo-width = <4>;
+		cdns,is-dma = <1>;
+		cdns,is-stig-pgm = <1>;
+		cdns,trigger-address = <0xc0000000>;
+		#address-cells = <1>;
+		#size-cells = <0>;
 
-			flash0: flash at 0 {
-				compatible = "mt35xu02g", "micron,m25p80",
-					     "jedec,spi-nor";
-				reg = <0>;
-				spi-tx-bus-width = <8>;
-				spi-rx-bus-width = <8>;
-				spi-max-frequency = <20000000>;
-				no-wp;
-			};
+		flash0: flash at 0 {
+			compatible = "mt35xu02g", "micron,m25p80",
+				     "jedec,spi-nor";
+			reg = <0>;
+			spi-tx-bus-width = <8>;
+			spi-rx-bus-width = <8>;
+			spi-max-frequency = <20000000>;
+			no-wp;
 		};
 	};
 };
diff --git a/arch/arm/dts/versal-net-mini-qspi.dtsi b/arch/arm/dts/versal-net-mini-qspi.dtsi
index e29a3f36d6e4..97cc39c73e0d 100644
--- a/arch/arm/dts/versal-net-mini-qspi.dtsi
+++ b/arch/arm/dts/versal-net-mini-qspi.dtsi
@@ -2,7 +2,7 @@
 /*
  * dts file for Xilinx Versal NET Mini QSPI Configuration
  *
- * (C) Copyright 2023, Advanced Micro Devices, Inc.
+ * (C) Copyright 2023-2025, Advanced Micro Devices, Inc.
  *
  * Michal Simek <michal.simek at amd.com>
  * Ashok Reddy Soma <ashok.reddy.soma at amd.com>
@@ -42,31 +42,23 @@
 		bootph-all;
 	};
 
-	amba: axi {
-		bootph-all;
-		compatible = "simple-bus";
-		#address-cells = <2>;
-		#size-cells = <2>;
-		ranges;
-
-		qspi: spi at f1030000 {
-			compatible = "xlnx,versal-qspi-1.0";
-			status = "okay";
-			clock-names = "ref_clk", "pclk";
-			num-cs = <1>;
-			reg = <0 0xf1030000 0 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			clocks = <&clk150>, <&clk150>;
+	qspi: spi at f1030000 {
+		compatible = "xlnx,versal-qspi-1.0";
+		status = "okay";
+		clock-names = "ref_clk", "pclk";
+		num-cs = <1>;
+		reg = <0 0xf1030000 0 0x1000>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		clocks = <&clk150>, <&clk150>;
 
-			flash0: flash at 0 {
-				compatible = "n25q512a", "micron,m25p80",
-					     "jedec,spi-nor";
-				reg = <0>;
-				spi-tx-bus-width = <4>;
-				spi-rx-bus-width = <4>;
-				spi-max-frequency = <20000000>;
-			};
+		flash0: flash at 0 {
+			compatible = "n25q512a", "micron,m25p80",
+				     "jedec,spi-nor";
+			reg = <0>;
+			spi-tx-bus-width = <4>;
+			spi-rx-bus-width = <4>;
+			spi-max-frequency = <20000000>;
 		};
 	};
 };
diff --git a/arch/arm/dts/versal-net-mini.dts b/arch/arm/dts/versal-net-mini.dts
index f98f95a5c2fc..0f0a82e3aa3f 100644
--- a/arch/arm/dts/versal-net-mini.dts
+++ b/arch/arm/dts/versal-net-mini.dts
@@ -3,7 +3,7 @@
  * dts file for Xilinx Versal NET
  *
  * Copyright (C) 2021 - 2022, Xilinx, Inc.
- * Copyright (C) 2022, Advanced Micro Devices, Inc.
+ * Copyright (C) 2022-2025, Advanced Micro Devices, Inc.
  *
  * Michal Simek <michal.simek at amd.com>
  */
@@ -45,22 +45,14 @@
 		bootph-all;
 	};
 
-	amba: axi {
-		compatible = "simple-bus";
+	serial0: serial at f1920000 {
 		bootph-all;
-		#address-cells = <2>;
-		#size-cells = <2>;
-		ranges;
-
-		serial0: serial at f1920000 {
-			bootph-all;
-			compatible = "arm,pl011", "arm,primecell";
-			reg = <0 0xf1920000 0 0x1000>;
-			reg-io-width = <4>;
-			clock-names = "uartclk", "apb_pclk";
-			clocks = <&clk1>, <&clk1>;
-			clock = <1000000>;
-			skip-init;
-		};
+		compatible = "arm,pl011", "arm,primecell";
+		reg = <0 0xf1920000 0 0x1000>;
+		reg-io-width = <4>;
+		clock-names = "uartclk", "apb_pclk";
+		clocks = <&clk1>, <&clk1>;
+		clock = <1000000>;
+		skip-init;
 	};
 };
diff --git a/arch/arm/dts/zynqmp-mini-emmc0.dts b/arch/arm/dts/zynqmp-mini-emmc0.dts
index ad4b3c5f8b1d..05f61d6bb359 100644
--- a/arch/arm/dts/zynqmp-mini-emmc0.dts
+++ b/arch/arm/dts/zynqmp-mini-emmc0.dts
@@ -41,25 +41,18 @@
 		clock-frequency = <200000000>;
 	};
 
-	amba: axi {
-		compatible = "simple-bus";
-		#address-cells = <2>;
-		#size-cells = <2>;
-		ranges;
-
-		sdhci0: mmc at ff160000 {
-			bootph-all;
-			compatible = "xlnx,zynqmp-8.9a", "arasan,sdhci-8.9a";
-			status = "disabled";
-			non-removable;
-			no-sd;
-			no-sdio;
-			cap-mmc-hw-reset;
-			bus-width = <8>;
-			reg = <0x0 0xff160000 0x0 0x1000>;
-			clock-names = "clk_xin", "clk_ahb";
-			clocks = <&clk_xin &clk_xin>;
-		};
+	sdhci0: mmc at ff160000 {
+		bootph-all;
+		compatible = "xlnx,zynqmp-8.9a", "arasan,sdhci-8.9a";
+		status = "disabled";
+		non-removable;
+		no-sd;
+		no-sdio;
+		cap-mmc-hw-reset;
+		bus-width = <8>;
+		reg = <0x0 0xff160000 0x0 0x1000>;
+		clock-names = "clk_xin", "clk_ahb";
+		clocks = <&clk_xin &clk_xin>;
 	};
 };
 
diff --git a/arch/arm/dts/zynqmp-mini-emmc1.dts b/arch/arm/dts/zynqmp-mini-emmc1.dts
index fd421b4fe7ed..7857106260e1 100644
--- a/arch/arm/dts/zynqmp-mini-emmc1.dts
+++ b/arch/arm/dts/zynqmp-mini-emmc1.dts
@@ -41,25 +41,18 @@
 		clock-frequency = <200000000>;
 	};
 
-	amba: axi {
-		compatible = "simple-bus";
-		#address-cells = <2>;
-		#size-cells = <2>;
-		ranges;
-
-		sdhci1: mmc at ff170000 {
-			bootph-all;
-			compatible = "xlnx,zynqmp-8.9a", "arasan,sdhci-8.9a";
-			status = "disabled";
-			non-removable;
-			no-sd;
-			no-sdio;
-			cap-mmc-hw-reset;
-			bus-width = <8>;
-			reg = <0x0 0xff170000 0x0 0x1000>;
-			clock-names = "clk_xin", "clk_ahb";
-			clocks = <&clk_xin &clk_xin>;
-		};
+	sdhci1: mmc at ff170000 {
+		bootph-all;
+		compatible = "xlnx,zynqmp-8.9a", "arasan,sdhci-8.9a";
+		status = "disabled";
+		non-removable;
+		no-sd;
+		no-sdio;
+		cap-mmc-hw-reset;
+		bus-width = <8>;
+		reg = <0x0 0xff170000 0x0 0x1000>;
+		clock-names = "clk_xin", "clk_ahb";
+		clocks = <&clk_xin &clk_xin>;
 	};
 };
 
diff --git a/arch/arm/dts/zynqmp-mini-nand.dts b/arch/arm/dts/zynqmp-mini-nand.dts
index 5e2135158cd5..1ece39997912 100644
--- a/arch/arm/dts/zynqmp-mini-nand.dts
+++ b/arch/arm/dts/zynqmp-mini-nand.dts
@@ -35,27 +35,20 @@
 		bootph-all;
 	};
 
-	amba: axi {
-		compatible = "simple-bus";
-		#address-cells = <2>;
-		#size-cells = <1>;
-		ranges;
-
-		nand0: nand at ff100000 {
-			compatible = "arasan,nfc-v3p10";
-			status = "okay";
-			reg = <0x0 0xff100000 0x1000>;
-			clock-names = "clk_sys", "clk_flash";
-			#address-cells = <1>;
-			#size-cells = <0>;
-			arasan,has-mdma;
-			num-cs = <2>;
-			nand at 0 {
-				reg = <0>;
-				#address-cells = <2>;
-				#size-cells = <1>;
-				nand-ecc-mode = "hw";
-			};
+	nand0: nand at ff100000 {
+		compatible = "arasan,nfc-v3p10";
+		status = "okay";
+		reg = <0x0 0xff100000 0x1000>;
+		clock-names = "clk_sys", "clk_flash";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		arasan,has-mdma;
+		num-cs = <2>;
+		nand at 0 {
+			reg = <0>;
+			#address-cells = <2>;
+			#size-cells = <1>;
+			nand-ecc-mode = "hw";
 		};
 	};
 };
diff --git a/arch/arm/dts/zynqmp-mini-qspi.dts b/arch/arm/dts/zynqmp-mini-qspi.dts
index 917603dec61d..ddcc39b4e942 100644
--- a/arch/arm/dts/zynqmp-mini-qspi.dts
+++ b/arch/arm/dts/zynqmp-mini-qspi.dts
@@ -42,22 +42,15 @@
 		clock-frequency = <125000000>;
 	};
 
-	amba: axi {
-		compatible = "simple-bus";
-		#address-cells = <2>;
-		#size-cells = <1>;
-		ranges;
-
-		qspi: spi at ff0f0000 {
-			compatible = "xlnx,zynqmp-qspi-1.0";
-			status = "disabled";
-			clock-names = "ref_clk", "pclk";
-			clocks = <&misc_clk &misc_clk>;
-			num-cs = <1>;
-			reg = <0x0 0xff0f0000 0x1000 0x0 0xc0000000 0x8000000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-		};
+	qspi: spi at ff0f0000 {
+		compatible = "xlnx,zynqmp-qspi-1.0";
+		status = "disabled";
+		clock-names = "ref_clk", "pclk";
+		clocks = <&misc_clk &misc_clk>;
+		num-cs = <1>;
+		reg = <0x0 0xff0f0000 0x1000 0x0 0xc0000000 0x8000000>;
+		#address-cells = <1>;
+		#size-cells = <0>;
 	};
 };
 
diff --git a/configs/amd_versal2_mini_defconfig b/configs/amd_versal2_mini_defconfig
index d224583f56ae..155b554d6c21 100644
--- a/configs/amd_versal2_mini_defconfig
+++ b/configs/amd_versal2_mini_defconfig
@@ -63,6 +63,7 @@ CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
+# CONFIG_SIMPLE_BUS is not set
 # CONFIG_GPIO is not set
 # CONFIG_I2C is not set
 # CONFIG_INPUT is not set
diff --git a/configs/amd_versal2_mini_emmc_defconfig b/configs/amd_versal2_mini_emmc_defconfig
index 3afc6cb2736b..90907dfb72cf 100644
--- a/configs/amd_versal2_mini_emmc_defconfig
+++ b/configs/amd_versal2_mini_emmc_defconfig
@@ -54,6 +54,7 @@ CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
+# CONFIG_SIMPLE_BUS is not set
 CONFIG_MMC_HS200_SUPPORT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
diff --git a/configs/amd_versal2_mini_ospi_defconfig b/configs/amd_versal2_mini_ospi_defconfig
index 54328e85784a..3b4c6205da4b 100644
--- a/configs/amd_versal2_mini_ospi_defconfig
+++ b/configs/amd_versal2_mini_ospi_defconfig
@@ -57,6 +57,7 @@ CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
+# CONFIG_SIMPLE_BUS is not set
 # CONFIG_GPIO is not set
 # CONFIG_I2C is not set
 # CONFIG_INPUT is not set
diff --git a/configs/amd_versal2_mini_qspi_defconfig b/configs/amd_versal2_mini_qspi_defconfig
index 48fb7ae0e7f3..72e6f613cd56 100644
--- a/configs/amd_versal2_mini_qspi_defconfig
+++ b/configs/amd_versal2_mini_qspi_defconfig
@@ -57,6 +57,7 @@ CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
+# CONFIG_SIMPLE_BUS is not set
 # CONFIG_GPIO is not set
 # CONFIG_I2C is not set
 # CONFIG_INPUT is not set
diff --git a/configs/xilinx_versal_mini_defconfig b/configs/xilinx_versal_mini_defconfig
index 561459befb61..cd5eebabf9a6 100644
--- a/configs/xilinx_versal_mini_defconfig
+++ b/configs/xilinx_versal_mini_defconfig
@@ -60,6 +60,7 @@ CONFIG_SYS_ALT_MEMTEST=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
+# CONFIG_SIMPLE_BUS is not set
 # CONFIG_MMC is not set
 CONFIG_ARM_DCC=y
 # CONFIG_GZIP is not set
diff --git a/configs/xilinx_versal_mini_emmc0_defconfig b/configs/xilinx_versal_mini_emmc0_defconfig
index 21f241e07b14..ffa1395fea71 100644
--- a/configs/xilinx_versal_mini_emmc0_defconfig
+++ b/configs/xilinx_versal_mini_emmc0_defconfig
@@ -59,6 +59,7 @@ CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
+# CONFIG_SIMPLE_BUS is not set
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_ARM_DCC=y
diff --git a/configs/xilinx_versal_mini_emmc1_defconfig b/configs/xilinx_versal_mini_emmc1_defconfig
index 6cb654c7a4bd..4d438a9b5cdd 100644
--- a/configs/xilinx_versal_mini_emmc1_defconfig
+++ b/configs/xilinx_versal_mini_emmc1_defconfig
@@ -59,6 +59,7 @@ CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
+# CONFIG_SIMPLE_BUS is not set
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
 CONFIG_ARM_DCC=y
diff --git a/configs/xilinx_versal_mini_ospi_defconfig b/configs/xilinx_versal_mini_ospi_defconfig
index af9ce4991690..cac691c92cee 100644
--- a/configs/xilinx_versal_mini_ospi_defconfig
+++ b/configs/xilinx_versal_mini_ospi_defconfig
@@ -54,6 +54,7 @@ CONFIG_SYS_PROMPT="Versal> "
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
+# CONFIG_SIMPLE_BUS is not set
 # CONFIG_MMC is not set
 CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
diff --git a/configs/xilinx_versal_mini_qspi_defconfig b/configs/xilinx_versal_mini_qspi_defconfig
index ecb3b16033cb..220daa894ea0 100644
--- a/configs/xilinx_versal_mini_qspi_defconfig
+++ b/configs/xilinx_versal_mini_qspi_defconfig
@@ -56,6 +56,7 @@ CONFIG_SYS_PROMPT="Versal> "
 # CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG is not set
 CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
+# CONFIG_SIMPLE_BUS is not set
 # CONFIG_GPIO is not set
 # CONFIG_I2C is not set
 # CONFIG_INPUT is not set
diff --git a/configs/xilinx_versal_net_mini_defconfig b/configs/xilinx_versal_net_mini_defconfig
index 04dd0cdb507a..7f2b1fbc88e7 100644
--- a/configs/xilinx_versal_net_mini_defconfig
+++ b/configs/xilinx_versal_net_mini_defconfig
@@ -64,6 +64,7 @@ CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
+# CONFIG_SIMPLE_BUS is not set
 # CONFIG_GPIO is not set
 # CONFIG_I2C is not set
 # CONFIG_INPUT is not set
diff --git a/configs/xilinx_versal_net_mini_emmc_defconfig b/configs/xilinx_versal_net_mini_emmc_defconfig
index ab201566407d..ba2c76c480b9 100644
--- a/configs/xilinx_versal_net_mini_emmc_defconfig
+++ b/configs/xilinx_versal_net_mini_emmc_defconfig
@@ -54,6 +54,7 @@ CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
+# CONFIG_SIMPLE_BUS is not set
 CONFIG_MMC_HS200_SUPPORT=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
diff --git a/configs/xilinx_versal_net_mini_ospi_defconfig b/configs/xilinx_versal_net_mini_ospi_defconfig
index 18ec73722586..a8d0c5fc1287 100644
--- a/configs/xilinx_versal_net_mini_ospi_defconfig
+++ b/configs/xilinx_versal_net_mini_ospi_defconfig
@@ -53,6 +53,7 @@ CONFIG_SYS_PROMPT="Versal NET> "
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
+# CONFIG_SIMPLE_BUS is not set
 # CONFIG_MMC is not set
 CONFIG_MTD=y
 CONFIG_DM_SPI_FLASH=y
diff --git a/configs/xilinx_versal_net_mini_qspi_defconfig b/configs/xilinx_versal_net_mini_qspi_defconfig
index 5241da6c63bb..1a3df99f65ed 100644
--- a/configs/xilinx_versal_net_mini_qspi_defconfig
+++ b/configs/xilinx_versal_net_mini_qspi_defconfig
@@ -55,6 +55,7 @@ CONFIG_SYS_PROMPT="Versal NET> "
 # CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG is not set
 CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
+# CONFIG_SIMPLE_BUS is not set
 # CONFIG_GPIO is not set
 # CONFIG_I2C is not set
 # CONFIG_INPUT is not set
diff --git a/configs/xilinx_zynqmp_mini_defconfig b/configs/xilinx_zynqmp_mini_defconfig
index 8aa4c8dc77dc..1f9fc71062f2 100644
--- a/configs/xilinx_zynqmp_mini_defconfig
+++ b/configs/xilinx_zynqmp_mini_defconfig
@@ -57,6 +57,7 @@ CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
+# CONFIG_SIMPLE_BUS is not set
 # CONFIG_DM_MAILBOX is not set
 # CONFIG_MMC is not set
 CONFIG_ARM_DCC=y
diff --git a/configs/xilinx_zynqmp_mini_emmc0_defconfig b/configs/xilinx_zynqmp_mini_emmc0_defconfig
index 66e0d5242821..4310412bed99 100644
--- a/configs/xilinx_zynqmp_mini_emmc0_defconfig
+++ b/configs/xilinx_zynqmp_mini_emmc0_defconfig
@@ -72,6 +72,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_SPL_DM_SEQ_ALIAS=y
+# CONFIG_SIMPLE_BUS is not set
 # CONFIG_DM_MAILBOX is not set
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
diff --git a/configs/xilinx_zynqmp_mini_emmc1_defconfig b/configs/xilinx_zynqmp_mini_emmc1_defconfig
index cded70f8f2f1..142d3643ba7a 100644
--- a/configs/xilinx_zynqmp_mini_emmc1_defconfig
+++ b/configs/xilinx_zynqmp_mini_emmc1_defconfig
@@ -72,6 +72,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_SPL_DM_SEQ_ALIAS=y
+# CONFIG_SIMPLE_BUS is not set
 # CONFIG_DM_MAILBOX is not set
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_MMC_SDHCI=y
diff --git a/configs/xilinx_zynqmp_mini_nand_defconfig b/configs/xilinx_zynqmp_mini_nand_defconfig
index f5c79779df3d..cb474697f518 100644
--- a/configs/xilinx_zynqmp_mini_nand_defconfig
+++ b/configs/xilinx_zynqmp_mini_nand_defconfig
@@ -52,6 +52,7 @@ CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
+# CONFIG_SIMPLE_BUS is not set
 # CONFIG_DM_MAILBOX is not set
 # CONFIG_MMC is not set
 CONFIG_DM_MTD=y
diff --git a/configs/xilinx_zynqmp_mini_nand_single_defconfig b/configs/xilinx_zynqmp_mini_nand_single_defconfig
index fa58f2a73c0d..717b66f8d384 100644
--- a/configs/xilinx_zynqmp_mini_nand_single_defconfig
+++ b/configs/xilinx_zynqmp_mini_nand_single_defconfig
@@ -52,6 +52,7 @@ CONFIG_OF_EMBED=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
+# CONFIG_SIMPLE_BUS is not set
 # CONFIG_DM_MAILBOX is not set
 # CONFIG_MMC is not set
 CONFIG_DM_MTD=y
diff --git a/configs/xilinx_zynqmp_mini_qspi_defconfig b/configs/xilinx_zynqmp_mini_qspi_defconfig
index f2d0d6f16edd..2f6135144791 100644
--- a/configs/xilinx_zynqmp_mini_qspi_defconfig
+++ b/configs/xilinx_zynqmp_mini_qspi_defconfig
@@ -73,6 +73,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NO_NET=y
 # CONFIG_DM_DEVICE_REMOVE is not set
 CONFIG_SPL_DM_SEQ_ALIAS=y
+# CONFIG_SIMPLE_BUS is not set
 # CONFIG_FIRMWARE is not set
 # CONFIG_GPIO is not set
 # CONFIG_I2C is not set
-- 
2.43.0

base-commit: cb5189d676852cad7ab3c0691490b2d0dac618b4


More information about the U-Boot mailing list