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

Merge tag 'socfpga_dts_update_for_v5.10' of... 

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

SoCFPGA DTS updates for v5.10
- Increase shared-dma-pool size to 32MB
- Add ptp_ref clock properties to the ethernet nodes on Stratix10 and Agilex

* tag 'socfpga_dts_update_for_v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  arm64: dts: stratix10/agilex: add the ptp_ref clock
  arm64: dts: agilex: increase shared memory size to 32Mb

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


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents dc47f7e7 6e043c65

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

+6 −6
Original line number Diff line number Diff line
@@ -145,8 +145,8 @@ gmac0: ethernet@ff800000 { 
			mac-address = [00 00 00 00 00 00];

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

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

			clocks = <&clkmgr STRATIX10_EMAC0_CLK>;

			clock-names = "stmmaceth";

			clocks = <&clkmgr STRATIX10_EMAC0_CLK>, <&clkmgr STRATIX10_EMAC_PTP_CLK>;

			clock-names = "stmmaceth", "ptp_ref";

			tx-fifo-depth = <16384>;

			rx-fifo-depth = <16384>;

			snps,multicast-filter-bins = <256>;
@@ -163,8 +163,8 @@ gmac1: ethernet@ff802000 { 
			mac-address = [00 00 00 00 00 00];

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

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

			clocks = <&clkmgr STRATIX10_EMAC1_CLK>;

			clock-names = "stmmaceth";

			clocks = <&clkmgr STRATIX10_EMAC1_CLK>, <&clkmgr STRATIX10_EMAC_PTP_CLK>;

			clock-names = "stmmaceth", "ptp_ref";

			tx-fifo-depth = <16384>;

			rx-fifo-depth = <16384>;

			snps,multicast-filter-bins = <256>;
@@ -181,8 +181,8 @@ gmac2: ethernet@ff804000 { 
			mac-address = [00 00 00 00 00 00];

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

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

			clocks = <&clkmgr STRATIX10_EMAC2_CLK>;

			clock-names = "stmmaceth";

			clocks = <&clkmgr STRATIX10_EMAC2_CLK>, <&clkmgr STRATIX10_EMAC_PTP_CLK>;

			clock-names = "stmmaceth", "ptp_ref";

			tx-fifo-depth = <16384>;

			rx-fifo-depth = <16384>;

			snps,multicast-filter-bins = <256>;

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

+7 −7
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ reserved-memory { 


		service_reserved: svcbuffer@0 {

			compatible = "shared-dma-pool";

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

			reg = <0x0 0x0 0x0 0x2000000>;

			alignment = <0x1000>;

			no-map;

		};
@@ -149,8 +149,8 @@ gmac0: ethernet@ff800000 { 
			snps,multicast-filter-bins = <256>;

			iommus = <&smmu 1>;

			altr,sysmgr-syscon = <&sysmgr 0x44 0>;

			clocks = <&clkmgr AGILEX_EMAC0_CLK>;

			clock-names = "stmmaceth";

			clocks = <&clkmgr AGILEX_EMAC0_CLK>, <&clkmgr AGILEX_EMAC_PTP_CLK>;

			clock-names = "stmmaceth", "ptp_ref";

			status = "disabled";

		};
@@ -167,8 +167,8 @@ gmac1: ethernet@ff802000 { 
			snps,multicast-filter-bins = <256>;

			iommus = <&smmu 2>;

			altr,sysmgr-syscon = <&sysmgr 0x48 8>;

			clocks = <&clkmgr AGILEX_EMAC1_CLK>;

			clock-names = "stmmaceth";

			clocks = <&clkmgr AGILEX_EMAC1_CLK>, <&clkmgr AGILEX_EMAC_PTP_CLK>;

			clock-names = "stmmaceth", "ptp_ref";

			status = "disabled";

		};
@@ -185,8 +185,8 @@ gmac2: ethernet@ff804000 { 
			snps,multicast-filter-bins = <256>;

			iommus = <&smmu 3>;

			altr,sysmgr-syscon = <&sysmgr 0x4c 16>;

			clocks = <&clkmgr AGILEX_EMAC2_CLK>;

			clock-names = "stmmaceth";

			clocks = <&clkmgr AGILEX_EMAC2_CLK>, <&clkmgr AGILEX_EMAC_PTP_CLK>;

			clock-names = "stmmaceth", "ptp_ref";

			status = "disabled";

		};