Skip to content

Commit fe7c7b7

Browse files
author
Dinh Nguyen
committed
FogBugz #188457: Fix DTS entries for SOCFPGA Arria V
This commit is for the socfpga-3.10-ltsi kernel. Update the socfpga_arria.dts file to correctly enable serial, gmac, watchdog. Also remove the hard-coded frequencies that are no longer needed as the kernel can use the common clock framework to get those. Signed-off-by: Dinh Nguyen <[email protected]>
1 parent c32f139 commit fe7c7b7

File tree

1 file changed

+25
-29
lines changed

1 file changed

+25
-29
lines changed

arch/arm/boot/dts/socfpga_arria5.dts

Lines changed: 25 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,6 @@
3939
};
4040

4141
soc {
42-
clkmgr@ffd04000 {
43-
clocks {
44-
osc1 {
45-
clock-frequency = <25000000>;
46-
};
47-
};
48-
};
49-
5042
dwmmc0@ff704000 {
5143
num-slots = <1>;
5244
supports-highspeed;
@@ -71,28 +63,8 @@
7163
status = "okay";
7264
};
7365

74-
timer0@ffc08000 {
75-
clock-frequency = <100000000>;
76-
};
77-
78-
timer1@ffc09000 {
79-
clock-frequency = <100000000>;
80-
};
81-
82-
timer2@ffd00000 {
83-
clock-frequency = <25000000>;
84-
};
85-
86-
timer3@ffd01000 {
87-
clock-frequency = <25000000>;
88-
};
89-
9066
serial0@ffc02000 {
91-
clock-frequency = <100000000>;
92-
};
93-
94-
serial1@ffc03000 {
95-
clock-frequency = <100000000>;
67+
status = "okay";
9668
};
9769

9870
sysmgr@ffd08000 {
@@ -103,6 +75,10 @@
10375
status = "okay";
10476
};
10577

78+
watchdog0: wd@ffd02000 {
79+
status = "okay";
80+
};
81+
10682
leds {
10783
compatible = "gpio-leds";
10884
hps0 {
@@ -128,6 +104,22 @@
128104
};
129105
};
130106

107+
&gmac1 {
108+
phy-mode = "rgmii";
109+
snps,phy-addr = <0xffffffff>; /* probe for phy addr */
110+
rxd0-skew-ps = <0>;
111+
rxd0-skew-ps = <0>;
112+
rxd1-skew-ps = <0>;
113+
rxd2-skew-ps = <0>;
114+
rxd3-skew-ps = <0>;
115+
txen-skew-ps = <0>;
116+
txc-skew-ps = <2600>;
117+
rxdv-skew-ps = <0>;
118+
rxc-skew-ps = <3000>;
119+
snps,max-mtu = <3800>;
120+
status = "okay";
121+
};
122+
131123
&i2c0 {
132124
lcd: lcd@28 {
133125
compatible = "newhaven,nhd-0216k3z-nsw-bbw";
@@ -149,6 +141,10 @@
149141
};
150142
};
151143

144+
&osc1 {
145+
clock-frequency = <25000000>;
146+
};
147+
152148
&qspi {
153149
status = "okay";
154150
flash0: n25q512a@0 {

0 commit comments

Comments
 (0)