forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d 
 kernel/arch/arm/boot/dts/r8a7793-gose.dts
....@@ -49,10 +49,13 @@
4949 		i2c10 = &gpioi2c4;
5050 		i2c11 = &i2chdmi;
5151 		i2c12 = &i2cexio4;
52
+		mmc0 = &sdhi0;
53
+		mmc1 = &sdhi1;
54
+		mmc2 = &sdhi2;
5255 	};
5356 
5457 	chosen {
55
-		bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";
58
+		bootargs = "ignore_loglevel rw root=/dev/nfs ip=on";
5659 		stdout-path = "serial0:115200n8";
5760 	};
5861 
....@@ -65,81 +68,81 @@
6568 		compatible = "gpio-keys";
6669 
6770 		key-1 {
68
-		        gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
69
-		        linux,code = <KEY_1>;
70
-		        label = "SW2-1";
71
-		        wakeup-source;
72
-		        debounce-interval = <20>;
71
+			gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
72
+			linux,code = <KEY_1>;
73
+			label = "SW2-1";
74
+			wakeup-source;
75
+			debounce-interval = <20>;
7376 		};
7477 		key-2 {
75
-		        gpios = <&gpio5 1 GPIO_ACTIVE_LOW>;
76
-		        linux,code = <KEY_2>;
77
-		        label = "SW2-2";
78
-		        wakeup-source;
79
-		        debounce-interval = <20>;
78
+			gpios = <&gpio5 1 GPIO_ACTIVE_LOW>;
79
+			linux,code = <KEY_2>;
80
+			label = "SW2-2";
81
+			wakeup-source;
82
+			debounce-interval = <20>;
8083 		};
8184 		key-3 {
82
-		        gpios = <&gpio5 2 GPIO_ACTIVE_LOW>;
83
-		        linux,code = <KEY_3>;
84
-		        label = "SW2-3";
85
-		        wakeup-source;
86
-		        debounce-interval = <20>;
85
+			gpios = <&gpio5 2 GPIO_ACTIVE_LOW>;
86
+			linux,code = <KEY_3>;
87
+			label = "SW2-3";
88
+			wakeup-source;
89
+			debounce-interval = <20>;
8790 		};
8891 		key-4 {
89
-		        gpios = <&gpio5 3 GPIO_ACTIVE_LOW>;
90
-		        linux,code = <KEY_4>;
91
-		        label = "SW2-4";
92
-		        wakeup-source;
93
-		        debounce-interval = <20>;
92
+			gpios = <&gpio5 3 GPIO_ACTIVE_LOW>;
93
+			linux,code = <KEY_4>;
94
+			label = "SW2-4";
95
+			wakeup-source;
96
+			debounce-interval = <20>;
9497 		};
9598 		key-a {
96
-		        gpios = <&gpio7 0 GPIO_ACTIVE_LOW>;
97
-		        linux,code = <KEY_A>;
98
-		        label = "SW30";
99
-		        wakeup-source;
100
-		        debounce-interval = <20>;
99
+			gpios = <&gpio7 0 GPIO_ACTIVE_LOW>;
100
+			linux,code = <KEY_A>;
101
+			label = "SW30";
102
+			wakeup-source;
103
+			debounce-interval = <20>;
101104 		};
102105 		key-b {
103
-		        gpios = <&gpio7 1 GPIO_ACTIVE_LOW>;
104
-		        linux,code = <KEY_B>;
105
-		        label = "SW31";
106
-		        wakeup-source;
107
-		        debounce-interval = <20>;
106
+			gpios = <&gpio7 1 GPIO_ACTIVE_LOW>;
107
+			linux,code = <KEY_B>;
108
+			label = "SW31";
109
+			wakeup-source;
110
+			debounce-interval = <20>;
108111 		};
109112 		key-c {
110
-		        gpios = <&gpio7 2 GPIO_ACTIVE_LOW>;
111
-		        linux,code = <KEY_C>;
112
-		        label = "SW32";
113
-		        wakeup-source;
114
-		        debounce-interval = <20>;
113
+			gpios = <&gpio7 2 GPIO_ACTIVE_LOW>;
114
+			linux,code = <KEY_C>;
115
+			label = "SW32";
116
+			wakeup-source;
117
+			debounce-interval = <20>;
115118 		};
116119 		key-d {
117
-		        gpios = <&gpio7 3 GPIO_ACTIVE_LOW>;
118
-		        linux,code = <KEY_D>;
119
-		        label = "SW33";
120
-		        wakeup-source;
121
-		        debounce-interval = <20>;
120
+			gpios = <&gpio7 3 GPIO_ACTIVE_LOW>;
121
+			linux,code = <KEY_D>;
122
+			label = "SW33";
123
+			wakeup-source;
124
+			debounce-interval = <20>;
122125 		};
123126 		key-e {
124
-		        gpios = <&gpio7 4 GPIO_ACTIVE_LOW>;
125
-		        linux,code = <KEY_E>;
126
-		        label = "SW34";
127
-		        wakeup-source;
128
-		        debounce-interval = <20>;
127
+			gpios = <&gpio7 4 GPIO_ACTIVE_LOW>;
128
+			linux,code = <KEY_E>;
129
+			label = "SW34";
130
+			wakeup-source;
131
+			debounce-interval = <20>;
129132 		};
130133 		key-f {
131
-		        gpios = <&gpio7 5 GPIO_ACTIVE_LOW>;
132
-		        linux,code = <KEY_F>;
133
-		        label = "SW35";
134
-		        wakeup-source;
135
-		        debounce-interval = <20>;
134
+			gpios = <&gpio7 5 GPIO_ACTIVE_LOW>;
135
+			linux,code = <KEY_F>;
136
+			label = "SW35";
137
+			wakeup-source;
138
+			debounce-interval = <20>;
136139 		};
137140 		key-g {
138
-		        gpios = <&gpio7 6 GPIO_ACTIVE_LOW>;
139
-		        linux,code = <KEY_G>;
140
-		        label = "SW36";
141
-		        wakeup-source;
142
-		        debounce-interval = <20>;
141
+			gpios = <&gpio7 6 GPIO_ACTIVE_LOW>;
142
+			linux,code = <KEY_G>;
143
+			label = "SW36";
144
+			wakeup-source;
145
+			debounce-interval = <20>;
143146 		};
144147 	};
145148 
....@@ -179,8 +182,7 @@
179182 
180183 		gpios = <&gpio2 12 GPIO_ACTIVE_HIGH>;
181184 		gpios-states = <1>;
182
-		states = <3300000 1
183
-			  1800000 0>;
185
+		states = <3300000 1>, <1800000 0>;
184186 	};
185187 
186188 	vcc_sdhi1: regulator-vcc-sdhi1 {
....@@ -203,8 +205,7 @@
203205 
204206 		gpios = <&gpio2 13 GPIO_ACTIVE_HIGH>;
205207 		gpios-states = <1>;
206
-		states = <3300000 1
207
-			  1800000 0>;
208
+		states = <3300000 1>, <1800000 0>;
208209 	};
209210 
210211 	vcc_sdhi2: regulator-vcc-sdhi2 {
....@@ -227,8 +228,7 @@
227228 
228229 		gpios = <&gpio2 26 GPIO_ACTIVE_HIGH>;
229230 		gpios-states = <1>;
230
-		states = <3300000 1
231
-			  1800000 0>;
231
+		states = <3300000 1>, <1800000 0>;
232232 	};
233233 
234234 	audio_clock: audio_clock {
....@@ -337,7 +337,6 @@
337337 		composite-in@20 {
338338 			compatible = "adi,adv7180cp";
339339 			reg = <0x20>;
340
-			remote = <&vin1>;
341340 
342341 			ports {
343342 				#address-cells = <1>;
....@@ -369,8 +368,6 @@
369368 			adi,input-depth = <8>;
370369 			adi,input-colorspace = "rgb";
371370 			adi,input-clock = "1x";
372
-			adi,input-style = <1>;
373
-			adi,input-justification = "evenly";
374371 
375372 			ports {
376373 				#address-cells = <1>;
....@@ -514,6 +511,11 @@
514511 		function = "intc";
515512 	};
516513 
514
+	pmic_irq_pins: pmicirq {
515
+		groups = "intc_irq2";
516
+		function = "intc";
517
+	};
518
+
517519 	sdhi0_pins: sd0 {
518520 		groups = "sdhi0_data4", "sdhi0_ctrl";
519521 		function = "sdhi0";
....@@ -589,11 +591,16 @@
589591 		interrupt-parent = <&irqc0>;
590592 		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
591593 		micrel,led-mode = <1>;
594
+		reset-gpios = <&gpio5 22 GPIO_ACTIVE_LOW>;
592595 	};
593596 };
594597 
595598 &cmt0 {
596599 	status = "okay";
600
+};
601
+
602
+&cpu0 {
603
+	cpu0-supply = <&vdd_dvfs>;
597604 };
598605 
599606 &rwdt {
....@@ -707,6 +714,8 @@
707714 };
708715 
709716 &i2c6 {
717
+	pinctrl-names = "default";
718
+	pinctrl-0 = <&pmic_irq_pins>;
710719 	status = "okay";
711720 	clock-frequency = <100000>;
712721 
....@@ -725,6 +734,18 @@
725734 			compatible = "dlg,da9063-watchdog";
726735 		};
727736 	};
737
+
738
+	vdd_dvfs: regulator@68 {
739
+		compatible = "dlg,da9210";
740
+		reg = <0x68>;
741
+		interrupt-parent = <&irqc0>;
742
+		interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
743
+
744
+		regulator-min-microvolt = <1000000>;
745
+		regulator-max-microvolt = <1000000>;
746
+		regulator-boot-on;
747
+		regulator-always-on;
748
+	};
728749 };
729750 
730751 &i2c4 {