Commit e9f981c7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'socfpga_dts_update_for_v5.8' of...

Merge tag 'socfpga_dts_update_for_v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into arm/dt

SoCFPGA DTS updates for v5.8
- Leave the FPGA bridges disabled in base dtsi
- Add fpga2hps and fpga2sdram bridges on base Cyclone5/Arria5 dtsi

* tag 'socfpga_dts_update_for_v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  ARM: dts: socfpga: Add fpga2hps and fpga2sdram bridges
  ARM: dts: socfgpa: set bridges status to disabled

Link: https://lore.kernel.org/r/20200515193029.11318-2-dinguyen@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 0e909f18 29aed3ef
Loading
Loading
Loading
Loading
+16 −0
Original line number Diff line number Diff line
@@ -531,6 +531,7 @@
			reg = <0xff400000 0x100000>;
			resets = <&rst LWHPS2FPGA_RESET>;
			clocks = <&l4_main_clk>;
			status = "disabled";
		};

		fpga_bridge1: fpga_bridge@ff500000 {
@@ -538,6 +539,21 @@
			reg = <0xff500000 0x10000>;
			resets = <&rst HPS2FPGA_RESET>;
			clocks = <&l4_main_clk>;
			status = "disabled";
		};

		fpga_bridge2: fpga-bridge@ff600000 {
			compatible = "altr,socfpga-fpga2hps-bridge";
			reg = <0xff600000 0x100000>;
			resets = <&rst FPGA2HPS_RESET>;
			clocks = <&l4_main_clk>;
			status = "disabled";
		};

		fpga_bridge3: fpga-bridge@ffc25080 {
			compatible = "altr,socfpga-fpga2sdram-bridge";
			reg = <0xffc25080 0x4>;
			status = "disabled";
		};

		fpgamgr0: fpgamgr@ff706000 {