kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/arch/arm64/boot/dts/renesas/salvator-common.dtsi
..
..
@@ -29,16 +29,20 @@
29
29
  */
30
30
 
31
31
 #include <dt-bindings/gpio/gpio.h>
32
+#include <dt-bindings/input/input.h>
32
33
 
33
34
 / {
34
35
 	aliases {
35
36
 		serial0 = &scif2;
36
37
 		serial1 = &hscif1;
37
38
 		ethernet0 = &avb;
39
+		mmc0 = &sdhi2;
40
+		mmc1 = &sdhi0;
41
+		mmc2 = &sdhi3;
38
42
 	};
39
43
 
40
44
 	chosen {
41
-		bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";
45
+		bootargs = "ignore_loglevel rw root=/dev/nfs ip=on";
42
46
 		stdout-path = "serial0:115200n8";
43
47
 	};
44
48
 
..
..
@@ -83,6 +87,85 @@
83
87
 			hdmi_in_con: endpoint {
84
88
 				remote-endpoint = <&adv7482_hdmi>;
85
89
 			};
90
+		};
91
+	};
92
+
93
+	hdmi0-out {
94
+		compatible = "hdmi-connector";
95
+		label = "HDMI0 OUT";
96
+		type = "a";
97
+
98
+		port {
99
+			hdmi0_con: endpoint {
100
+			};
101
+		};
102
+	};
103
+
104
+	hdmi1-out {
105
+		compatible = "hdmi-connector";
106
+		label = "HDMI1 OUT";
107
+		type = "a";
108
+
109
+		port {
110
+			hdmi1_con: endpoint {
111
+			};
112
+		};
113
+	};
114
+
115
+	keys {
116
+		compatible = "gpio-keys";
117
+
118
+		pinctrl-0 = <&keys_pins>;
119
+		pinctrl-names = "default";
120
+
121
+		key-1 {
122
+			gpios = <&gpio5 17 GPIO_ACTIVE_LOW>;
123
+			linux,code = <KEY_1>;
124
+			label = "SW4-1";
125
+			wakeup-source;
126
+			debounce-interval = <20>;
127
+		};
128
+		key-2 {
129
+			gpios = <&gpio5 20 GPIO_ACTIVE_LOW>;
130
+			linux,code = <KEY_2>;
131
+			label = "SW4-2";
132
+			wakeup-source;
133
+			debounce-interval = <20>;
134
+		};
135
+		key-3 {
136
+			gpios = <&gpio5 22 GPIO_ACTIVE_LOW>;
137
+			linux,code = <KEY_3>;
138
+			label = "SW4-3";
139
+			wakeup-source;
140
+			debounce-interval = <20>;
141
+		};
142
+		key-4 {
143
+			gpios = <&gpio5 23 GPIO_ACTIVE_LOW>;
144
+			linux,code = <KEY_4>;
145
+			label = "SW4-4";
146
+			wakeup-source;
147
+			debounce-interval = <20>;
148
+		};
149
+		key-a {
150
+			gpios = <&gpio6 11 GPIO_ACTIVE_LOW>;
151
+			linux,code = <KEY_A>;
152
+			label = "TSW0";
153
+			wakeup-source;
154
+			debounce-interval = <20>;
155
+		};
156
+		key-b {
157
+			gpios = <&gpio6 12 GPIO_ACTIVE_LOW>;
158
+			linux,code = <KEY_B>;
159
+			label = "TSW1";
160
+			wakeup-source;
161
+			debounce-interval = <20>;
162
+		};
163
+		key-c {
164
+			gpios = <&gpio6 13 GPIO_ACTIVE_LOW>;
165
+			linux,code = <KEY_C>;
166
+			label = "TSW2";
167
+			wakeup-source;
168
+			debounce-interval = <20>;
86
169
 		};
87
170
 	};
88
171
 
..
..
@@ -152,8 +235,7 @@
152
235
 
153
236
 		gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;
154
237
 		gpios-states = <1>;
155
-		states = <3300000 1
156
-			  1800000 0>;
238
+		states = <3300000 1>, <1800000 0>;
157
239
 	};
158
240
 
159
241
 	vcc_sdhi3: regulator-vcc-sdhi3 {
..
..
@@ -176,30 +258,7 @@
176
258
 
177
259
 		gpios = <&gpio3 14 GPIO_ACTIVE_HIGH>;
178
260
 		gpios-states = <1>;
179
-		states = <3300000 1
180
-			  1800000 0>;
181
-	};
182
-
183
-	hdmi0-out {
184
-		compatible = "hdmi-connector";
185
-		label = "HDMI0 OUT";
186
-		type = "a";
187
-
188
-		port {
189
-			hdmi0_con: endpoint {
190
-			};
191
-		};
192
-	};
193
-
194
-	hdmi1-out {
195
-		compatible = "hdmi-connector";
196
-		label = "HDMI1 OUT";
197
-		type = "a";
198
-
199
-		port {
200
-			hdmi1_con: endpoint {
201
-			};
202
-		};
261
+		states = <3300000 1>, <1800000 0>;
203
262
 	};
204
263
 
205
264
 	vga {
..
..
@@ -404,20 +463,6 @@
404
463
 		#gpio-cells = <2>;
405
464
 	};
406
465
 
