Skip to content

Commit 3f2f25b

Browse files
arndbarndb
committed
Merge tag 'socfpga_dts_updates_for_v6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into soc/dt
SoCFPGA DTS updates for v6.8 - Fix dtbs_check warnings for nand, usb, FPGA firmware, and pin-controller - Clean up of DTS for Agilex5 * tag 'socfpga_dts_updates_for_v6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux: arm64: dts: intel: minor whitespace cleanup around '=' arm64: dts: socfpga: agilex: drop redundant status arm64: dts: socfpga: agilex: add unit address to soc node arm64: dts: socfpga: agilex: move firmware out of soc node arm64: dts: socfpga: agilex: move FPGA region out of soc node arm64: dts: socfpga: agilex: align pin-controller name with bindings arm64: dts: socfpga: stratix10_swvp: drop unsupported DW MSHC properties arm64: dts: socfpga: stratix10_socdk: align NAND chip name with bindings arm64: dts: socfpga: stratix10: add unit address to soc node arm64: dts: socfpga: stratix10: move firmware out of soc node arm64: dts: socfpga: stratix10: move FPGA region out of soc node arm64: dts: socfpga: stratix10: align pincfg nodes with bindings arm64: dts: socfpga: stratix10: add clock-names to DWC2 USB arm64: dts: socfpga: drop unsupported cdns,page-size and cdns,block-size ARM: dts: socfpga: align NAND controller name with bindings ARM: dts: socfpga: drop unsupported cdns,page-size and cdns,block-size Link: https://lore.kernel.org/r/20240104001354.152410-1-dinguyen@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents b236329 + 16615a2 commit 3f2f25b

17 files changed

Lines changed: 53 additions & 77 deletions

‎arch/arm/boot/dts/intel/socfpga/socfpga.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -768,7 +768,7 @@
768768
status = "disabled";
769769
};
770770

771-
nand0: nand@ff900000 {
771+
nand0: nand-controller@ff900000 {
772772
#address-cells = <0x1>;
773773
#size-cells = <0x0>;
774774
compatible = "altr,socfpga-denali-nand";

‎arch/arm/boot/dts/intel/socfpga/socfpga_arria10.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@
669669
status = "disabled";
670670
};
671671

672-
nand: nand@ffb90000 {
672+
nand: nand-controller@ffb90000 {
673673
#address-cells = <1>;
674674
#size-cells = <0>;
675675
compatible = "altr,socfpga-denali-nand";

‎arch/arm/boot/dts/intel/socfpga/socfpga_arria10_socdk_qspi.dts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
spi-max-frequency = <100000000>;
1818

1919
m25p,fast-read;
20-
cdns,page-size = <256>;
21-
cdns,block-size = <16>;
2220
cdns,read-delay = <3>;
2321
cdns,tshsl-ns = <50>;
2422
cdns,tsd2d-ns = <50>;

‎arch/arm/boot/dts/intel/socfpga/socfpga_arria5_socdk.dts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,6 @@
124124
spi-max-frequency = <100000000>;
125125

126126
m25p,fast-read;
127-
cdns,page-size = <256>;
128-
cdns,block-size = <16>;
129127
cdns,read-delay = <4>;
130128
cdns,tshsl-ns = <50>;
131129
cdns,tsd2d-ns = <50>;

‎arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_socdk.dts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,6 @@
129129
spi-max-frequency = <100000000>;
130130

131131
m25p,fast-read;
132-
cdns,page-size = <256>;
133-
cdns,block-size = <16>;
134132
cdns,read-delay = <4>;
135133
cdns,tshsl-ns = <50>;
136134
cdns,tsd2d-ns = <50>;

‎arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_sockit.dts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,6 @@
174174
spi-max-frequency = <100000000>;
175175

176176
m25p,fast-read;
177-
cdns,page-size = <256>;
178-
cdns,block-size = <16>;
179177
cdns,read-delay = <4>;
180178
cdns,tshsl-ns = <50>;
181179
cdns,tsd2d-ns = <50>;

‎arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_sodia.dts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,6 @@
121121
spi-max-frequency = <100000000>;
122122

123123
m25p,fast-read;
124-
cdns,page-size = <256>;
125-
cdns,block-size = <16>;
126124
cdns,read-delay = <4>;
127125
cdns,tshsl-ns = <50>;
128126
cdns,tsd2d-ns = <50>;

‎arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_vining_fpga.dts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,6 @@
229229
spi-max-frequency = <100000000>;
230230
m25p,fast-read;
231231

232-
cdns,page-size = <256>;
233-
cdns,block-size = <16>;
234232
cdns,read-delay = <4>;
235233
cdns,tshsl-ns = <50>;
236234
cdns,tsd2d-ns = <50>;
@@ -246,8 +244,6 @@
246244
spi-max-frequency = <100000000>;
247245
m25p,fast-read;
248246

249-
cdns,page-size = <256>;
250-
cdns,block-size = <16>;
251247
cdns,read-delay = <4>;
252248
cdns,tshsl-ns = <50>;
253249
cdns,tsd2d-ns = <50>;

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

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,25 @@
5959
};
6060
};
6161

62+
firmware {
63+
svc {
64+
compatible = "intel,stratix10-svc";
65+
method = "smc";
66+
memory-region = <&service_reserved>;
67+
68+
fpga_mgr: fpga-mgr {
69+
compatible = "intel,stratix10-soc-fpga-mgr";
70+
};
71+
};
72+
};
73+
74+
fpga-region {
75+
compatible = "fpga-region";
76+
#address-cells = <0x2>;
77+
#size-cells = <0x2>;
78+
fpga-mgr = <&fpga_mgr>;
79+
};
80+
6281
pmu {
6382
compatible = "arm,armv8-pmuv3";
6483
interrupts = <0 170 4>,
@@ -125,21 +144,14 @@
125144
};
126145
};
127146

