change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/arch/arm/boot/dts/rk3288-veyron.dtsi
..
..
@@ -10,6 +10,10 @@
10
10
 #include "rk3288.dtsi"
11
11
 
12
12
 / {
13
+	chosen {
14
+		stdout-path = "serial2:115200n8";
15
+	};
16
+
13
17
 	/*
14
18
 	 * The default coreboot on veyron devices ignores memory@0 nodes
15
19
 	 * and would instead create another memory node.
..
..
@@ -19,13 +23,12 @@
19
23
 		reg = <0x0 0x0 0x0 0x80000000>;
20
24
 	};
21
25
 
22
-	gpio_keys: gpio-keys {
23
-		compatible = "gpio-keys";
24
-		#address-cells = <1>;
25
-		#size-cells = <0>;
26
26
 
27
+	power_button: power-button {
28
+		compatible = "gpio-keys";
27
29
 		pinctrl-names = "default";
28
30
 		pinctrl-0 = <&pwr_key_l>;
31
+
29
32
 		power {
30
33
 			label = "Power";
31
34
 			gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
..
..
@@ -55,11 +58,13 @@
55
58
 		clocks = <&rk808 RK808_CLKOUT1>;
56
59
 		clock-names = "ext_clock";
57
60
 		pinctrl-names = "default";
58
-		pinctrl-0 = <&bt_enable_l>, <&wifi_enable_h>;
61
+		pinctrl-0 = <&wifi_enable_h>;
59
62
 
60
63
 		/*
61
-		 * On the module itself this is one of these (depending
62
-		 * on the actual card populated):
64
+		 * Depending on the actual card populated GPIO4 D4
65
+		 * correspond to one of these signals on the module:
66
+		 *
67
+		 * D4:
63
68
 		 * - SDIO_RESET_L_WL_REG_ON
64
69
 		 * - PDN (power down when low)
65
70
 		 */
..
..
@@ -91,10 +96,31 @@
91
96
 		regulator-boot-on;
92
97
 		vin-supply = <&vcc_5v>;
93
98
 	};
99
+
100
+	vdd_logic: vdd-logic {
101
+		compatible = "pwm-regulator";
102
+		regulator-name = "vdd_logic";
103
+
104
+		pwms = <&pwm1 0 1994 0>;
105
+		pwm-supply = <&vcc33_sys>;
106
+
107
+		pwm-dutycycle-range = <0x7b 0>;
108
+		pwm-dutycycle-unit = <0x94>;
109
+
110
+		regulator-always-on;
111
+		regulator-boot-on;
112
+		regulator-min-microvolt = <950000>;
113
+		regulator-max-microvolt = <1350000>;
114
+		regulator-ramp-delay = <4000>;
115
+	};
94
116
 };
95
117
 
96
118
 &cpu0 {
97
119
 	cpu0-supply = <&vdd_cpu>;
120
+};
121
+
122
+&cpu_crit {
123
+	temperature = <100000>;
98
124
 };
99
125
 
100
126
 /* rk3288-c used in Veyron Chrome-devices has slightly changed OPPs */
..
..
@@ -136,8 +162,18 @@
136
162
 	status = "okay";
137
163
 };
138
164
 
165
+&gpu_alert0 {
166
+	temperature = <72500>;
167
+};
168
+
169
+&gpu_crit {
170
+	temperature = <100000>;
171
+};
172
+
139
173
 &hdmi {
140
-	ddc-i2c-bus = <&i2c5>;
174
+	pinctrl-names = "default", "unwedge";
175
+	pinctrl-0 = <&hdmi_ddc>;
176
+	pinctrl-1 = <&hdmi_ddc_unwedge>;
141
177
 	status = "okay";
142
178
 };
143
179
 
..
..
@@ -191,8 +227,7 @@
191
227
 				regulator-max-microvolt = <1250000>;
192
228
 				regulator-ramp-delay = <6001>;
193
229
 				regulator-state-mem {
194
-					regulator-on-in-suspend;
195
-					regulator-suspend-microvolt = <1000000>;
230
+					regulator-off-in-suspend;
196
231
 				};
197
232
 			};
198
233
 
