shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 10:58:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '0013ee06a1814b1a19f69cc3f49f741e8e651f8a'

Browse Source 
* commit '0013ee06a1814b1a19f69cc3f49f741e8e651f8a':
  rpmsg: rockchip: fix mailbox txdone method to polling
  arm64: dts: rockchip: rk3562-android: assign a fixed index to mmc devices
  arm64: dts: rockchip: Add mmc aliases for rk3562-linux.dtsi
  arm64: dts: rockchip: Makefile add rk3399-sapphire-excavator-edp-avb.dtb
  arm64: dts: rockchip: add rk3568 evb1 linux amp dts

Change-Id: If9444ad07eb45264150b8ee24e45302b7ceeaf99
This commit is contained in:
Tao Huang
2023-08-28 19:03:21 +08:00
parent e6daeb20e3 0013ee06a1
commit d68b0c3ff4
8 changed files with 93 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/boot/dts/rockchip/Makefile
View File

@@ -86,6 +86,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64-v2.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator-edp-avb.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-rock-pi-n10.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3528-demo1-lp4-v10.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3528-demo4-ddr4-v10.dtb
@@ -146,6 +147,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3566-rk817-tablet-v10.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-ddr4-v10.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-ddr4-v10-dual-camera.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-ddr4-v10-linux.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-ddr4-v10-linux-amp.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb1-ddr4-v10-linux-spi-nor.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb2-lp4x-v10.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3568-evb2-lp4x-v10-bt1120-to-hdmi.dtb

4
arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp-avb.dts
View File

@@ -24,9 +24,9 @@
&i2c1 {
status = "okay";
/delete-node/ tc358749x@0f;
/delete-node/ tc358749x@f;
tc35874x: tc35874x@0f {
tc35874x: tc35874x@f {
status = "disabled";
reg = <0x0f>;
compatible = "toshiba,tc358749";

12
arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dtsi
View File

@@ -192,7 +192,7 @@
};
};
tc358749x: tc358749x@0f {
tc358749x: tc358749x@f {
compatible = "toshiba,tc358749x";
reg = <0x0f>;
power-gpios = <&gpio2 6 GPIO_ACTIVE_HIGH>;
@@ -207,7 +207,7 @@
status = "disabled";
};
vm149c: vm149c@0c {
vm149c: vm149c@c {
compatible = "silicon touch,vm149c";
status = "okay";
reg = <0x0c>;
@@ -240,14 +240,6 @@
};
};
vm149c: vm149c@0c {
compatible = "silicon touch,vm149c";
status = "okay";
reg = <0x0c>;
rockchip,camera-module-index = <0>;
rockchip,camera-module-facing = "back";
};
ov13850: ov13850@10 {
compatible = "ovti,ov13850";
status = "okay";

6
arch/arm64/boot/dts/rockchip/rk3562-android.dtsi
View File

@@ -5,6 +5,12 @@
*/
/ {
aliases {
mmc0 = &sdmmc0;
mmc1 = &sdmmc1;
mmc2 = &sdhci;
};
chosen: chosen {
bootargs = "earlycon=uart8250,mmio32,0xff210000 console=ttyFIQ0";
};

6
arch/arm64/boot/dts/rockchip/rk3562-linux.dtsi
View File

@@ -5,6 +5,12 @@
*/
/ {
aliases {
mmc0 = &sdhci;
mmc1 = &sdmmc0;
mmc2 = &sdmmc1;
};
chosen: chosen {
bootargs = "earlycon=uart8250,mmio32,0xff210000 console=ttyFIQ0 root=PARTUUID=614e0000-0000 rw rootwait";
};

63
arch/arm64/boot/dts/rockchip/rk3568-amp.dtsi
View File

@@ -1,30 +1,73 @@
// 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,amp";
compatible = "rockchip,rk3568-amp";
clocks = <&cru SCLK_UART4>, <&cru PCLK_UART4>,
<&cru PCLK_TIMER>, <&cru CLK_TIMER4>, <&cru CLK_TIMER5>;
<&cru PCLK_TIMER>, <&cru CLK_TIMER4>, <&cru CLK_TIMER5>,
<&cru ACLK_MCU>;
pinctrl-names = "default";
pinctrl-0 = <&uart4m1_xfer>;
status = "okay";
amp_cpus: amp-cpus {
amp-cpu2 {
id = <0x0 0x200>;
entry = <0x0 0x3800000>;
mode = <0>;
};
amp-cpu3 {
id = <0x0 0x300>;
entry = <0x0 0x5800000>;
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 {
#address-cells = <2>;
#size-cells = <2>;
ranges;
/* remote amp core address */
amp_shmem_reserved: amp-shmem@7800000 {
reg = <0x0 0x7800000 0x0 0x400000>;
no-map;
};
rpmsg_reserved: rpmsg@7c00000 {
reg = <0x0 0x7c00000 0x0 0x400000>;
no-map;
};
rpmsg_dma_reserved: rpmsg-dma@8000000 {
compatible = "shared-dma-pool";
reg = <0x0 0x8000000 0x0 0x100000>;
no-map;
};
/* mcu address */
mcu_reserved: mcu@8200000 {
reg = <0x0 0x8200000 0x0 0x100000>;
no-map;
};
};
};
&mailbox {
rockchip,txpoll-period-ms = <1>;
status = "okay";
};

22
arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux-amp.dts Normal file
View File

@@ -0,0 +1,22 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
* Copyright (c) 2023 Rockchip Electronics Co., Ltd.
*
*/
#include "rk3568-evb1-ddr4-v10-linux.dts"
#include "rk3568-amp.dtsi"
/ {
memory {
device_type = "memory";
reg = <0x0 0x03880000 0x0 0x04b80000>,
<0x0 0x0a200000 0x0 0x75e00000>;
};
};
&arm_pmu {
interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>;
};
/delete-node/ &cpu3;

1
drivers/rpmsg/rockchip_rpmsg.c
View File

@@ -114,7 +114,6 @@ static bool rk_rpmsg_notify(struct virtqueue *vq)
dev_err(dev, "mbox send failed!\n");
return false;
}
mbox_chan_txdone(rpdev->mbox_tx_chan, 0);
return true;
}