~hc/RK356X_SDK_RELEASE.git

..	..	@@ -1,43 +1,7 @@
	1	+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
1	2	/*
2		- * Copyright (c) 2019 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>
..	..	@@ -45,6 +9,12 @@
45	9
46	10	/ {
47	11	compatible = "rockchip,linux", "rockchip,rk3399";
	12	+
	13	+ aliases {
	14	+ mmc0 = &sdhci;
	15	+ mmc1 = &sdmmc;
	16	+ mmc2 = &sdio0;
	17	+ };
48	18
49	19	chosen {
50	20	bootargs = "earlycon=uart8250,mmio32,0xff1a0000 console=ttyFIQ0 rw root=PARTUUID=614e0000-0000 rootfstype=ext4 rootwait coherent_pool=1m";
..	..	@@ -60,23 +30,28 @@
60	30	reg = <0x0 0x0 0x0 0x0>;
61	31	};
62	32
63		- ramoops: ramoops@110000 {
64		- compatible = "ramoops";
	33	+ ramoops_mem: region@110000 {
65	34	reg = <0x0 0x110000 0x0 0xf0000>;
66		- record-size = <0x20000>;
67		- console-size = <0x80000>;
68		- ftrace-size = <0x00000>;
69		- pmsg-size = <0x50000>;
	35	+ reg-names = "ramoops_mem";
70	36	};
	37	+ };
	38	+
	39	+ ramoops: ramoops {
	40	+ compatible = "ramoops";
	41	+ record-size = <0x0 0x40000>;
	42	+ console-size = <0x0 0x80000>;
	43	+ ftrace-size = <0x0 0x00000>;
	44	+ pmsg-size = <0x0 0x00000>;
	45	+ memory-region = <&ramoops_mem>;
71	46	};
72	47
73	48	fiq_debugger: fiq-debugger {
74	49	compatible = "rockchip,fiq-debugger";
75	50	rockchip,serial-id = <2>;
76		- rockchip,signal-irq = <182>;
77	51	rockchip,wake-irq = <0>;
78	52	rockchip,irq-mode-enable = <1>; /* If enable uart uses irq instead of fiq */
79	53	rockchip,baudrate = <1500000>; /* Only 115200 and 1500000 */
	54	+ interrupts = <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH 0>;
80	55	pinctrl-names = "default";
81	56	pinctrl-0 = <&uart2c_xfer>;
82	57	};
..	..	@@ -210,7 +185,7 @@
210	185	//allocator = <0>;
211	186	};
212	187
213		-&rkvdec_mmu {
	188	+&vdec_mmu {
214	189	status = "okay";
215	190	};
216	191