..
..
@@ -309,14 +344,6 @@
309
344
 	i2c-scl-rising-time-ns = <300>;		/* 225ns measured */
310
345
 };
311
346
 
312
-&i2c5 {
313
-	status = "okay";
314
-
315
-	clock-frequency = <100000>;
316
-	i2c-scl-falling-time-ns = <300>;
317
-	i2c-scl-rising-time-ns = <1000>;
318
-};
319
-
320
347
 &io_domains {
321
348
 	status = "okay";
322
349
 
..
..
@@ -369,14 +396,11 @@
369
396
 
370
397
 	rockchip,hw-tshut-mode = <1>; /* tshut mode 0:CRU 1:GPIO */
371
398
 	rockchip,hw-tshut-polarity = <1>; /* tshut polarity 0:LOW 1:HIGH */
399
+	rockchip,hw-tshut-temp = <125000>;
372
400
 };
373
401
 
374
402
 &uart0 {
375
403
 	status = "okay";
376
-
377
-	/* We need to go faster than 24MHz, so adjust clock parents / rates */
378
-	assigned-clocks = <&cru SCLK_UART0>;
379
-	assigned-clock-rates = <48000000>;
380
404
 
381
405
 	/* Pins don't include flow control by default; add that in */
382
406
 	pinctrl-names = "default";
..
..
@@ -403,6 +427,7 @@
403
427
 
404
428
 &usb_host1 {
405
429
 	status = "okay";
430
+	snps,need-phy-for-wake;
406
431
 };
407
432
 
408
433
 &usb_otg {
..
..
@@ -411,6 +436,7 @@
411
436
 	assigned-clocks = <&cru SCLK_USBPHY480M_SRC>;
412
437
 	assigned-clock-parents = <&usbphy0>;
413
438
 	dr_mode = "host";
439
+	snps,need-phy-for-wake;
414
440
 };
415
441
 
416
442
 &vopb {
..
..
@@ -426,16 +452,6 @@
426
452
 };
427
453
 
428
454
 &pinctrl {
429
-	pinctrl-names = "default", "sleep";
430
-	pinctrl-0 = <
431
-		/* Common for sleep and wake, but no owners */
432
-		&global_pwroff
433
-	>;
434
-	pinctrl-1 = <
435
-		/* Common for sleep and wake, but no owners */
436
-		&global_pwroff
437
-	>;
438
-
439
455
 	pcfg_pull_none_drv_8ma: pcfg-pull-none-drv-8ma {
440
456
 		bias-disable;
441
457
 		drive-strength = <8>;
..
..
@@ -517,6 +533,14 @@
517
533
 			rockchip,pins = <4 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
518
534
 		};
519
535
 
536
+		bt_host_wake: bt-host-wake {
537
+			rockchip,pins = <4 RK_PD7 RK_FUNC_GPIO &pcfg_pull_down>;
538
+		};
539
+
540
+		bt_host_wake_l: bt-host-wake-l {
541
+			rockchip,pins = <4 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>;
542
+		};
543
+
520
544
 		/*
521
545
 		 * We run sdio0 at max speed; bump up drive strength.
522
546
 		 * We also have external pulls, so disable the internal ones.
..
..
@@ -535,6 +559,24 @@
535
559
 		sdio0_clk: sdio0-clk {
536
560
 			rockchip,pins = <4 RK_PD1 1 &pcfg_pull_none_drv_8ma>;
537
561
 		};
562
+
563
+		/*
564
+		 * These pins are only present on very new veyron boards; on
565
+		 * older boards bt_dev_wake is simply always high.  Note that
566
+		 * gpio4_D2 is a NC on old veyron boards, so it doesn't hurt
567
+		 * to map this pin everywhere
568
+		 */
569
+		bt_dev_wake_sleep: bt-dev-wake-sleep {
570
+			rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_output_low>;
571
+		};
572
+
573
+		bt_dev_wake_awake: bt-dev-wake-awake {
574
+			rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_output_high>;
575
+		};
576
+
577
+		bt_dev_wake: bt-dev-wake {
578
+			rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
579
+		};
538
580
 	};
539
581
 
540
582
 	tpm {