From b368ed36e39932a6986ee4f79cb835b278670b15 Mon Sep 17 00:00:00 2001 From: Jiahang Zheng Date: Thu, 19 Oct 2023 20:42:25 +0800 Subject: [PATCH 1/3] arm64: dts: rockchip: Add rk3562-evb2-ddr4-v10-linux-amp.dts Signed-off-by: Jiahang Zheng Change-Id: I9770e87f0002cd170867f7d717732c9785b2e732 --- arch/arm64/boot/dts/rockchip/Makefile | 1 + .../rk3562-evb2-ddr4-v10-linux-amp.dts | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3562-evb2-ddr4-v10-linux-amp.dts diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile index 75b37a665bb3..3c66f48837c0 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile @@ -102,6 +102,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3562-evb2-ddr4-v10.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3562-evb2-ddr4-v10-dual-camera.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3562-evb2-ddr4-v10-image-reverse.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3562-evb2-ddr4-v10-linux.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3562-evb2-ddr4-v10-linux-amp.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3562-evb2-ddr4-v10-pdm-mic-array.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3562-evb2-ddr4-v10-sii9022-bt1120-to-hdmi.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3562-iotest-lp3-v10.dtb diff --git a/arch/arm64/boot/dts/rockchip/rk3562-evb2-ddr4-v10-linux-amp.dts b/arch/arm64/boot/dts/rockchip/rk3562-evb2-ddr4-v10-linux-amp.dts new file mode 100644 index 000000000000..99385760cbed --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3562-evb2-ddr4-v10-linux-amp.dts @@ -0,0 +1,29 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2023 Rockchip Electronics Co., Ltd. + * + */ + +#include "rk3562-evb2-ddr4-v10.dtsi" +#include "rk3562-linux.dtsi" +#include "rk3562-rk809.dtsi" +#include "rk3562-evb2-cam.dtsi" +#include "rk3562-amp.dtsi" + +/ { + memory { + device_type = "memory"; + reg = <0x0 0x02000000 0x0 0x04b80000>, + <0x0 0x0a200000 0x0 0x75e00000>; + }; +}; + +&arm_pmu { + interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>; +}; + +/delete-node/ &cpu3; + +&sdmmc0 { + status = "disabled"; +}; From ce595e7f0ca2365bce94ddddab48bb46c7fa322c Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Tue, 31 Oct 2023 09:21:20 +0800 Subject: [PATCH 2/3] ASoC: rockchip: utils: include rockchip_utils.h for missing prototype sound/soc/rockchip/rockchip_utils.c:115:6: warning: no previous prototype for 'rockchip_utils_get_performance' [-Wmissing-prototypes] sound/soc/rockchip/rockchip_utils.c:135:6: warning: no previous prototype for 'rockchip_utils_put_performance' [-Wmissing-prototypes] Fixes: ff0c025724c9 ("ASoC: rockchip: Introduce rockchip utils common API") Signed-off-by: Tao Huang Change-Id: Ida15cf7c465fbabea0f0db9bfd21f4577e9e8dbd --- sound/soc/rockchip/rockchip_utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/rockchip/rockchip_utils.c b/sound/soc/rockchip/rockchip_utils.c index c8cbd71537d1..b26c33849f8b 100644 --- a/sound/soc/rockchip/rockchip_utils.c +++ b/sound/soc/rockchip/rockchip_utils.c @@ -12,6 +12,7 @@ #include #include #include +#include "rockchip_utils.h" #define DMC_STALL_TIME_US_DEFAULT 100 #define TIME_MARGIN_US 20 From a7c7116f785844bdd3f8c9e13d66aac64374cb83 Mon Sep 17 00:00:00 2001 From: Felix Zeng Date: Thu, 7 Sep 2023 16:47:04 +0800 Subject: [PATCH 3/3] driver: rknpu: Fix probe failed due to missing interrupt names in DTS in kernel 6.10 Signed-off-by: Felix Zeng Change-Id: Ie109c814b0c4f3e6b6ddc0c6e12fd58a2e645036 --- drivers/rknpu/rknpu_drv.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/drivers/rknpu/rknpu_drv.c b/drivers/rknpu/rknpu_drv.c index 867212ce6059..40214b4eb7dc 100644 --- a/drivers/rknpu/rknpu_drv.c +++ b/drivers/rknpu/rknpu_drv.c @@ -1633,12 +1633,9 @@ static int rknpu_register_irq(struct platform_device *pdev, { const struct rknpu_config *config = rknpu_dev->config; struct device *dev = &pdev->dev; -#if KERNEL_VERSION(6, 1, 0) > LINUX_VERSION_CODE struct resource *res; -#endif int i, ret, irq; -#if KERNEL_VERSION(6, 1, 0) > LINUX_VERSION_CODE res = platform_get_resource_byname(pdev, IORESOURCE_IRQ, config->irqs[0].name); if (res) { @@ -1677,25 +1674,6 @@ static int rknpu_register_irq(struct platform_device *pdev, return ret; } } -#else - /* there are irq names in dts */ - for (i = 0; i < config->num_irqs; i++) { - irq = platform_get_irq_byname(pdev, config->irqs[i].name); - if (irq < 0) { - LOG_DEV_ERROR(dev, "no npu %s in dts\n", - config->irqs[i].name); - return irq; - } - - ret = devm_request_irq(dev, irq, config->irqs[i].irq_hdl, - IRQF_SHARED, dev_name(dev), rknpu_dev); - if (ret < 0) { - LOG_DEV_ERROR(dev, "request %s failed: %d\n", - config->irqs[i].name, ret); - return ret; - } - } -#endif return 0; }