add audio

hc

2023-12-11 1f93a7dfd1f8d5ff7a5c53246c7534fe2332d6f4

 kernel/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi
..
..
@@ -1,43 +1,7 @@
1
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
1
2
 /*
2
- * Copyright (c) 2016 Fuzhou Rockchip Electronics Co., Ltd
3
+ * Copyright (c) 2022 Rockchip Electronics Co., Ltd.
3
4
  *
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.
41
5
  */
42
6
 
43
7
 #include <dt-bindings/display/drm_mipi_dsi.h>
..
..
@@ -62,7 +26,7 @@
62
26
 		compatible = "rockchip,fiq-debugger";
63
27
 		rockchip,serial-id = <2>;
64
28
 		rockchip,wake-irq = <0>;
65
-		rockchip,irq-mode-enable = <0>;  /* If enable uart uses irq instead of fiq */
29
+		rockchip,irq-mode-enable = <1>;  /* If enable uart uses irq instead of fiq */
66
30
 		rockchip,baudrate = <1500000>;  /* Only 115200 and 1500000 */
67
31
 		pinctrl-names = "default";
68
32
 		pinctrl-0 = <&uart2c_xfer>;
..
..
@@ -76,6 +40,11 @@
76
40
 
77
41
 		drm_logo: drm-logo@00000000 {
78
42
 			compatible = "rockchip,drm-logo";
43
+			reg = <0x0 0x0 0x0 0x0>;
44
+		};
45
+
46
+		vendor_storage_rm: vendor-storage-rm@00000000 {
47
+			compatible = "rockchip,vendor-storage-rm";
79
48
 			reg = <0x0 0x0 0x0 0x0>;
80
49
 		};
81
50
 
..
..
@@ -115,6 +84,12 @@
115
84
 		};
116
85
 	};
117
86
 
87
+	vendor_storage: vendor-storage {
88
+		compatible = "rockchip,ram-vendor-storage";
89
+		memory-region = <&vendor_storage_rm>;
90
+		status = "okay";
91
+	};
92
+
118
93
 	rga: rga@ff680000 {
119
94
 		compatible = "rockchip,rga2";
120
95
 		dev_mode = <1>;
..
..
@@ -135,6 +110,11 @@
135
110
 
136
111
 	firmware {
137
112
 		firmware_android: android {};
113
+
114
+		optee: optee {
115
+			compatible = "linaro,optee-tz";
116
+			method = "smc";
117
+		};
138
118
 	};
139
119
 };
140
120
 
..
..
@@ -255,7 +235,7 @@
255
235
 	status = "okay";
256
236
 };
257
237
 
258
-&rkvdec_mmu {
238
+&vdec_mmu {
259
239
 	status = "okay";
260
240
 };
261
241