修改GPIO导出默认初始值

hc

2024-10-16 50a212ec906f7524620675f0c57357691c26c81f

 kernel/arch/arm/boot/dts/vf610-zii-cfu1.dts
..
..
@@ -16,6 +16,7 @@
16
16
 	};
17
17
 
18
18
 	memory@80000000 {
19
+		device_type = "memory";
19
20
 		reg = <0x80000000 0x20000000>;
20
21
 	};
21
22
 
..
..
@@ -28,35 +29,30 @@
28
29
 			label = "zii:green:debug1";
29
30
 			gpios = <&gpio2 18 GPIO_ACTIVE_HIGH>;
30
31
 			linux,default-trigger = "heartbeat";
31
-			max-brightness = <1>;
32
32
 		};
33
33
 
34
34
 		led-fail {
35
35
 			label = "zii:red:fail";
36
36
 			gpios = <&gpio3 12 GPIO_ACTIVE_LOW>;
37
37
 			default-state = "off";
38
-			max-brightness = <1>;
39
38
 		};
40
39
 
41
40
 		led-status {
42
41
 			label = "zii:green:status";
43
42
 			gpios = <&gpio3 13 GPIO_ACTIVE_HIGH>;
44
43
 			default-state = "off";
45
-			max-brightness = <1>;
46
44
 		};
47
45
 
48
46
 		led-debug-a {
49
47
 			label = "zii:green:debug_a";
50
48
 			gpios = <&gpio3 14 GPIO_ACTIVE_HIGH>;
51
49
 			default-state = "off";
52
-			max-brightness = <1>;
53
50
 		};
54
51
 
55
52
 		led-debug-b {
56
53
 			label = "zii:green:debug_b";
57
54
 			gpios = <&gpio3 15 GPIO_ACTIVE_HIGH>;
58
55
 			default-state = "off";
59
-			max-brightness = <1>;
60
56
 		};
61
57
 	};
62
58
 
..
..
@@ -65,6 +61,23 @@
65
61
 		 regulator-name = "vcc_3v3_mcu";
66
62
 		 regulator-min-microvolt = <3300000>;
67
63
 		 regulator-max-microvolt = <3300000>;
64
+	};
65
+
66
+	sff: sfp {
67
+		compatible = "sff,sff";
68
+		pinctrl-0 = <&pinctrl_optical>;
69
+		pinctrl-names = "default";
70
+		i2c-bus = <&i2c0>;
71
+		los-gpio = <&gpio4 4 GPIO_ACTIVE_HIGH>;
72
+		tx-disable-gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
73
+	};
74
+
75
+	supply-voltage-monitor {
76
+		compatible = "iio-hwmon";
77
+		io-channels = <&adc0 8>, /* 28VDC_IN */
78
+			      <&adc0 9>, /* +3.3V    */
79
+			      <&adc1 8>, /* VCC_1V5  */
80
+			      <&adc1 9>; /* VCC_1V2  */
68
81
 	};
69
82
 };
70
83
 
..
..
@@ -82,9 +95,14 @@
82
95
 	bus-num = <1>;
83
96
 	pinctrl-names = "default";
84
97
 	pinctrl-0 = <&pinctrl_dspi1>;
85
-	status = "okay";
98
+	/*
99
+	 * Some CFU1s come with SPI-NOR chip DNPed, so we leave this
100
+	 * node disabled by default and rely on bootloader to enable
101
+	 * it when appropriate.
102
+	 */
103
+	status = "disabled";
86
104
 
87
-	m25p128@0 {
105
+	flash@0 {
88
106
 		#address-cells = <1>;
89
107
 		#size-cells = <1>;
90
108
 		compatible = "m25p128", "jedec,spi-nor";
..
..
@@ -113,6 +131,8 @@
113
131
 	non-removable;
114
132
 	no-1-8-v;
115
133
 	keep-power-in-suspend;
134
+	no-sdio;
135
+	no-sd;
116
136
 	status = "okay";
117
137
 };
118
138
 
..
..
@@ -120,6 +140,7 @@
120
140
 	pinctrl-names = "default";
121
141
 	pinctrl-0 = <&pinctrl_esdhc1>;
122
142
 	bus-width = <4>;
143
+	no-sdio;
123
144
 	status = "okay";
124
145
 };
