kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/arch/arm/boot/dts/imx6ul-geam.dts
..
..
@@ -1,43 +1,7 @@
1
+// SPDX-License-Identifier: GPL-2.0 OR X11
1
2
 /*
2
3
  * Copyright (C) 2016 Amarula Solutions B.V.
3
4
  * Copyright (C) 2016 Engicam S.r.l.
4
- *
5
- * This file is dual-licensed: you can use it either under the terms
6
- * of the GPL or the X11 license, at your option. Note that this dual
7
- * licensing only applies to this file, and not this project as a
8
- * whole.
9
- *
10
- *  a) This file is free software; you can redistribute it and/or
11
- *     modify it under the terms of the GNU General Public License
12
- *     version 2 as published by the Free Software Foundation.
13
- *
14
- *     This file is distributed in the hope that it will be useful,
15
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
16
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
17
- *     GNU General Public License for more details.
18
- *
19
- * Or, alternatively,
20
- *
21
- *  b) Permission is hereby granted, free of charge, to any person
22
- *     obtaining a copy of this software and associated documentation
23
- *     files (the "Software"), to deal in the Software without
24
- *     restriction, including without limitation the rights to use,
25
- *     copy, modify, merge, publish, distribute, sublicense, and/or
26
- *     sell copies of the Software, and to permit persons to whom the
27
- *     Software is furnished to do so, subject to the following
28
- *     conditions:
29
- *
30
- *     The above copyright notice and this permission notice shall be
31
- *     included in all copies or substantial portions of the Software.
32
- *
33
- *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
34
- *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
35
- *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
36
- *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
37
- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
38
- *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
39
- *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
40
- *     OTHER DEALINGS IN THE SOFTWARE.
41
5
  */
42
6
 
43
7
 /dts-v1/;
..
..
@@ -192,7 +156,7 @@
192
156
 };
193
157
 
194
158
 &i2c2 {
195
-	clock_frequency = <100000>;
159
+	clock-frequency = <100000>;
196
160
 	pinctrl-names = "default";
197
161
 	pinctrl-0 = <&pinctrl_i2c2>;
198
162
 	status = "okay";
..
..
@@ -205,7 +169,7 @@
205
169
 	display = <&display0>;
206
170
 	status = "okay";
207
171
 
208
-	display0: display {
172
+	display0: display0 {
209
173
 		bits-per-pixel = <16>;
210
174
 		bus-width = <18>;
211
175
 
..
..
@@ -231,6 +195,7 @@
231
195
 };
232
196
 
233
197
 &pwm8 {
198
+	#pwm-cells = <2>;
234
199
 	pinctrl-names = "default";
235
200
 	pinctrl-0 = <&pinctrl_pwm8>;
236
201
 	status = "okay";
..
..
@@ -329,7 +294,7 @@
329
294
 		>;
330
295
 	};
331
296
 
332
-	pinctrl_gpmi_nand: gpmi-nand {
297
+	pinctrl_gpmi_nand: gpminandgrp {
333
298
 		fsl,pins = <
334
299
 			MX6UL_PAD_NAND_CLE__RAWNAND_CLE         0xb0b1
335
300
 			MX6UL_PAD_NAND_ALE__RAWNAND_ALE         0xb0b1