From 416cd1ea3b10fc3def0eff0a31aec909f8293b6c Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Mon, 1 Apr 2024 19:02:37 +0800 Subject: [PATCH 1/3] fiq_debugger: arm: Fix compile error on !THREAD_INFO Signed-off-by: Tao Huang Change-Id: Id65e44276f7ee0ab0473274a2b739e0a6b453373 --- drivers/soc/rockchip/fiq_debugger/fiq_debugger_arm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/soc/rockchip/fiq_debugger/fiq_debugger_arm.c b/drivers/soc/rockchip/fiq_debugger/fiq_debugger_arm.c index d44287eba4bd..fc5bf53dcd79 100644 --- a/drivers/soc/rockchip/fiq_debugger/fiq_debugger_arm.c +++ b/drivers/soc/rockchip/fiq_debugger/fiq_debugger_arm.c @@ -238,12 +238,16 @@ void fiq_debugger_dump_stacktrace(struct fiq_debugger_output *output, const struct pt_regs *regs, unsigned int depth, void *ssp) { struct frame_tail *tail; +#ifdef THREAD_INFO struct thread_info *real_thread_info = THREAD_INFO(ssp); +#endif struct stacktrace_state sts; sts.depth = depth; sts.output = output; +#ifdef THREAD_INFO *current_thread_info() = *real_thread_info; +#endif if (!current) output->printf(output, "current NULL\n"); From 0aabe514530f013a384e482cf373eb0d6056fcbf Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Mon, 1 Apr 2024 19:19:27 +0800 Subject: [PATCH 2/3] kbuild: xz_wrap: do not include include/config/auto.conf Fix the following error: ./scripts/xz_wrap.sh: 315: include/config/auto.conf: Syntax error: "(" unexpected Fixes: 83c382f4369e ("FROMLIST: kbuild: Enable armthumb BCJ filter for Thumb-2 kernel") Signed-off-by: Tao Huang Change-Id: I780ac11132c7a42ad189fc9c955a94139a3d62aa --- scripts/xz_wrap.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/xz_wrap.sh b/scripts/xz_wrap.sh index 3824fdf037be..8b9523495ddd 100755 --- a/scripts/xz_wrap.sh +++ b/scripts/xz_wrap.sh @@ -9,8 +9,6 @@ # You can do whatever you want with this file. # -. include/config/auto.conf - BCJ= LZMA2OPTS= @@ -22,7 +20,7 @@ case $SRCARCH in sparc) BCJ=--sparc ;; esac -if [ -n "${CONFIG_THUMB2_KERNEL}" ]; then +if grep -q "^CONFIG_THUMB2_KERNEL=y" include/config/auto.conf; then BCJ=--armthumb fi From 7a5fd2ec18f0e398ad50f306b4e816473e4b17a5 Mon Sep 17 00:00:00 2001 From: Zheng zhiqi Date: Mon, 1 Jul 2024 17:12:46 +0800 Subject: [PATCH 3/3] arm64: dts: rockchip: rk3576-vehicle-evb: change rk3576 sai1 to master Change rk3576 sai1 to master Change-Id: Ibed393c0ba33967baece1f2841b59c147b977def Signed-off-by: Zheng zhiqi --- arch/arm64/boot/dts/rockchip/rk3576-vehicle-evb.dtsi | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3576-vehicle-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3576-vehicle-evb.dtsi index 8b1d556eb4a0..5175f329bbc1 100644 --- a/arch/arm64/boot/dts/rockchip/rk3576-vehicle-evb.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3576-vehicle-evb.dtsi @@ -131,14 +131,12 @@ simple-audio-card,name = "rockchip,car-rk3308-sound"; simple-audio-card,format = "i2s"; simple-audio-card,mclk-fs = <256>; - simple-audio-card,bitclock-master = <&codec_master>; - simple-audio-card,frame-master = <&codec_master>; simple-audio-card,cpu { sound-dai = <&sai1>; dai-tdm-slot-num = <8>; dai-tdm-slot-width = <32>; }; - codec_master: simple-audio-card,codec { + simple-audio-card,codec { sound-dai = <&dummy_codec>; }; };