125
146
 
..
..
@@ -137,6 +158,8 @@
137
158
 	mdio1: mdio {
138
159
 		#address-cells = <1>;
139
160
 		#size-cells = <0>;
161
+		clock-frequency = <12500000>;
162
+		suppress-preamble;
140
163
 		status = "okay";
141
164
 
142
165
 		switch0: switch0@0 {
..
..
@@ -149,7 +172,6 @@
149
172
 			interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
150
173
 			interrupt-controller;
151
174
 			#interrupt-cells = <2>;
152
-			reset-gpios = <&gpio3 11 GPIO_ACTIVE_LOW>;
153
175
 
154
176
 			ports {
155
177
 				#address-cells = <1>;
..
..
@@ -168,6 +190,14 @@
168
190
 				port@2 {
169
191
 					reg = <2>;
170
192
 					label = "eth_cu_1000_3";
193
+				};
194
+
195
+				port@5 {
196
+					reg = <5>;
197
+					label = "eth_fc_1000_1";
198
+					phy-mode = "1000base-x";
199
+					managed = "in-band-status";
200
+					sfp = <&sff>;
171
201
 				};
172
202
 
173
203
 				port@6 {
..
..
@@ -191,10 +221,11 @@
191
221
 	pinctrl-0 = <&pinctrl_i2c0>;
192
222
 	status = "okay";
193
223
 
194
-	pca9554@22 {
224
+	io-expander@22 {
195
225
 		compatible = "nxp,pca9554";
196
226
 		reg = <0x22>;
197
227
 		gpio-controller;
228
+		#gpio-cells = <2>;
198
229
 	};
199
230
 
200
231
 	lm75@48 {
..
..
@@ -202,17 +233,33 @@
202
233
 		reg = <0x48>;
203
234
 	};
204
235
 
205
-	at24c04@52 {
236
+	eeprom@52 {
206
237
 		compatible = "atmel,24c04";
207
238
 		reg = <0x52>;
208
239
 		label = "nvm";
209
240
 	};
210
241
 
211
-	at24c04@54 {
242
+	eeprom@54 {
212
243
 		compatible = "atmel,24c04";
213
244
 		reg = <0x54>;
214
245
 		label = "nameplate";
215
246
 	};
247
+};
248
+
249
+&i2c1 {
250
+	clock-frequency = <100000>;
251
+	pinctrl-names = "default";
252
+	pinctrl-0 = <&pinctrl_i2c1>;
253
+	status = "okay";
254
+
255
+	watchdog@38 {
256
+		compatible = "zii,rave-wdt";
257
+		reg = <0x38>;
258
+	};
259
+};
260
+
261
+&snvsrtc {
262
+	status = "disabled";
216
263
 };
217
264
 
218
265
 &uart0 {
..
..
@@ -279,6 +326,13 @@
279
326
 		>;
280
327
 	};
281
328
 
329
+	pinctrl_i2c1: i2c1grp {
330
+		fsl,pins = <
331
+			VF610_PAD_PTB16__I2C1_SCL		0x37ff
332
+			VF610_PAD_PTB17__I2C1_SDA		0x37ff
333
+		>;
334
+	};
335
+
282
336
 	pinctrl_leds_debug: pinctrl-leds-debug {
283
337
 		fsl,pins = <
284
338
 			VF610_PAD_PTD3__GPIO_82			0x31c2
..
..
@@ -289,10 +343,19 @@
289
343
 		>;
290
344
 	};
291
345
 
346
+	pinctrl_optical: optical-grp {
347
+		fsl,pins = <
348
+		/* SFF SD input */
349
+		VF610_PAD_PTE27__GPIO_132	0x3061
350
+
351
+		/* SFF Transmit disable output */
352
+		VF610_PAD_PTE13__GPIO_118	0x3043
353
+		>;
354
+	};
355
+
292
356
 	pinctrl_switch: switch-grp {
293
357
 		fsl,pins = <
294
358
 			VF610_PAD_PTB28__GPIO_98		0x3061
295
-			VF610_PAD_PTE2__GPIO_107		0x1042
296
359
 		>;
297
360
 	};
298
361