Commit 3760828a authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'socfpga_dts_updates_for_v5.5' of... 

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

SoCFPGA DTS updates for v5.5
- Arria10
	- modify QSPI read-delay property
- Agilex
	- Add QSPI support
	- Enable USB and LEDs
	- Add service layer, fpga manager support
- Stratix10
	- Update QSPI reg address

* tag 'socfpga_dts_updates_for_v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  arm64: dts: agilex: add service layer, fpga manager and fpga region
  arm64: agilex: enable USB and LEDs on agilex devkit
  arm64: dts: altera: update QSPI reg addresses for Stratix10
  arm64: dts: agilex: add QSPI support for Intel Agilex
  ARM: dts: arria10: Modify QSPI read_delay for Arria10

Link: https://lore.kernel.org/r/20191029143737.24850-1-dinguyen@kernel.org


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents ab782206 aa74337e

arch/arm/boot/dts/socfpga_arria10_socdk_qspi.dts

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
		m25p,fast-read;

		cdns,page-size = <256>;

		cdns,block-size = <16>;

		cdns,read-delay = <4>;

		cdns,read-delay = <3>;

		cdns,tshsl-ns = <50>;

		cdns,tsd2d-ns = <50>;

		cdns,tchsh-ns = <4>;

arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts

+2 −2
Original line number Diff line number Diff line
@@ -178,12 +178,12 @@ 


			qspi_boot: partition@0 {

				label = "Boot and fpga data";

				reg = <0x0 0x4000000>;

				reg = <0x0 0x034B0000>;

			};



			qspi_rootfs: partition@4000000 {

				label = "Root Filesystem - JFFS2";

				reg = <0x4000000 0x4000000>;

				reg = <0x034B0000 0x0EB50000>;

			};

		};

	};

arch/arm64/boot/dts/intel/socfpga_agilex.dtsi

+32 −0
Original line number Diff line number Diff line
@@ -12,6 +12,19 @@ 
	#address-cells = <2>;

	#size-cells = <2>;



	reserved-memory {

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;



		service_reserved: svcbuffer@0 {

			compatible = "shared-dma-pool";

			reg = <0x0 0x0 0x0 0x1000000>;

			alignment = <0x1000>;

			no-map;

		};

	};



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;
@@ -81,6 +94,13 @@ 
		interrupt-parent = <&intc>;

		ranges = <0 0 0 0xffffffff>;



		base_fpga_region {

			#address-cells = <0x1>;

			#size-cells = <0x1>;

			compatible = "fpga-region";

			fpga-mgr = <&fpga_mgr>;

		};



		gmac0: ethernet@ff800000 {

			compatible = "altr,socfpga-stmmac", "snps,dwmac-3.74a", "snps,dwmac";

			reg = <0xff800000 0x2000>;
@@ -442,5 +462,17 @@ 


			status = "disabled";

		};



		firmware {

			svc {

				compatible = "intel,stratix10-svc";

				method = "smc";

				memory-region = <&service_reserved>;



				fpga_mgr: fpga-mgr {

					compatible = "intel,stratix10-soc-fpga-mgr";

				};

			};

		};

	};

};

arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts

+58 −0
Original line number Diff line number Diff line
@@ -18,6 +18,24 @@ 
		stdout-path = "serial0:115200n8";

	};



	leds {

		compatible = "gpio-leds";

		hps0 {

			label = "hps_led0";

			gpios = <&portb 20 GPIO_ACTIVE_HIGH>;

		};



		hps1 {

			label = "hps_led1";

			gpios = <&portb 19 GPIO_ACTIVE_HIGH>;

		};



		hps2 {

			label = "hps_led2";

			gpios = <&portb 21 GPIO_ACTIVE_HIGH>;

		};

	};



	memory {

		device_type = "memory";

		/* We expect the bootloader to fill in the reg */
@@ -70,6 +88,46 @@ 
	status = "okay";

};



&usb0 {

	status = "okay";

	disable-over-current;

};



&watchdog0 {

	status = "okay";

};



&qspi {

	flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "mt25qu02g";

		reg = <0>;

		spi-max-frequency = <100000000>;



		m25p,fast-read;

		cdns,page-size = <256>;

		cdns,block-size = <16>;

		cdns,read-delay = <1>;

		cdns,tshsl-ns = <50>;

		cdns,tsd2d-ns = <50>;

		cdns,tchsh-ns = <4>;

		cdns,tslch-ns = <4>;



		partitions {

			compatible = "fixed-partitions";

			#address-cells = <1>;

			#size-cells = <1>;



			qspi_boot: partition@0 {

				label = "Boot and fpga data";

				reg = <0x0 0x034B0000>;

			};



			qspi_rootfs: partition@34B0000 {

				label = "Root Filesystem - JFFS2";

				reg = <0x034B0000 0x0EB50000>;

			};

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE