update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/arch/arm64/boot/dts/rockchip/rk3567-evb2-lp4x-v10-dual-lvds.dts
similarity index 62%copy from kernel/arch/arm64/boot/dts/rockchip/rk3567-evb2-lp4x-v10-dual-lvds.dtscopy to kernel/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-two-vp-two-separate-single-channel-lvds.dts
..
..
@@ -3,20 +3,23 @@
3
3
  * Copyright (c) 2023 Rockchip Electronics Co., Ltd.
4
4
  */
5
5
 
6
-/dts-v1/;
7
-
8
6
 #include <dt-bindings/display/media-bus-format.h>
9
7
 #include <dt-bindings/gpio/gpio.h>
10
8
 #include <dt-bindings/pinctrl/rockchip.h>
11
-
12
-#include "rk3567-evb2-lp4x-v10.dtsi"
9
+#include "rk3568-evb1-ddr4-v10.dtsi"
13
10
 #include "rk3568-android.dtsi"
14
11
 
15
12
 / {
16
-	model = "Rockchip RK3567 EVB2 LP4X V10 Board";
17
-	compatible = "rockchip,rk3567-evb2-lp4x-v10", "rockchip,rk3567";
13
+	model = "Rockchip RK3568 EVB1 V10 Board with two vp two separate single channel lvds";
14
+	compatible = "rockchip,rk3568-evb1-ddr4-v10-two-vp-two-separate-single-channel-lvds", "rockchip,rk3568";
18
15
 
19
-	panel {
16
+	/**
17
+	 * VP1 -> LVDS0 -> Panel0
18
+	 * VP2 -> LVDS1 -> Panel1
19
+	 */
20
+
21
+	/* panel: claa070wp03xg */
22
+	panel-lvds0 {
20
23
 		compatible = "simple-panel";
21
24
 		backlight = <&backlight>;
22
25
 		power-supply = <&vcc3v3_lcd0_n>;
..
..
@@ -30,17 +33,16 @@
30
33
 
31
34
 		display-timings {
32
35
 			native-mode = <&timing0>;
33
-
34
36
 			timing0: timing0 {
35
-				clock-frequency = <134000000>;
36
-				hactive = <1600>;
37
+				clock-frequency = <67000000>;
38
+				hactive = <800>;
37
39
 				vactive = <1280>;
38
40
 				hback-porch = <60>;
39
41
 				hfront-porch = <60>;
40
42
 				vback-porch = <4>;
41
43
 				vfront-porch = <2>;
42
44
 				hsync-len = <8>;
43
-				vsync-len = <2>;
45
+				vsync-len = <8>;
44
46
 				hsync-active = <0>;
45
47
 				vsync-active = <0>;
46
48
 				de-active = <0>;
..
..
@@ -51,21 +53,52 @@
51
53
 		ports {
52
54
 			#address-cells = <1>;
53
55
 			#size-cells = <0>;
54
-
55
-			/**
56
-			 *  Panel <----> LVDS0
57
-			 *  Panel <----> LVDS1
58
-			 */
59
56
 			port@0 {
60
57
 				reg = <0>;
61
-				dual-lvds-left-pixels;
62
58
 				panel_in_lvds0: endpoint {
63
59
 					remote-endpoint = <&lvds0_out_panel>;
64
60
 				};
65
61
 			};
66
-			port@1 {
67
-				reg = <1>;
68
-				dual-lvds-right-pixels;
62
+		};
63
+	};
64
+
65
+	/* panel: claa070wp03xg */
66
+	panel-lvds1 {
67
+		compatible = "simple-panel";
68
+		backlight = <&backlight1>;
69
+		power-supply = <&vcc3v3_lcd1_n>;
70
+		enable-delay-ms = <20>;
71
+		prepare-delay-ms = <20>;
72
+		unprepare-delay-ms = <20>;
73
+		disable-delay-ms = <20>;
74
+		bus-format = <MEDIA_BUS_FMT_RGB666_1X7X3_SPWG>;
75
+		width-mm = <217>;
76
+		height-mm = <136>;
77
+
78
+		display-timings {
79
+			native-mode = <&timing1>;
80
+			timing1: timing1 {
81
+				clock-frequency = <67000000>;
82
+				hactive = <800>;
83
+				vactive = <1280>;
84
+				hback-porch = <60>;
85
+				hfront-porch = <60>;
86
+				vback-porch = <4>;
87
+				vfront-porch = <2>;
88
+				hsync-len = <8>;
89
+				vsync-len = <8>;
90
+				hsync-active = <0>;
91
+				vsync-active = <0>;
92
+				de-active = <0>;
93
+				pixelclk-active = <0>;
94
+			};
95
+		};
96
+
97
+		ports {
98
+			#address-cells = <1>;
99
+			#size-cells = <0>;
100
+			port@0 {
101
+				reg = <0>;
69
102
 				panel_in_lvds1: endpoint {
70
103
 					remote-endpoint = <&lvds1_out_panel>;
71
104
 				};
..
..
@@ -74,68 +107,14 @@
74
107
 	};
75
108
 };
76
109
 
77
-&backlight1 {
78
-	status = "okay";
79
-};
80
-
81
110
 &backlight {
82
111
 	status = "okay";
83
112
 };
84
113
 
85
-&lvds {
86
-	status = "okay";
87
-	dual-channel;
88
-
89
-	ports {
90
-		port@1 {
91
-			reg = <1>;
92
-			lvds0_out_panel: endpoint {
93
-				remote-endpoint = <&panel_in_lvds0>;
94
-			};
95
-		};
96
-	};
97
-};
98
-
99
-&lvds1 {
100
-	status = "okay";
101
-
102
-	ports {
103
-		port@1 {
104
-			reg = <1>;
105
-			lvds1_out_panel: endpoint {
106
-				remote-endpoint = <&panel_in_lvds1>;
107
-			};
108
-		};
109
-	};
110
-};
111
-
112
-&lvds_in_vp1 {
114
+&backlight1 {
113
115
 	status = "okay";
114
116
 };
115
117
 
116
-&lvds1_in_vp1 {
117
-	status = "disabled";
118
-};
119
-
120
-&lvds1_in_vp2 {
121
-	status = "okay";
122
-};
123
-
124
-/* enable hdmi */
125
-&hdmi_in_vp1 {
126
-	status = "okay";
127
-};
128
-
129
-/* enable video phy */
130
-&video_phy0 {
131
-	status = "okay";
132
-};
133
-
134
-&video_phy1 {
135
-	status = "okay";
136
-};
137
-
138
-/* disable other encoder output */
139
118
 &dsi0 {
140
119
 	status = "disabled";
141
120
 };
..
..
@@ -156,10 +135,49 @@
156
135
 	status = "disabled";
157
136
 };
158
137
 
159
-&rgb_in_vp2 {
138
+&hdmi_in_vp1 {
139
+	status = "okay";
140
+};
141
+
142
+&lvds0 {
143
+	status = "okay";
144
+	ports {
145
+		port@1 {
146
+			reg = <1>;
147
+			lvds0_out_panel: endpoint {
148
+				remote-endpoint = <&panel_in_lvds0>;
149
+			};
150
+		};
151
+	};
152
+};
153
+
154
+&lvds0_in_vp1 {
155
+	status = "okay";
156
+};
157
+
158
+&lvds1 {
159
+	status = "okay";
160
+	ports {
161
+		port@1 {
162
+			reg = <1>;
163
+			lvds1_out_panel: endpoint {
164
+				remote-endpoint = <&panel_in_lvds1>;
165
+			};
166
+		};
167
+	};
168
+};
169
+
170
+&lvds1_in_vp1 {
160
171
 	status = "disabled";
161
172
 };
162
173
 
174
+&lvds1_in_vp2 {
175
+	status = "okay";
176
+};
177
+
178
+&rgb_in_vp2 {
179
+	status = "disabled";
180
+};
163
181
 
164
182
 &vcc3v3_lcd0_n {
165
183
 	gpio = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>;
..
..
@@ -170,3 +188,11 @@
170
188
 	gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
171
189
 	enable-active-high;
172
190
 };
191
+
192
+&video_phy0 {
193
+	status = "okay";
194
+};
195
+
196
+&video_phy1 {
197
+	status = "okay";
198
+};