forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390 
 kernel/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi
....@@ -1,43 +1,7 @@
1
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
12 /*
2
- * Copyright (c) 2016 Fuzhou Rockchip Electronics Co., Ltd
3
+ * Copyright (c) 2022 Rockchip Electronics Co., Ltd.
34  *
4
- * This file is dual-licensed: you can use it either under the terms
5
- * of the GPL or the X11 license, at your option. Note that this dual
6
- * licensing only applies to this file, and not this project as a
7
- * whole.
8
- *
9
- *  a) This file is free software; you can redistribute it and/or
10
- *     modify it under the terms of the GNU General Public License as
11
- *     published by the Free Software Foundation; either version 2 of the
12
- *     License, or (at your option) any later version.
13
- *
14
- *     This file is distributed in the hope that it will be useful,
15
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
16
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
17
- *     GNU General Public License for more details.
18
- *
19
- * Or, alternatively,
20
- *
21
- *  b) Permission is hereby granted, free of charge, to any person
22
- *     obtaining a copy of this software and associated documentation
23
- *     files (the "Software"), to deal in the Software without
24
- *     restriction, including without limitation the rights to use,
25
- *     copy, modify, merge, publish, distribute, sublicense, and/or
26
- *     sell copies of the Software, and to permit persons to whom the
27
- *     Software is furnished to do so, subject to the following
28
- *     conditions:
29
- *
30
- *     The above copyright notice and this permission notice shall be
31
- *     included in all copies or substantial portions of the Software.
32
- *
33
- *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
34
- *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
35
- *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
36
- *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
37
- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
38
- *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
39
- *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
40
- *     OTHER DEALINGS IN THE SOFTWARE.
415  */
426 
437 #include <dt-bindings/display/drm_mipi_dsi.h>
....@@ -58,11 +22,21 @@
5822 		nvmem-cell-names = "id";
5923 	};
6024 
25
+	debug: debug {
26
+		compatible = "rockchip,debug";
27
+		reg = <0x0 0xfe430000 0x0 0x1000>,
28
+		      <0x0 0xfe432000 0x0 0x1000>,
29
+		      <0x0 0xfe434000 0x0 0x1000>,
30
+		      <0x0 0xfe436000 0x0 0x1000>,
31
+		      <0x0 0xfe610000 0x0 0x1000>,
32
+		      <0x0 0xfe710000 0x0 0x1000>;
33
+	};
34
+
6135 	fiq_debugger: fiq-debugger {
6236 		compatible = "rockchip,fiq-debugger";
6337 		rockchip,serial-id = <2>;
6438 		rockchip,wake-irq = <0>;
65
-		rockchip,irq-mode-enable = <0>;  /* If enable uart uses irq instead of fiq */
39
+		rockchip,irq-mode-enable = <1>;  /* If enable uart uses irq instead of fiq */
6640 		rockchip,baudrate = <1500000>;  /* Only 115200 and 1500000 */
6741 		pinctrl-names = "default";
6842 		pinctrl-0 = <&uart2c_xfer>;
....@@ -76,6 +50,11 @@
7650 
7751 		drm_logo: drm-logo@00000000 {
7852 			compatible = "rockchip,drm-logo";
53
+			reg = <0x0 0x0 0x0 0x0>;
54
+		};
55
+
56
+		vendor_storage_rm: vendor-storage-rm@00000000 {
57
+			compatible = "rockchip,vendor-storage-rm";
7958 			reg = <0x0 0x0 0x0 0x0>;
8059 		};
8160 
....@@ -115,6 +94,12 @@
11594 		};
11695 	};
11796 
97
+	vendor_storage: vendor-storage {
98
+		compatible = "rockchip,ram-vendor-storage";
99
+		memory-region = <&vendor_storage_rm>;
100
+		status = "okay";
101
+	};
102
+
118103 	rga: rga@ff680000 {
119104 		compatible = "rockchip,rga2";
120105 		dev_mode = <1>;
....@@ -135,6 +120,11 @@
135120 
136121 	firmware {
137122 		firmware_android: android {};
123
+
124
+		optee: optee {
125
+			compatible = "linaro,optee-tz";
126
+			method = "smc";
127
+		};
138128 	};
139129 };
140130 
....@@ -255,7 +245,7 @@
255245 	status = "okay";
256246 };
257247 
258
-&rkvdec_mmu {
248
+&vdec_mmu {
259249 	status = "okay";
260250 };
261251