Commit c633d0f1 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'socfpga_updates_for_v4.19_part1' of... 

Merge tag 'socfpga_updates_for_v4.19_part1' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/dt

SoCFPGA DTS updates for v4.19
- Add SPI node for Arria10
- Stratix10 platform updates
  - Add QSPI support on devkit
  - Add clocks for SPI/USB/watchdog
  - Add additional OCP reset property

* tag 'socfpga_updates_for_v4.19_part1' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux

:
  arm64: dts: stratix10: Add SPI node clocks for Stratix10
  ARM: dts: Add SPI0 node for Arria10
  arm64: dts: stratix10: add OCP reset property for ethernet
  arm64: dts: stratix10: fill in clocks field for usb and watchdog
  arm64: dts: stratix10: Add QSPI support for Stratix10

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 2bc0b8e2 70455ac7

arch/arm/boot/dts/socfpga_arria10.dtsi

+12 −0
Original line number Diff line number Diff line
@@ -587,6 +587,18 @@ i2c4: i2c@ffc02600 { 
			status = "disabled";

		};



		spi0: spi@ffda4000 {

			compatible = "snps,dw-apb-ssi";

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0xffda4000 0x100>;

			interrupts = <0 101 4>;

			num-cs = <4>;

			/*32bit_access;*/

			clocks = <&spi_m_clk>;

			status = "disabled";

		};



		spi1: spi@ffda5000 {

			compatible = "snps,dw-apb-ssi";

			#address-cells = <1>;

arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi

+35 −6
Original line number Diff line number Diff line
@@ -119,6 +119,12 @@ osc1: osc1 { 
				#clock-cells = <0>;

				compatible = "fixed-clock";

			};



			qspi_clk: qspi-clk {

				#clock-cells = <0>;

				compatible = "fixed-clock";

				clock-frequency = <200000000>;

			};

		};



		gmac0: ethernet@ff800000 {
@@ -127,8 +133,8 @@ gmac0: ethernet@ff800000 { 
			interrupts = <0 90 4>;

			interrupt-names = "macirq";

			mac-address = [00 00 00 00 00 00];

			resets = <&rst EMAC0_RESET>;

			reset-names = "stmmaceth";

			resets = <&rst EMAC0_RESET>, <&rst EMAC0_OCP_RESET>;

			reset-names = "stmmaceth", "stmmaceth-ocp";

			clocks = <&clkmgr STRATIX10_EMAC0_CLK>;

			clock-names = "stmmaceth";

			status = "disabled";
@@ -140,8 +146,8 @@ gmac1: ethernet@ff802000 { 
			interrupts = <0 91 4>;

			interrupt-names = "macirq";

			mac-address = [00 00 00 00 00 00];

			resets = <&rst EMAC1_RESET>;

			reset-names = "stmmaceth";

			resets = <&rst EMAC1_RESET>, <&rst EMAC1_OCP_RESET>;

			reset-names = "stmmaceth", "stmmaceth-ocp";

			clocks = <&clkmgr STRATIX10_EMAC1_CLK>;

			clock-names = "stmmaceth";

			status = "disabled";
@@ -153,8 +159,8 @@ gmac2: ethernet@ff804000 { 
			interrupts = <0 92 4>;

			interrupt-names = "macirq";

			mac-address = [00 00 00 00 00 00];

			resets = <&rst EMAC2_RESET>;

			reset-names = "stmmaceth";

			resets = <&rst EMAC2_RESET>, <&rst EMAC2_OCP_RESET>;

			reset-names = "stmmaceth", "stmmaceth-ocp";

			clocks = <&clkmgr STRATIX10_EMAC2_CLK>;

			clock-names = "stmmaceth";

			status = "disabled";
@@ -310,6 +316,7 @@ spi0: spi@ffda4000 { 
			resets = <&rst SPIM0_RESET>;

			reg-io-width = <4>;

			num-cs = <4>;

			clocks = <&clkmgr STRATIX10_L4_MAIN_CLK>;

			status = "disabled";

		};
@@ -322,6 +329,7 @@ spi1: spi@ffda5000 { 
			resets = <&rst SPIM1_RESET>;

			reg-io-width = <4>;

			num-cs = <4>;

			clocks = <&clkmgr STRATIX10_L4_MAIN_CLK>;

			status = "disabled";

		};
@@ -407,6 +415,7 @@ usb0: usb@ffb00000 { 
			phy-names = "usb2-phy";

			resets = <&rst USB0_RESET>, <&rst USB0_OCP_RESET>;

			reset-names = "dwc2", "dwc2-ecc";

			clocks = <&clkmgr STRATIX10_USB_CLK>;

			status = "disabled";

		};
@@ -418,6 +427,7 @@ usb1: usb@ffb40000 { 
			phy-names = "usb2-phy";

			resets = <&rst USB1_RESET>, <&rst USB1_OCP_RESET>;

			reset-names = "dwc2", "dwc2-ecc";

			clocks = <&clkmgr STRATIX10_USB_CLK>;

			status = "disabled";

		};
@@ -426,6 +436,7 @@ watchdog0: watchdog@ffd00200 { 
			reg = <0xffd00200 0x100>;

			interrupts = <0 117 4>;

			resets = <&rst WATCHDOG0_RESET>;

			clocks = <&clkmgr STRATIX10_L4_SYS_FREE_CLK>;

			status = "disabled";

		};
@@ -434,6 +445,7 @@ watchdog1: watchdog@ffd00300 { 
			reg = <0xffd00300 0x100>;

			interrupts = <0 118 4>;

			resets = <&rst WATCHDOG1_RESET>;

			clocks = <&clkmgr STRATIX10_L4_SYS_FREE_CLK>;

			status = "disabled";

		};
@@ -442,6 +454,7 @@ watchdog2: watchdog@ffd00400 { 
			reg = <0xffd00400 0x100>;

			interrupts = <0 125 4>;

			resets = <&rst WATCHDOG2_RESET>;

			clocks = <&clkmgr STRATIX10_L4_SYS_FREE_CLK>;

			status = "disabled";

		};
@@ -450,6 +463,7 @@ watchdog3: watchdog@ffd00500 { 
			reg = <0xffd00500 0x100>;

			interrupts = <0 126 4>;

			resets = <&rst WATCHDOG3_RESET>;

			clocks = <&clkmgr STRATIX10_L4_SYS_FREE_CLK>;

			status = "disabled";

		};
@@ -464,5 +478,20 @@ sdramedac { 
				interrupts = <16 4>, <48 4>;

			};

		};



		qspi: spi@ff8d2000 {

			compatible = "cdns,qspi-nor";

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0xff8d2000 0x100>,

			      <0xff900000 0x100000>;

			interrupts = <0 3 4>;

			cdns,fifo-depth = <128>;

			cdns,fifo-width = <4>;

			cdns,trigger-address = <0x00000000>;

			clocks = <&qspi_clk>;



			status = "disabled";

		};

	};

};

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

+35 −0
Original line number Diff line number Diff line
@@ -147,3 +147,38 @@ rtc@68 { 
		reg = <0x68>;

	};

};



&qspi {

	flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "n25q00a";

		reg = <0>;

		spi-max-frequency = <50000000>;



		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 0x4000000>;

			};



			qspi_rootfs: partition@4000000 {

				label = "Root Filesystem - JFFS2";

				reg = <0x4000000 0x4000000>;

			};

		};

	};

};