Skip to contentSkip to conversation

ARM: dts: socfpga: Factor out U-Boot specifics from A10 handoff files

PATCH New Marek Vasut 2 participants 4 messages May 7, 2019 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 ARM: dts: socfpga: Factor out U-Boot specifics from A10 handoff files

Pull out the u-boot,dm-pre-reloc from socfpga_arria10_socdk_sdmmc_handoff.dtsi into separate dtsi header file to make it easier to patch in custom handoff dtsi files, without having to manually add the U-Boot bits. Shuffle the include clauses in the A10 DT files to make it obvious what gets included where without having to follow confusing long chain of includes, i.e. board DT file includes everything it needs.

Cc Chin Liang See <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Simon Goldschmidt <[email protected]>
Cc Tien Fong Chee <[email protected]>
---
 .../dts/socfpga_arria10_handoff_u-boot.dtsi   | 67 +++++++++++++++++++
 arch/arm/dts/socfpga_arria10_socdk.dtsi       |  3 +-
 arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts  |  2 +
 .../socfpga_arria10_socdk_sdmmc_handoff.dtsi  | 17 -----
 4 files changed, 71 insertions(+), 18 deletions(-)
 create mode 100644 arch/arm/dts/socfpga_arria10_handoff_u-boot.dtsi
arch/arm/dts/socfpga_arria10_handoff_u-boot.dtsi new file +67 -0
new file mode 100644
index 0000000000..39a8d9a3e7
@@ -0,0 +1,67 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
+
+/ {
+	chosen {
+		u-boot,dm-pre-reloc;
+	};
+
+	clocks {
+		u-boot,dm-pre-reloc;
+
+		altera_arria10_hps_eosc1 {
+			u-boot,dm-pre-reloc;
+		};
+
+		altera_arria10_hps_cb_intosc_ls {
+			u-boot,dm-pre-reloc;
+		};
+
+		altera_arria10_hps_f2h_free {
+			u-boot,dm-pre-reloc;
+		};
+	};
+
+	clock_manager at 0xffd04000 {
+		u-boot,dm-pre-reloc;
+
+		mainpll {
+			u-boot,dm-pre-reloc;
+		};
+
+		perpll {
+			u-boot,dm-pre-reloc;
+		};
+
+		alteragrp {
+			u-boot,dm-pre-reloc;
+		};
+	};
+
+	pinmux at 0xffd07000 {
+		u-boot,dm-pre-reloc;
+
+		shared {
+			u-boot,dm-pre-reloc;
+		};
+
+		dedicated {
+			u-boot,dm-pre-reloc;
+		};
+
+		dedicated_cfg {
+			u-boot,dm-pre-reloc;
+		};
+
+		fpga {
+			u-boot,dm-pre-reloc;
+		};
+	};
+
+	noc at 0xffd10000 {
+		u-boot,dm-pre-reloc;
+
+		firewall {
+			u-boot,dm-pre-reloc;
+		};
+	};
+};
arch/arm/dts/socfpga_arria10_socdk.dtsi +2 -1
index 42e888548e..6e5578d7bd 100644
@@ -14,7 +14,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "socfpga_arria10_socdk_sdmmc_handoff.dtsi"
+
+#include "socfpga_arria10.dtsi"
 
 / {
 	model = "Altera SOCFPGA Arria 10";
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts +2 -0
index 998d811210..417a6b6e9d 100644
@@ -17,6 +17,8 @@
 
 /dts-v1/;
 #include "socfpga_arria10_socdk.dtsi"
+#include "socfpga_arria10_socdk_sdmmc_handoff.dtsi"
+#include "socfpga_arria10_handoff_u-boot.dtsi"
 
 &mmc {
 	u-boot,dm-pre-reloc;
arch/arm/dts/socfpga_arria10_socdk_sdmmc_handoff.dtsi +0 -17
index 39009654d9..0446fd441e 100644
@@ -11,8 +11,6 @@
  *</auto-generated>
  */
 
-#include "socfpga_arria10.dtsi"
-
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
@@ -24,13 +22,11 @@
 
 	/* Clock sources */
 	clocks {
-		u-boot,dm-pre-reloc;
 		#address-cells = <1>;
 		#size-cells = <1>;
 
 		/* Clock source: altera_arria10_hps_eosc1 */
 		altera_arria10_hps_eosc1: altera_arria10_hps_eosc1 {
-			u-boot,dm-pre-reloc;
 			compatible = "fixed-clock";
 			#clock-cells = <0>;
 			clock-frequency = <25000000>;
@@ -39,7 +35,6 @@
 
 		/* Clock source: altera_arria10_hps_cb_intosc_ls */
 		altera_arria10_hps_cb_intosc_ls: altera_arria10_hps_cb_intosc_ls {
-			u-boot,dm-pre-reloc;
 			compatible = "fixed-clock";
 			#clock-cells = <0>;
 			clock-frequency = <60000000>;
@@ -48,7 +43,6 @@
 
 		/* Clock source: altera_arria10_hps_f2h_free */
 		altera_arria10_hps_f2h_free: altera_arria10_hps_f2h_free {
-			u-boot,dm-pre-reloc;
 			compatible = "fixed-clock";
 			#clock-cells = <0>;
 			clock-frequency = <200000000>;
@@ -62,14 +56,12 @@
 	 * Binding: device
 	 */
 	i_clk_mgr: clock_manager at 0xffd04000 {
-		u-boot,dm-pre-reloc;
 		compatible = "altr,socfpga-a10-clk-init";
 		reg = <0xffd04000 0x00000200>;
 		reg-names = "soc_clock_manager_OCP_SLV";
 
 		/* Address Block: soc_clock_manager_OCP_SLV.i_clk_mgr_mainpllgrp */
 		mainpll {
-			u-boot,dm-pre-reloc;
 			vco0-psrc = <0>;	/* Field: vco0.psrc */
 			vco1-denom = <1>;	/* Field: vco1.denom */
 			vco1-numer = <191>;	/* Field: vco1.numer */
@@ -98,7 +90,6 @@
 
 		/* Address Block: soc_clock_manager_OCP_SLV.i_clk_mgr_perpllgrp */
 		perpll {
-			u-boot,dm-pre-reloc;
 			vco0-psrc = <0>;	/* Field: vco0.psrc */
 			vco1-denom = <1>;	/* Field: vco1.denom */
 			vco1-numer = <159>;	/* Field: vco1.numer */
@@ -124,7 +115,6 @@
 
 		/* Address Block: soc_clock_manager_OCP_SLV.i_clk_mgr_alteragrp */
 		alteragrp {
-			u-boot,dm-pre-reloc;
 			nocclk = <0x0384000b>;	/* Register: nocclk */
 			mpuclk = <0x03840001>;	/* Register: mpuclk */
 		};
@@ -136,7 +126,6 @@
 	 * Binding: pinmux
 	 */
 	i_io48_pin_mux: pinmux at 0xffd07000 {
-		u-boot,dm-pre-reloc;
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "pinctrl-single";
@@ -145,7 +134,6 @@
 
 		/* Address Block: soc_3v_io48_pin_mux_OCP_SLV.i_io48_pin_mux_shared_3v_io_grp */
 		shared {
-			u-boot,dm-pre-reloc;
 			reg = <0xffd07000 0x00000200>;
 			pinctrl-single,register-width = <32>;
 			pinctrl-single,function-mask = <0x0000000f>;
@@ -202,7 +190,6 @@
 
 		/* Address Block: soc_3v_io48_pin_mux_OCP_SLV.i_io48_pin_mux_dedicated_io_grp */
 		dedicated {
-			u-boot,dm-pre-reloc;
 			reg = <0xffd07200 0x00000200>;
 			pinctrl-single,register-width = <32>;
 			pinctrl-single,function-mask = <0x0000000f>;
@@ -225,7 +212,6 @@
 
 		/* Address Block: soc_3v_io48_pin_mux_OCP_SLV.i_io48_pin_mux_dedicated_io_grp */
 		dedicated_cfg {
-			u-boot,dm-pre-reloc;
 			reg = <0xffd07200 0x00000200>;
 			pinctrl-single,register-width = <32>;
 			pinctrl-single,function-mask = <0x003f3f3f>;
@@ -252,7 +238,6 @@
 
 		/* Address Block: soc_3v_io48_pin_mux_OCP_SLV.i_io48_pin_mux_fpga_interface_grp */
 		fpga {
-			u-boot,dm-pre-reloc;
 			reg = <0xffd07400 0x00000100>;
 			pinctrl-single,register-width = <32>;
 			pinctrl-single,function-mask = <0x00000001>;
@@ -283,13 +268,11 @@
 	 * Binding: device
 	 */
 	i_noc: noc at 0xffd10000 {
-		u-boot,dm-pre-reloc;
 		compatible = "altr,socfpga-a10-noc";
 		reg = <0xffd10000 0x00008000>;
 		reg-names = "mpu_m0";
 
 		firewall {
-			u-boot,dm-pre-reloc;
 			/*
 			 * Driver setting: altera_arria10_soc_noc_arria10_uboot_driver.I_NOC.mpu_m0.noc_fw_ddr_mpu_fpga2sdram_ddr_scr.mpuregion0addr.base
 			 * Driver setting: altera_arria10_soc_noc_arria10_uboot_driver.I_NOC.mpu_m0.noc_fw_ddr_mpu_fpga2sdram_ddr_scr.mpuregion0addr.limit
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/2 ARM: dts: socfpga: Keep FPGA bridge entries in SPL DT

Keep the FPGA bridge entries in SPL DT to let do_bridge_reset() toggle the bridges on/off as needed according to the handoff file.

Cc Chin Liang See <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Simon Goldschmidt <[email protected]>
Cc Tien Fong Chee <[email protected]>
---
 .../dts/socfpga_arria10_handoff_u-boot.dtsi   | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
arch/arm/dts/socfpga_arria10_handoff_u-boot.dtsi +24 -0
index 39a8d9a3e7..ef215230c2 100644
@@ -64,4 +64,28 @@
 			u-boot,dm-pre-reloc;
 		};
 	};
+
+	fpgabridge at 0 {
+		u-boot,dm-pre-reloc;
+	};
+
+	fpgabridge at 1 {
+		u-boot,dm-pre-reloc;
+	};
+
+	fpgabridge at 2 {
+		u-boot,dm-pre-reloc;
+	};
+
+	fpgabridge at 3 {
+		u-boot,dm-pre-reloc;
+	};
+
+	fpgabridge at 4 {
+		u-boot,dm-pre-reloc;
+	};
+
+	fpgabridge at 5 {
+		u-boot,dm-pre-reloc;
+	};
 };
Signature · 1 line
2.20.1
#2 lore raw

PATCH 1/2 ARM: dts: socfpga: Factor out U-Boot specifics from A10 handoff files

In reply to Marek Vasut
Quoted 7 lines · Marek Vasut

Pull out the u-boot,dm-pre-reloc from socfpga_arria10_socdk_sdmmc_handoff.dtsi into separate dtsi header file to make it easier to patch in custom handoff dtsi files, without having to manually add the U-Boot bits. Shuffle the include clauses in the A10 DT files to make it obvious what gets included where without having to follow confusing long chain of includes, i.e. board DT file includes everything it needs.

Quoted 5 lines
Cc Chin Liang See <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Simon Goldschmidt <[email protected]>
Cc Tien Fong Chee <[email protected]>

Just being curious: the remaining "*_handoff.dtsi", is this now the unmodified output of Quartus (or whatever)?

Regards,
Simon

Quoted 237 lines
---
  .../dts/socfpga_arria10_handoff_u-boot.dtsi   | 67 +++++++++++++++++++
  arch/arm/dts/socfpga_arria10_socdk.dtsi       |  3 +-
  arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts  |  2 +
  .../socfpga_arria10_socdk_sdmmc_handoff.dtsi  | 17 -----
  4 files changed, 71 insertions(+), 18 deletions(-)

create mode 100644 arch/arm/dts/socfpga_arria10_handoff_u-boot.dtsi

arch/arm/dts/socfpga_arria10_handoff_u-boot.dtsi new file +67 -0
new file mode 100644
index 0000000000..39a8d9a3e7
@@ -0,0 +1,67 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
+
+/ {
+	chosen {
+		u-boot,dm-pre-reloc;
+	};
+
+	clocks {
+		u-boot,dm-pre-reloc;
+
+		altera_arria10_hps_eosc1 {
+			u-boot,dm-pre-reloc;
+		};
+
+		altera_arria10_hps_cb_intosc_ls {
+			u-boot,dm-pre-reloc;
+		};
+
+		altera_arria10_hps_f2h_free {
+			u-boot,dm-pre-reloc;
+		};
+	};
+
+	clock_manager at 0xffd04000 {
+		u-boot,dm-pre-reloc;
+
+		mainpll {
+			u-boot,dm-pre-reloc;
+		};
+
+		perpll {
+			u-boot,dm-pre-reloc;
+		};
+
+		alteragrp {
+			u-boot,dm-pre-reloc;
+		};
+	};
+
+	pinmux at 0xffd07000 {
+		u-boot,dm-pre-reloc;
+
+		shared {
+			u-boot,dm-pre-reloc;
+		};
+
+		dedicated {
+			u-boot,dm-pre-reloc;
+		};
+
+		dedicated_cfg {
+			u-boot,dm-pre-reloc;
+		};
+
+		fpga {
+			u-boot,dm-pre-reloc;
+		};
+	};
+
+	noc at 0xffd10000 {
+		u-boot,dm-pre-reloc;
+
+		firewall {
+			u-boot,dm-pre-reloc;
+		};
+	};
+};
arch/arm/dts/socfpga_arria10_socdk.dtsi +2 -1
index 42e888548e..6e5578d7bd 100644
@@ -14,7 +14,8 @@
   * You should have received a copy of the GNU General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
-#include "socfpga_arria10_socdk_sdmmc_handoff.dtsi"
+
+#include "socfpga_arria10.dtsi"
 
  / {
  	model = "Altera SOCFPGA Arria 10";
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts +2 -0
index 998d811210..417a6b6e9d 100644
@@ -17,6 +17,8 @@
 
  /dts-v1/;
  #include "socfpga_arria10_socdk.dtsi"
+#include "socfpga_arria10_socdk_sdmmc_handoff.dtsi"
+#include "socfpga_arria10_handoff_u-boot.dtsi"
 
  &mmc {
  	u-boot,dm-pre-reloc;
arch/arm/dts/socfpga_arria10_socdk_sdmmc_handoff.dtsi +0 -17
index 39009654d9..0446fd441e 100644
@@ -11,8 +11,6 @@
   *</auto-generated>
   */
 
-#include "socfpga_arria10.dtsi"
-
  / {
  	#address-cells = <1>;
  	#size-cells = <1>;
@@ -24,13 +22,11 @@
 
  	/* Clock sources */
  	clocks {
-		u-boot,dm-pre-reloc;
  		#address-cells = <1>;
  		#size-cells = <1>;
 
  		/* Clock source: altera_arria10_hps_eosc1 */
  		altera_arria10_hps_eosc1: altera_arria10_hps_eosc1 {
-			u-boot,dm-pre-reloc;
  			compatible = "fixed-clock";
  			#clock-cells = <0>;
  			clock-frequency = <25000000>;
@@ -39,7 +35,6 @@
 
  		/* Clock source: altera_arria10_hps_cb_intosc_ls */
  		altera_arria10_hps_cb_intosc_ls: altera_arria10_hps_cb_intosc_ls {
-			u-boot,dm-pre-reloc;
  			compatible = "fixed-clock";
  			#clock-cells = <0>;
  			clock-frequency = <60000000>;
@@ -48,7 +43,6 @@
 
  		/* Clock source: altera_arria10_hps_f2h_free */
  		altera_arria10_hps_f2h_free: altera_arria10_hps_f2h_free {
-			u-boot,dm-pre-reloc;
  			compatible = "fixed-clock";
  			#clock-cells = <0>;
  			clock-frequency = <200000000>;
@@ -62,14 +56,12 @@
  	 * Binding: device
  	 */
  	i_clk_mgr: clock_manager at 0xffd04000 {
-		u-boot,dm-pre-reloc;
  		compatible = "altr,socfpga-a10-clk-init";
  		reg = <0xffd04000 0x00000200>;
  		reg-names = "soc_clock_manager_OCP_SLV";
 
  		/* Address Block: soc_clock_manager_OCP_SLV.i_clk_mgr_mainpllgrp */
  		mainpll {
-			u-boot,dm-pre-reloc;
  			vco0-psrc = <0>;	/* Field: vco0.psrc */
  			vco1-denom = <1>;	/* Field: vco1.denom */
  			vco1-numer = <191>;	/* Field: vco1.numer */
@@ -98,7 +90,6 @@
 
  		/* Address Block: soc_clock_manager_OCP_SLV.i_clk_mgr_perpllgrp */
  		perpll {
-			u-boot,dm-pre-reloc;
  			vco0-psrc = <0>;	/* Field: vco0.psrc */
  			vco1-denom = <1>;	/* Field: vco1.denom */
  			vco1-numer = <159>;	/* Field: vco1.numer */
@@ -124,7 +115,6 @@
 
  		/* Address Block: soc_clock_manager_OCP_SLV.i_clk_mgr_alteragrp */
  		alteragrp {
-			u-boot,dm-pre-reloc;
  			nocclk = <0x0384000b>;	/* Register: nocclk */
  			mpuclk = <0x03840001>;	/* Register: mpuclk */
  		};
@@ -136,7 +126,6 @@
  	 * Binding: pinmux
  	 */
  	i_io48_pin_mux: pinmux at 0xffd07000 {
-		u-boot,dm-pre-reloc;
  		#address-cells = <1>;
  		#size-cells = <1>;
  		compatible = "pinctrl-single";
@@ -145,7 +134,6 @@
 
  		/* Address Block: soc_3v_io48_pin_mux_OCP_SLV.i_io48_pin_mux_shared_3v_io_grp */
  		shared {
-			u-boot,dm-pre-reloc;
  			reg = <0xffd07000 0x00000200>;
  			pinctrl-single,register-width = <32>;
  			pinctrl-single,function-mask = <0x0000000f>;
@@ -202,7 +190,6 @@
 
  		/* Address Block: soc_3v_io48_pin_mux_OCP_SLV.i_io48_pin_mux_dedicated_io_grp */
  		dedicated {
-			u-boot,dm-pre-reloc;
  			reg = <0xffd07200 0x00000200>;
  			pinctrl-single,register-width = <32>;
  			pinctrl-single,function-mask = <0x0000000f>;
@@ -225,7 +212,6 @@
 
  		/* Address Block: soc_3v_io48_pin_mux_OCP_SLV.i_io48_pin_mux_dedicated_io_grp */
  		dedicated_cfg {
-			u-boot,dm-pre-reloc;
  			reg = <0xffd07200 0x00000200>;
  			pinctrl-single,register-width = <32>;
  			pinctrl-single,function-mask = <0x003f3f3f>;
@@ -252,7 +238,6 @@
 
  		/* Address Block: soc_3v_io48_pin_mux_OCP_SLV.i_io48_pin_mux_fpga_interface_grp */
  		fpga {
-			u-boot,dm-pre-reloc;
  			reg = <0xffd07400 0x00000100>;
  			pinctrl-single,register-width = <32>;
  			pinctrl-single,function-mask = <0x00000001>;
@@ -283,13 +268,11 @@
  	 * Binding: device
  	 */
  	i_noc: noc at 0xffd10000 {
-		u-boot,dm-pre-reloc;
  		compatible = "altr,socfpga-a10-noc";
  		reg = <0xffd10000 0x00008000>;
  		reg-names = "mpu_m0";
 
  		firewall {
-			u-boot,dm-pre-reloc;
  			/*
  			 * Driver setting: altera_arria10_soc_noc_arria10_uboot_driver.I_NOC.mpu_m0.noc_fw_ddr_mpu_fpga2sdram_ddr_scr.mpuregion0addr.base
  			 * Driver setting: altera_arria10_soc_noc_arria10_uboot_driver.I_NOC.mpu_m0.noc_fw_ddr_mpu_fpga2sdram_ddr_scr.mpuregion0addr.limit
#3 lore raw

PATCH 1/2 ARM: dts: socfpga: Factor out U-Boot specifics from A10 handoff files

Quoted 21 lines · Simon Goldschmidt
Quoted 12 lines · Marek Vasut

Pull out the u-boot,dm-pre-reloc from socfpga_arria10_socdk_sdmmc_handoff.dtsi
into separate dtsi header file to make it easier to patch in custom handoff
dtsi files, without having to manually add the U-Boot bits. Shuffle the include
clauses in the A10 DT files to make it obvious what gets included where without
having to follow confusing long chain of includes, i.e. board DT file includes
everything it needs.

Quoted 5 lines
Cc Chin Liang See <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Simon Goldschmidt <[email protected]>
Cc Tien Fong Chee <[email protected]>
Quoted 4 lines

Just being curious: the remaining "*_handoff.dtsi", is this now the unmodified output of Quartus (or whatever)?

Yes

Signature · 2 lines
Best regards,
Marek Vasut