From 2f7c68cb55ecb7331f2381deb497c27155f32faf Mon Sep 17 00:00:00 2001 From: hc <hc@nodka.com> Date: Wed, 03 Jan 2024 09:43:39 +0000 Subject: [PATCH] update kernel to 5.10.198 --- kernel/arch/arm64/boot/dts/rockchip/rk3568-amp.dtsi | 45 +++++++++++++++++++++++++-------------------- 1 files changed, 25 insertions(+), 20 deletions(-) diff --git a/kernel/arch/arm64/boot/dts/rockchip/rk3568-amp.dtsi b/kernel/arch/arm64/boot/dts/rockchip/rk3568-amp.dtsi index 7eb6ffd..8de181d 100644 --- a/kernel/arch/arm64/boot/dts/rockchip/rk3568-amp.dtsi +++ b/kernel/arch/arm64/boot/dts/rockchip/rk3568-amp.dtsi @@ -1,18 +1,14 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* - * Copyright (c) 2021 Rockchip Electronics Co., Ltd. + * Copyright (c) 2023 Rockchip Electronics Co., Ltd. */ / { rockchip_amp: rockchip-amp { compatible = "rockchip,rk3568-amp"; clocks = <&cru SCLK_UART4>, <&cru PCLK_UART4>, - <&cru PCLK_TIMER>, <&cru CLK_TIMER4>, <&cru CLK_TIMER5>; - clock-names = "baudclk", "apb_pclk", "pclk", "timer"; - assigned-clocks = <&cru SCLK_UART4>, - <&cru CLK_TIMER4>, - <&cru CLK_TIMER5>; - assigned-clock-rates = <24000000>; + <&cru PCLK_TIMER>, <&cru CLK_TIMER4>, <&cru CLK_TIMER5>, + <&cru ACLK_MCU>; pinctrl-names = "default"; pinctrl-0 = <&uart4m1_xfer>; @@ -21,22 +17,11 @@ amp_cpus: amp-cpus { amp-cpu3 { id = <0x0 0x300>; - entry = <0x0 0x1800000>; + entry = <0x0 0x2800000>; + boot-on = <0>; mode = <0>; }; }; - }; - - rpmsg: rpmsg@7c00000 { - compatible = "rockchip,rk3568-rpmsg"; - mbox-names = "rpmsg-rx", "rpmsg-tx"; - mboxes = <&mailbox 0 &mailbox 3>; - rockchip,vdev-nums = <1>; - rockchip,link-id = <0x03>; - reg = <0x0 0x7c00000 0x0 0x20000>; - memory-region = <&rpmsg_dma_reserved>; - - status = "okay"; }; reserved-memory { @@ -60,9 +45,29 @@ reg = <0x0 0x8000000 0x0 0x100000>; no-map; }; + + /* mcu address */ + mcu_reserved: mcu@8200000 { + reg = <0x0 0x8200000 0x0 0x100000>; + no-map; + }; + }; + + rpmsg: rpmsg@7c00000 { + compatible = "rockchip,rpmsg"; + mbox-names = "rpmsg-rx", "rpmsg-tx"; + mboxes = <&mailbox 0 &mailbox 3>; + rockchip,vdev-nums = <1>; + rockchip,link-id = <0x03>; + reg = <0x0 0x7c00000 0x0 0x20000>; + memory-region = <&rpmsg_dma_reserved>; + + status = "okay"; }; }; &mailbox { + rockchip,txpoll-period-ms = <1>; status = "okay"; }; + -- Gitblit v1.6.2