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/include/soc/rockchip/rockchip_amp.h | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/kernel/include/soc/rockchip/rockchip_amp.h b/kernel/include/soc/rockchip/rockchip_amp.h index 1c37e8b..851c0f4 100644 --- a/kernel/include/soc/rockchip/rockchip_amp.h +++ b/kernel/include/soc/rockchip/rockchip_amp.h @@ -9,15 +9,18 @@ #ifndef _ROCKCHIP_AMP #define _ROCKCHIP_AMP +#include <linux/irqchip/arm-gic-common.h> + #if IS_REACHABLE(CONFIG_ROCKCHIP_AMP) -void rockchip_amp_get_gic_info(void); +void rockchip_amp_get_gic_info(u32 spis_num, enum gic_type gic_version); int rockchip_amp_check_amp_irq(u32 irq); u32 rockchip_amp_get_irq_prio(u32 irq); u32 rockchip_amp_get_irq_cpumask(u32 irq); +u64 rockchip_amp_get_irq_aff(u32 irq); +int rockchip_amp_need_init_amp_irq(u32 irq); #else -#include <linux/irqchip/arm-gic-common.h> - -static inline void rockchip_amp_get_gic_info(void) +static inline void rockchip_amp_get_gic_info(u32 spis_num, + enum gic_type gic_version) { } @@ -35,5 +38,11 @@ { return 0; } + +static inline int rockchip_amp_need_init_amp_irq(u32 irq) +{ + return 0; +} + #endif /* CONFIG_ROCKCHIP_AMP */ #endif /* _ROCKCHIP_AMP */ -- Gitblit v1.6.2