tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'socfpga_dts_updates_for_v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into arm/dt
SoCFPGA DTS updates for v5.3
- Use the new "altr,socfpga-stmmac-a10-s10" for the EMAC controllers on
Arria10/Stratix10
- Add the ltc2497 i2c entry on the Arria10 devkit
- Add the EMAC OCP reset property on the Arria10
* tag 'socfpga_dts_updates_for_v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
ARM: dts: arria10: Add EMAC OCP reset property
ARM: dts: socfpga: add ltc2497 on arria10 devkit
arm64: dts: stratix10: use the "altr,socfpga-stmmac-a10-s10" binding
ARM: dts: socfpga: use the "altr,socfpga-stmmac-a10-s10" binding
Signed-off-by: Olof Johansson <olof@lixom.net>
+35
-15
+11
-10
arch/arm/boot/dts/socfpga_arria10.dtsi
+11
-10
arch/arm/boot/dts/socfpga_arria10.dtsi
···
418
418
};
419
419
420
420
gmac0: ethernet@ff800000 {
421
-
compatible = "altr,socfpga-stmmac", "snps,dwmac-3.72a", "snps,dwmac";
421
+
compatible = "altr,socfpga-stmmac-a10-s10", "snps,dwmac-3.72a", "snps,dwmac";
422
422
altr,sysmgr-syscon = <&sysmgr 0x44 0>;
423
423
reg = <0xff800000 0x2000>;
424
424
interrupts = <0 92 IRQ_TYPE_LEVEL_HIGH>;
···
431
431
rx-fifo-depth = <16384>;
432
432
clocks = <&l4_mp_clk>;
433
433
clock-names = "stmmaceth";
434
-
resets = <&rst EMAC0_RESET>;
435
-
reset-names = "stmmaceth";
434
+
resets = <&rst EMAC0_RESET>, <&rst EMAC0_OCP_RESET>;
435
+
reset-names = "stmmaceth", "stmmaceth-ocp";
436
436
snps,axi-config = <&socfpga_axi_setup>;
437
437
status = "disabled";
438
438
};
439
439
440
440
gmac1: ethernet@ff802000 {
441
-
compatible = "altr,socfpga-stmmac", "snps,dwmac-3.72a", "snps,dwmac";
442
-
altr,sysmgr-syscon = <&sysmgr 0x48 0>;
441
+
compatible = "altr,socfpga-stmmac-a10-s10", "snps,dwmac-3.72a", "snps,dwmac";
442
+
altr,sysmgr-syscon = <&sysmgr 0x48 8>;
443
443
reg = <0xff802000 0x2000>;
444
444
interrupts = <0 93 IRQ_TYPE_LEVEL_HIGH>;
445
445
interrupt-names = "macirq";
···
451
451
rx-fifo-depth = <16384>;
452
452
clocks = <&l4_mp_clk>;
453
453
clock-names = "stmmaceth";
454
-
resets = <&rst EMAC1_RESET>;
455
-
reset-names = "stmmaceth";
454
+
resets = <&rst EMAC1_RESET>, <&rst EMAC1_OCP_RESET>;
455
+
reset-names = "stmmaceth", "stmmaceth-ocp";
456
456
snps,axi-config = <&socfpga_axi_setup>;
457
457
status = "disabled";
458
458
};
459
459
460
460
gmac2: ethernet@ff804000 {
461
-
compatible = "altr,socfpga-stmmac", "snps,dwmac-3.72a", "snps,dwmac";
462
-
altr,sysmgr-syscon = <&sysmgr 0x4C 0>;
461
+
compatible = "altr,socfpga-stmmac-a10-s10", "snps,dwmac-3.72a", "snps,dwmac";
462
+
altr,sysmgr-syscon = <&sysmgr 0x4C 16>;
463
463
reg = <0xff804000 0x2000>;
464
464
interrupts = <0 94 IRQ_TYPE_LEVEL_HIGH>;
465
465
interrupt-names = "macirq";
···
470
470
tx-fifo-depth = <4096>;
471
471
rx-fifo-depth = <16384>;
472
472
clocks = <&l4_mp_clk>;
473
-
resets = <&rst EMAC2_RESET>;
474
473
clock-names = "stmmaceth";
474
+
resets = <&rst EMAC2_RESET>, <&rst EMAC2_OCP_RESET>;
475
+
reset-names = "stmmaceth", "stmmaceth-ocp";
475
476
snps,axi-config = <&socfpga_axi_setup>;
476
477
status = "disabled";
477
478
};
+19
arch/arm/boot/dts/socfpga_arria10_socdk.dtsi
+19
arch/arm/boot/dts/socfpga_arria10_socdk.dtsi
···
48
48
};
49
49
};
50
50
51
+
ref_033v: 033-v-ref {
52
+
compatible = "regulator-fixed";
53
+
regulator-name = "0.33V";
54
+
regulator-min-microvolt = <330000>;
55
+
regulator-max-microvolt = <330000>;
56
+
};
57
+
51
58
soc {
52
59
clkmgr@ffd04000 {
53
60
clocks {
···
134
127
clock-frequency = <100000>;
135
128
i2c-sda-falling-time-ns = <6000>;
136
129
i2c-scl-falling-time-ns = <6000>;
130
+
131
+
adc@14 {
132
+
compatible = "lltc,ltc2497";
133
+
reg = <0x14>;
134
+
vref-supply = <&ref_033v>;
135
+
};
136
+
137
+
adc@16 {
138
+
compatible = "lltc,ltc2497";
139
+
reg = <0x16>;
140
+
vref-supply = <&ref_033v>;
141
+
};
137
142
138
143
eeprom@51 {
139
144
compatible = "atmel,24c32";
+5
-5
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
+5
-5
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
···
138
138
};
139
139
140
140
gmac0: ethernet@ff800000 {
141
-
compatible = "altr,socfpga-stmmac", "snps,dwmac-3.74a", "snps,dwmac";
141
+
compatible = "altr,socfpga-stmmac-a10-s10", "snps,dwmac-3.74a", "snps,dwmac";
142
142
reg = <0xff800000 0x2000>;
143
143
interrupts = <0 90 4>;
144
144
interrupt-names = "macirq";
···
156
156
};
157
157
158
158
gmac1: ethernet@ff802000 {
159
-
compatible = "altr,socfpga-stmmac", "snps,dwmac-3.74a", "snps,dwmac";
159
+
compatible = "altr,socfpga-stmmac-a10-s10", "snps,dwmac-3.74a", "snps,dwmac";
160
160
reg = <0xff802000 0x2000>;
161
161
interrupts = <0 91 4>;
162
162
interrupt-names = "macirq";
···
169
169
rx-fifo-depth = <16384>;
170
170
snps,multicast-filter-bins = <256>;
171
171
iommus = <&smmu 2>;
172
-
altr,sysmgr-syscon = <&sysmgr 0x48 0>;
172
+
altr,sysmgr-syscon = <&sysmgr 0x48 8>;
173
173
status = "disabled";
174
174
};
175
175
176
176
gmac2: ethernet@ff804000 {
177
-
compatible = "altr,socfpga-stmmac", "snps,dwmac-3.74a", "snps,dwmac";
177
+
compatible = "altr,socfpga-stmmac-a10-s10", "snps,dwmac-3.74a", "snps,dwmac";
178
178
reg = <0xff804000 0x2000>;
179
179
interrupts = <0 92 4>;
180
180
interrupt-names = "macirq";
···
187
187
rx-fifo-depth = <16384>;
188
188
snps,multicast-filter-bins = <256>;
189
189
iommus = <&smmu 3>;
190
-
altr,sysmgr-syscon = <&sysmgr 0x4c 0>;
190
+
altr,sysmgr-syscon = <&sysmgr 0x4c 16>;
191
191
status = "disabled";
192
192
};
193
193