407
-	csa_vdd: adc@7c {
408
-		compatible = "maxim,max9611";
409
-		reg = <0x7c>;
410
-
411
-		shunt-resistor-micro-ohms = <5000>;
412
-	};
413
-
414
-	csa_dvfs: adc@7f {
415
-		compatible = "maxim,max9611";
416
-		reg = <0x7f>;
417
-
418
-		shunt-resistor-micro-ohms = <5000>;
419
-	};
420
-
421
466
 	video-receiver@70 {
422
467
 		compatible = "adi,adv7482";
423
468
 		reg = <0x70 0x71 0x72 0x73 0x74 0x75
..
..
@@ -469,10 +514,26 @@
469
514
 			};
470
515
 		};
471
516
 	};
517
+
518
+	csa_vdd: adc@7c {
519
+		compatible = "maxim,max9611";
520
+		reg = <0x7c>;
521
+
522
+		shunt-resistor-micro-ohms = <5000>;
523
+	};
524
+
525
+	csa_dvfs: adc@7f {
526
+		compatible = "maxim,max9611";
527
+		reg = <0x7f>;
528
+
529
+		shunt-resistor-micro-ohms = <5000>;
530
+	};
472
531
 };
473
532
 
474
533
 &i2c_dvfs {
475
534
 	status = "okay";
535
+
536
+	clock-frequency = <400000>;
476
537
 
477
538
 	pmic: pmic@30 {
478
539
 		pinctrl-0 = <&irq0_pins>;
..
..
@@ -570,6 +631,11 @@
570
631
 		function = "intc_ex";
571
632
 	};
572
633
 
634
+	keys_pins: keys {
635
+		pins = "GP_5_17", "GP_5_20", "GP_5_22";
636
+		bias-pull-up;
637
+	};
638
+
573
639
 	pwm1_pins: pwm1 {
574
640
 		groups = "pwm1_a";
575
641
 		function = "pwm1";
..
..
@@ -603,12 +669,6 @@
603
669
 	};
604
670
 
605
671
 	sdhi2_pins: sd2 {
606
-		groups = "sdhi2_data8", "sdhi2_ctrl", "sdhi2_ds";
607
-		function = "sdhi2";
608
-		power-source = <3300>;
609
-	};
610
-
611
-	sdhi2_pins_uhs: sd2_uhs {
612
672
 		groups = "sdhi2_data8", "sdhi2_ctrl", "sdhi2_ds";
613
673
 		function = "sdhi2";
614
674
 		power-source = <1800>;
..
..
@@ -705,7 +765,10 @@
705
765
 		 <&cpg CPG_CORE CPG_AUDIO_CLK_I>;
706
766
 
707
767
 	ports {
768
+		#address-cells = <1>;
769
+		#size-cells = <0>;
708
770
 		rsnd_port0: port@0 {
771
+			reg = <0>;
709
772
 			rsnd_endpoint0: endpoint {
710
773
 				remote-endpoint = <&ak4613_endpoint>;
711
774
 
..
..
@@ -718,6 +781,11 @@
718
781
 			};
719
782
 		};
720
783
 	};
784
+};
785
+
786
+&rwdt {
787
+	timeout-sec = <60>;
788
+	status = "okay";
721
789
 };
722
790
 
723
791
 &scif1 {
..
..
@@ -751,21 +819,24 @@
751
819
 	wp-gpios = <&gpio3 13 GPIO_ACTIVE_HIGH>;
752
820
 	bus-width = <4>;
753
821
 	sd-uhs-sdr50;
822
+	sd-uhs-sdr104;
754
823
 	status = "okay";
755
824
 };
756
825
 
757
826
 &sdhi2 {
758
827
 	/* used for on-board 8bit eMMC */
759
828
 	pinctrl-0 = <&sdhi2_pins>;
760
-	pinctrl-1 = <&sdhi2_pins_uhs>;
829
+	pinctrl-1 = <&sdhi2_pins>;
761
830
 	pinctrl-names = "default", "state_uhs";
762
831
 
763
832
 	vmmc-supply = <&reg_3p3v>;
764
833
 	vqmmc-supply = <&reg_1p8v>;
765
834
 	bus-width = <8>;
766
835
 	mmc-hs200-1_8v;
836
+	mmc-hs400-1_8v;
767
837
 	non-removable;
768
838
 	fixed-emmc-driver-type = <1>;
839
+	full-pwr-cycle-in-suspend;
769
840
 	status = "okay";
770
841
 };
771
842
 
..
..
@@ -780,6 +851,7 @@
780
851
 	wp-gpios = <&gpio4 16 GPIO_ACTIVE_HIGH>;
781
852
 	bus-width = <4>;
782
853
 	sd-uhs-sdr50;
854
+	sd-uhs-sdr104;
783
855
 	status = "okay";
784
856
 };
785
857
 
..
..
@@ -809,6 +881,8 @@
809
881
 &usb3_peri0 {
810
882
 	phys = <&usb3_phy0>;
811
883
 	phy-names = "usb";
884
+
885
+	companion = <&xhci0>;
812
886
 
813
887
 	status = "okay";
814
888
 };
..
..
@@ -850,11 +924,6 @@
850
924
 };
851
925
 
852
926
 &vin7 {
853
-	status = "okay";
854
-};
855
-
856
-&rwdt {
857
-	timeout-sec = <60>;
858
927
 	status = "okay";
859
928
 };
860
929