From 4cfe19352f012264579c814e5c51b14f069b536b Mon Sep 17 00:00:00 2001 From: Melody Olvera Date: Wed, 7 Oct 2020 14:38:50 -0700 Subject: [PATCH] drivers: soc: qcom: Check if readq_relaxed macro is defined Two drivers define their own readq_relaxed macro. This is redefined by the RTB to allow for register logging, so these drivers must ensure it is not already defined before overwriting it. Change-Id: I81dcb29fdbe55b933ff74c24d879ac9361619a8c Signed-off-by: Melody Olvera --- drivers/soc/qcom/ddr_stats.c | 2 ++ drivers/soc/qcom/soc_sleep_stats.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/drivers/soc/qcom/ddr_stats.c b/drivers/soc/qcom/ddr_stats.c index 95d22c94a2f2..930e6bedba1f 100644 --- a/drivers/soc/qcom/ddr_stats.c +++ b/drivers/soc/qcom/ddr_stats.c @@ -26,6 +26,7 @@ (container_of(attr, struct ddr_stats_kobj_attr, ka)->pd) #ifdef CONFIG_ARM +#ifndef readq_relaxed #define readq_relaxed(a) ({ \ u64 val = readl_relaxed((a) + 4); \ val <<= 32; \ @@ -33,6 +34,7 @@ val; \ }) #endif +#endif struct ddr_stats_platform_data { phys_addr_t phys_addr_base; diff --git a/drivers/soc/qcom/soc_sleep_stats.c b/drivers/soc/qcom/soc_sleep_stats.c index 067b264f3212..087ecfeef35f 100644 --- a/drivers/soc/qcom/soc_sleep_stats.c +++ b/drivers/soc/qcom/soc_sleep_stats.c @@ -17,6 +17,7 @@ #include #ifdef CONFIG_ARM +#ifndef readq_relaxed #define readq_relaxed(a) ({ \ u64 val = readl_relaxed((a) + 4); \ val <<= 32; \ @@ -24,6 +25,7 @@ val; \ }) #endif +#endif struct stats_config { u32 offset_addr;