kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/arch/arm/boot/dts/ste-href.dtsi
..
..
@@ -1,78 +1,84 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  * Copyright 2012 ST-Ericsson AB
3
- *
4
- * The code contained herein is licensed under the GNU General Public
5
- * License. You may obtain a copy of the GNU General Public License
6
- * Version 2 or later at the following locations:
7
- *
8
- * http://www.opensource.org/licenses/gpl-license.html
9
- * http://www.gnu.org/copyleft/gpl.html
10
4
  */
11
5
 
12
6
 #include <dt-bindings/interrupt-controller/irq.h>
13
-#include "ste-dbx5x0.dtsi"
7
+#include <dt-bindings/leds/common.h>
14
8
 #include "ste-href-family-pinctrl.dtsi"
15
9
 
16
10
 / {
17
11
 	memory {
12
+		device_type = "memory";
18
13
 		reg = <0x00000000 0x20000000>;
19
14
 	};
20
15
 
21
16
 	soc {
22
17
 		uart@80120000 {
23
18
 			pinctrl-names = "default", "sleep";
24
-			pinctrl-0 = <&uart0_default_mode>;
25
-			pinctrl-1 = <&uart0_sleep_mode>;
19
+			pinctrl-0 = <&u0_a_1_default>;
20
+			pinctrl-1 = <&u0_a_1_sleep>;
26
21
 			status = "okay";
27
22
 		};
28
23
 
29
24
 		/* This UART is unused and thus left disabled */
30
25
 		uart@80121000 {
31
26
 			pinctrl-names = "default", "sleep";
32
-			pinctrl-0 = <&uart1_default_mode>;
33
-			pinctrl-1 = <&uart1_sleep_mode>;
27
+			pinctrl-0 = <&u1rxtx_a_1_default>;
28
+			pinctrl-1 = <&u1rxtx_a_1_sleep>;
34
29
 		};
35
30
 
36
31
 		uart@80007000 {
37
32
 			pinctrl-names = "default", "sleep";
38
-			pinctrl-0 = <&uart2_default_mode>;
39
-			pinctrl-1 = <&uart2_sleep_mode>;
33
+			pinctrl-0 = <&u2rxtx_c_1_default>;
34
+			pinctrl-1 = <&u2rxtx_c_1_sleep>;
40
35
 			status = "okay";
41
36
 		};
42
37
 
43
38
 		i2c@80004000 {
44
39
 			pinctrl-names = "default","sleep";
45
-			pinctrl-0 = <&i2c0_default_mode>;
46
-			pinctrl-1 = <&i2c0_sleep_mode>;
40
+			pinctrl-0 = <&i2c0_a_1_default>;
41
+			pinctrl-1 = <&i2c0_a_1_sleep>;
42
+			status = "okay";
47
43
 		};
48
44
 
49
45
 		i2c@80122000 {
50
46
 			pinctrl-names = "default","sleep";
51
-			pinctrl-0 = <&i2c1_default_mode>;
52
-			pinctrl-1 = <&i2c1_sleep_mode>;
47
+			pinctrl-0 = <&i2c1_b_2_default>;
48
+			pinctrl-1 = <&i2c1_b_2_sleep>;
49
+			status = "okay";
53
50
 		};
54
51
 
55
52
 		i2c@80128000 {
56
53
 			pinctrl-names = "default","sleep";
57
-			pinctrl-0 = <&i2c2_default_mode>;
58
-			pinctrl-1 = <&i2c2_sleep_mode>;
54
+			pinctrl-0 = <&i2c2_b_2_default>;
55
+			pinctrl-1 = <&i2c2_b_2_sleep>;
56
+			status = "okay";
59
57
 			lp5521@33 {
60
58
 				compatible = "national,lp5521";
61
59
 				reg = <0x33>;
62
60
 				label = "lp5521_pri";
63
61
 				clock-mode = /bits/ 8 <2>;
64
-				chan0 {
62
+				#address-cells = <1>;
63
+				#size-cells = <0>;
64
+				chan@0 {
65
+					reg = <0>;
65
66
 					led-cur = /bits/ 8 <0x2f>;
66
67
 					max-cur = /bits/ 8 <0x5f>;
68
+					color = <LED_COLOR_ID_BLUE>;
67
69
 					linux,default-trigger = "heartbeat";
68
70
 				};
69
-				chan1 {
71
+				chan@1 {
72
+					reg = <1>;
70
73
 					led-cur = /bits/ 8 <0x2f>;
71
74
 					max-cur = /bits/ 8 <0x5f>;
75
+					color = <LED_COLOR_ID_BLUE>;
72
76
 				};
73
-				chan2 {
77
+				chan@2 {
78
+					reg = <2>;
74
79
 					led-cur = /bits/ 8 <0x2f>;
75
80
 					max-cur = /bits/ 8 <0x5f>;
81
+					color = <LED_COLOR_ID_BLUE>;
76
82
 				};
77
83
 			};
78
84
 			lp5521@34 {
..
..
@@ -80,17 +86,25 @@
80
86
 				reg = <0x34>;
81
87
 				label = "lp5521_sec";
82
88
 				clock-mode = /bits/ 8 <2>;
83
-				chan0 {
89
+				#address-cells = <1>;
90
+				#size-cells = <0>;
91
+				chan@0 {
92
+					reg = <0>;
84
93
 					led-cur = /bits/ 8 <0x2f>;
85
94
 					max-cur = /bits/ 8 <0x5f>;
95
+					color = <LED_COLOR_ID_BLUE>;
86
96
 				};
87
-				chan1 {
97
+				chan@1 {
98
+					reg = <1>;
88
99
 					led-cur = /bits/ 8 <0x2f>;
89
100
 					max-cur = /bits/ 8 <0x5f>;
101
+					color = <LED_COLOR_ID_BLUE>;
90
102
 				};
91
-				chan2 {
103
+				chan@2 {
104
+					reg = <2>;
92
105
 					led-cur = /bits/ 8 <0x2f>;
93
106
 					max-cur = /bits/ 8 <0x5f>;
107
+					color = <LED_COLOR_ID_BLUE>;
94
108
 				};
95
109
 			};
96
110
 			bh1780@29 {
..
..
@@ -101,8 +115,9 @@
101
115
 
102
116
 		i2c@80110000 {
103
117
 			pinctrl-names = "default","sleep";
104
-			pinctrl-0 = <&i2c3_default_mode>;
105
-			pinctrl-1 = <&i2c3_sleep_mode>;
118
+			pinctrl-0 = <&i2c3_c_2_default>;
119
+			pinctrl-1 = <&i2c3_c_2_sleep>;
120
+			status = "okay";
106
121
 		};
107
122
 
108
123
 		/* ST6G3244ME level translator for 1.8/2.9 V */
..
..
@@ -137,8 +152,8 @@
137
152
 			vmmc-supply = <&ab8500_ldo_aux3_reg>;
138
153
 			vqmmc-supply = <&vmmci>;
139
154
 			pinctrl-names = "default", "sleep";
140
-			pinctrl-0 = <&sdi0_default_mode>;
141
-			pinctrl-1 = <&sdi0_sleep_mode>;
155
+			pinctrl-0 = <&mc0_a_1_default &sdi0_default_mode>;
156
+			pinctrl-1 = <&mc0_a_1_sleep>;
142
157
 
143
158
 			status = "okay";
144
159
 		};
..
..
@@ -150,8 +165,8 @@
150
165
 			bus-width = <4>;
151
166
 			non-removable;
152
167
 			pinctrl-names = "default", "sleep";
153
-			pinctrl-0 = <&sdi1_default_mode>;
154
-			pinctrl-1 = <&sdi1_sleep_mode>;
168
+			pinctrl-0 = <&mc1_a_1_default>;
169
+			pinctrl-1 = <&mc1_a_1_sleep>;
155
170
 
156
171
 			status = "okay";
157
172
 		};
..
..
@@ -165,8 +180,8 @@
165
180
 			non-removable;
166
181
 			vmmc-supply = <&db8500_vsmps2_reg>;
167
182
 			pinctrl-names = "default", "sleep";
168
-			pinctrl-0 = <&sdi2_default_mode>;
169
-			pinctrl-1 = <&sdi2_sleep_mode>;
183
+			pinctrl-0 = <&mc2_a_1_default>;
184
+			pinctrl-1 = <&mc2_a_1_sleep>;
170
185
 
171
186
 			status = "okay";
172
187
 		};
..
..
@@ -180,27 +195,27 @@
180
195
 			non-removable;
181
196
 			vmmc-supply = <&ab8500_ldo_aux2_reg>;
182
197
 			pinctrl-names = "default", "sleep";
183
-			pinctrl-0 = <&sdi4_default_mode>;
184
-			pinctrl-1 = <&sdi4_sleep_mode>;
198
+			pinctrl-0 = <&mc4_a_1_default>;
199
+			pinctrl-1 = <&mc4_a_1_sleep>;
185
200
 
186
201
 			status = "okay";
187
202
 		};
188
203
 
189
204
 		msp0: msp@80123000 {
190
205
 			pinctrl-names = "default";
191
-			pinctrl-0 = <&msp0_default_mode>;
206
+			pinctrl-0 = <&msp0txrxtfstck_a_1_default>;
192
207
 			status = "okay";
193
208
 		};
194
209
 
195
210
 		msp1: msp@80124000 {
196
211
 			pinctrl-names = "default";
197
-			pinctrl-0 = <&msp1_default_mode>;
212
+			pinctrl-0 = <&msp1txrx_a_1_default>;
198
213
 			status = "okay";
199
214
 		};
200
215
 
201
216
 		msp2: msp@80117000 {
202
217
 			pinctrl-names = "default";
203
-			pinctrl-0 = <&msp2_default_mode>;
218
+			pinctrl-0 = <&msp2_a_1_default>;
204
219
 		};
205
220
 
206
221
 		msp3: msp@80125000 {
..
..
@@ -209,13 +224,13 @@
209
224
 
210
225
 		prcmu@80157000 {
211
226
 			ab8500 {
212
-				ab8500-gpio {
227
+				ab8500-gpiocontroller {
213
228
 				};
214
229
 
215
230
 				ab8500_usb {
216
231
 					pinctrl-names = "default", "sleep";
217
-					pinctrl-0 = <&musb_default_mode>;
218
-					pinctrl-1 = <&musb_sleep_mode>;
232
+					pinctrl-0 = <&usb_a_1_default>;
233
+					pinctrl-1 = <&usb_a_1_sleep>;
219
234
 				};
220
235
 
221
236
 				ab8500-regulators {
..
..
@@ -239,10 +254,6 @@
239
254
 						regulator-name = "V-TVOUT";
240
255
 					};
241
256
 
242
-					ab8500_ldo_usb_reg: ab8500_ldo_usb {
243
-						regulator-name = "dummy";
244
-					};
245
-
246
257
 					ab8500_ldo_audio_reg: ab8500_ldo_audio {
247
258
 						regulator-name = "V-AUD";
248
259
 					};
..
..
@@ -266,6 +277,14 @@
266
277
 			};
267
278
 		};
268
279
 
280
+		pinctrl {
281
+			sdi0 {
282
+				sdi0_default_mode: sdi0_default {
283
+					/* Some boards set additional settings here */
284
+				};
285
+			};
286
+		};
287
+
269
288
 		mcde@a0350000 {
270
289
 			pinctrl-names = "default", "sleep";
271
290
 			pinctrl-0 = <&lcd_default_mode>;