tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Olof Johansson <olof@lixom.net>

Olof Johansson b042dc74 dc47f7e7

+13 -13
+6 -6
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
··· 145 145 mac-address = [00 00 00 00 00 00]; 146 146 resets = <&rst EMAC0_RESET>, <&rst EMAC0_OCP_RESET>; 147 147 reset-names = "stmmaceth", "stmmaceth-ocp"; 148 - clocks = <&clkmgr STRATIX10_EMAC0_CLK>; 149 - clock-names = "stmmaceth"; 148 + clocks = <&clkmgr STRATIX10_EMAC0_CLK>, <&clkmgr STRATIX10_EMAC_PTP_CLK>; 149 + clock-names = "stmmaceth", "ptp_ref"; 150 150 tx-fifo-depth = <16384>; 151 151 rx-fifo-depth = <16384>; 152 152 snps,multicast-filter-bins = <256>; ··· 163 163 mac-address = [00 00 00 00 00 00]; 164 164 resets = <&rst EMAC1_RESET>, <&rst EMAC1_OCP_RESET>; 165 165 reset-names = "stmmaceth", "stmmaceth-ocp"; 166 - clocks = <&clkmgr STRATIX10_EMAC1_CLK>; 167 - clock-names = "stmmaceth"; 166 + clocks = <&clkmgr STRATIX10_EMAC1_CLK>, <&clkmgr STRATIX10_EMAC_PTP_CLK>; 167 + clock-names = "stmmaceth", "ptp_ref"; 168 168 tx-fifo-depth = <16384>; 169 169 rx-fifo-depth = <16384>; 170 170 snps,multicast-filter-bins = <256>; ··· 181 181 mac-address = [00 00 00 00 00 00]; 182 182 resets = <&rst EMAC2_RESET>, <&rst EMAC2_OCP_RESET>; 183 183 reset-names = "stmmaceth", "stmmaceth-ocp"; 184 - clocks = <&clkmgr STRATIX10_EMAC2_CLK>; 185 - clock-names = "stmmaceth"; 184 + clocks = <&clkmgr STRATIX10_EMAC2_CLK>, <&clkmgr STRATIX10_EMAC_PTP_CLK>; 185 + clock-names = "stmmaceth", "ptp_ref"; 186 186 tx-fifo-depth = <16384>; 187 187 rx-fifo-depth = <16384>; 188 188 snps,multicast-filter-bins = <256>;
+7 -7
arch/arm64/boot/dts/intel/socfpga_agilex.dtsi
··· 20 20 21 21 service_reserved: svcbuffer@0 { 22 22 compatible = "shared-dma-pool"; 23 - reg = <0x0 0x0 0x0 0x1000000>; 23 + reg = <0x0 0x0 0x0 0x2000000>; 24 24 alignment = <0x1000>; 25 25 no-map; 26 26 }; ··· 149 149 snps,multicast-filter-bins = <256>; 150 150 iommus = <&smmu 1>; 151 151 altr,sysmgr-syscon = <&sysmgr 0x44 0>; 152 - clocks = <&clkmgr AGILEX_EMAC0_CLK>; 153 - clock-names = "stmmaceth"; 152 + clocks = <&clkmgr AGILEX_EMAC0_CLK>, <&clkmgr AGILEX_EMAC_PTP_CLK>; 153 + clock-names = "stmmaceth", "ptp_ref"; 154 154 status = "disabled"; 155 155 }; 156 156 ··· 167 167 snps,multicast-filter-bins = <256>; 168 168 iommus = <&smmu 2>; 169 169 altr,sysmgr-syscon = <&sysmgr 0x48 8>; 170 - clocks = <&clkmgr AGILEX_EMAC1_CLK>; 171 - clock-names = "stmmaceth"; 170 + clocks = <&clkmgr AGILEX_EMAC1_CLK>, <&clkmgr AGILEX_EMAC_PTP_CLK>; 171 + clock-names = "stmmaceth", "ptp_ref"; 172 172 status = "disabled"; 173 173 }; 174 174 ··· 185 185 snps,multicast-filter-bins = <256>; 186 186 iommus = <&smmu 3>; 187 187 altr,sysmgr-syscon = <&sysmgr 0x4c 16>; 188 - clocks = <&clkmgr AGILEX_EMAC2_CLK>; 189 - clock-names = "stmmaceth"; 188 + clocks = <&clkmgr AGILEX_EMAC2_CLK>, <&clkmgr AGILEX_EMAC_PTP_CLK>; 189 + clock-names = "stmmaceth", "ptp_ref"; 190 190 status = "disabled"; 191 191 }; 192 192