128-
soc {
147+
soc@0 {
129148
#address-cells = <1>;
130149
#size-cells = <1>;
131150
compatible = "simple-bus";
132151
device_type = "soc";
133152
interrupt-parent = <&intc>;
134153
ranges = <0 0 0 0xffffffff>;
135154

136-
base_fpga_region {
137-
#address-cells = <0x2>;
138-
#size-cells = <0x2>;
139-
compatible = "fpga-region";
140-
fpga-mgr = <&fpga_mgr>;
141-
};
142-
143155
clkmgr: clock-controller@ffd10000 {
144156
compatible = "intel,stratix10-clkmgr";
145157
reg = <0xffd10000 0x1000>;
@@ -510,6 +522,7 @@
510522
resets = <&rst USB1_RESET>, <&rst USB1_OCP_RESET>;
511523
reset-names = "dwc2", "dwc2-ecc";
512524
clocks = <&clkmgr STRATIX10_USB_CLK>;
525+
clock-names = "otg";
513526
iommus = <&smmu 7>;
514527
status = "disabled";
515528
};
@@ -620,18 +633,6 @@
620633

621634
status = "disabled";
622635
};
623-
624-
firmware {
625-
svc {
626-
compatible = "intel,stratix10-svc";
627-
method = "smc";
628-
memory-region = <&service_reserved>;
629-
630-
fpga_mgr: fpga-mgr {
631-
compatible = "intel,stratix10-soc-fpga-mgr";
632-
};
633-
};
634-
};
635636
};
636637

637638
usbphy0: usbphy0 {

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
regulator-max-microvolt = <330000>;
5252
};
5353

54-
soc {
54+
soc@0 {
5555
eccmgr {
5656
sdmmca-ecc@ff8c8c00 {
5757
compatible = "altr,socfpga-s10-sdmmc-ecc",
@@ -66,14 +66,14 @@
6666
};
6767

6868
&pinctrl0 {
69-
i2c1_pmx_func: i2c1-pmx-func {
69+
i2c1_pmx_func: i2c1-pmx-func-pins {
7070
pinctrl-single,pins = <
7171
0x78 0x4 /* I2C1_SDA (IO6-B) PIN30SEL) */
7272
0x7c 0x4 /* I2C1_SCL (IO7-B) PIN31SEL */
7373
>;
7474
};
7575

76-
i2c1_pmx_func_gpio: i2c1-pmx-func-gpio {
76+
i2c1_pmx_func_gpio: i2c1-pmx-func-gpio-pins {
7777
pinctrl-single,pins = <
7878
0x78 0x8 /* I2C1_SDA (IO6-B) PIN30SEL) */
7979
0x7c 0x8 /* I2C1_SCL (IO7-B) PIN31SEL */
@@ -187,8 +187,6 @@
187187
spi-max-frequency = <100000000>;
188188

189189
m25p,fast-read;
190-
cdns,page-size = <256>;
191-
cdns,block-size = <16>;
192190
cdns,read-delay = <1>;
193191
cdns,tshsl-ns = <50>;
194192
cdns,tsd2d-ns = <50>;

0 commit comments

Comments
 (0)