Skip to content

Commit 0acf88f

Browse files
committed
Merge tag 'socfpga_dts_updates_for_v6.17' of https://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into soc/dt
SoCFPGA DTS updates for v6.17 - Fix dt_binding_check warnings - agilex - f2s-free-clk - stratix10 - rstmgr - swvp - remove phy-addr, cpu1-start-addr and altr,modrst-offset * tag 'socfpga_dts_updates_for_v6.17' of https://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux: arm64: dts: altera: socfpga_stratix10: update internal oscillators arm64: dts: socfpga: swvp: remove phy-addr in the GMAC node arm64: dts: socfpga: swvp: remove cpu1-start-addr arm64: dts: socfpga: swvp: remove altr,modrst-offset arm64: dts: socfpga: stratix10: fix dtbs_check for rstmgr arm64: dts: socfpga: agilex: fix dtbs_check warning for f2s-free-clk Link: https://lore.kernel.org/r/20250712123248.16981-1-dinguyen@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 3116e1d + 203b862 commit 0acf88f

3 files changed

Lines changed: 5 additions & 7 deletions

File tree

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,16 +130,19 @@
130130
cb_intosc_hs_div2_clk: cb-intosc-hs-div2-clk {
131131
#clock-cells = <0>;
132132
compatible = "fixed-clock";
133+
clock-frequency = <150000000>;
133134
};
134135

135136
cb_intosc_ls_clk: cb-intosc-ls-clk {
136137
#clock-cells = <0>;
137138
compatible = "fixed-clock";
139+
clock-frequency = <300000000>;
138140
};
139141

140142
f2s_free_clk: f2s-free-clk {
141143
#clock-cells = <0>;
142144
compatible = "fixed-clock";
145+
status = "disabled";
143146
};
144147

145148
osc1: osc1 {
@@ -395,7 +398,7 @@
395398

396399
rst: rstmgr@ffd11000 {
397400
#reset-cells = <1>;
398-
compatible = "altr,stratix10-rst-mgr";
401+
compatible = "altr,stratix10-rst-mgr", "altr,rst-mgr";
399402
reg = <0xffd11000 0x1000>;
400403
};
401404

arch/arm64/boot/dts/altera/socfpga_stratix10_swvp.dts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@
6868
&gmac1 {
6969
status = "okay";
7070
phy-mode = "rgmii";
71-
phy-addr = <0xffffffff>;
7271
};
7372

7473
&gmac2 {
@@ -103,12 +102,7 @@
103102
status = "okay";
104103
};
105104

106-
&rst {
107-
altr,modrst-offset = <0x20>;
108-
};
109-
110105
&sysmgr {
111106
reg = <0xffd12000 0x1000>;
112107
interrupts = <0x0 0x10 0x4>;
113-
cpu1-start-addr = <0xffd06230>;
114108
};

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@
126126
f2s_free_clk: f2s-free-clk {
127127
#clock-cells = <0>;
128128
compatible = "fixed-clock";
129+
clock-frequency = <100000000>;
129130
};
130131

131132
osc1: osc1 {

0 commit comments

Comments
 (0)