kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/arch/arm/boot/dts/ste-hrefv60plus-stuib.dts
..
..
@@ -1,17 +1,12 @@
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
  * Device Tree for the HREF version 60 or later with the ST UIB
12
6
  */
13
7
 
14
8
 /dts-v1/;
9
+#include "ste-db8500.dtsi"
15
10
 #include "ste-hrefv60plus.dtsi"
16
11
 #include "ste-href-stuib.dtsi"
17
12
 
..
..
@@ -19,24 +14,21 @@
19
14
 	model = "ST-Ericsson HREF (v60+) and ST UIB";
20
15
 	compatible = "st-ericsson,hrefv60+", "st-ericsson,u8500";
21
16
 
22
-	/* This stablilizes the serial port enumeration */
23
-	aliases {
24
-		serial0 = &ux500_serial0;
25
-		serial1 = &ux500_serial1;
26
-		serial2 = &ux500_serial2;
27
-	};
28
-
29
17
 	soc {
30
18
 		/* Reset line for the BU21013 touchscreen */
31
19
 		i2c@80110000 {
32
20
 			/* Only one of these will be used */
33
21
 			bu21013_tp@5c {
34
-				touch-gpio = <&gpio2 20 0x4>;
35
-				reset-gpio = <&gpio4 17 0x4>;
22
+				interrupt-parent = <&gpio2>;
23
+				interrupts = <20 IRQ_TYPE_LEVEL_LOW>;
24
+				touch-gpios = <&gpio2 20 GPIO_ACTIVE_LOW>;
25
+				reset-gpios = <&gpio4 17 GPIO_LINE_OPEN_DRAIN>;
36
26
 			};
37
27
 			bu21013_tp@5d {
38
-				touch-gpio = <&gpio2 20 0x4>;
39
-				reset-gpio = <&gpio4 17 0x4>;
28
+				interrupt-parent = <&gpio2>;
29
+				interrupts = <20 IRQ_TYPE_LEVEL_LOW>;
30
+				touch-gpios = <&gpio2 20 GPIO_ACTIVE_LOW>;
31
+				reset-gpios = <&gpio4 17 GPIO_LINE_OPEN_DRAIN>;
40
32
 			};
41
33
 		};
42
34
 	};