Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdd0d3a7 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drivers: soc: qcom: Check if readq_relaxed macro is defined"

parents e14ef833 4cfe1935

drivers/soc/qcom/ddr_stats.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ 
	(container_of(attr, struct ddr_stats_kobj_attr, ka)->pd)

	(container_of(attr, struct ddr_stats_kobj_attr, ka)->pd)





#ifdef CONFIG_ARM

#ifdef CONFIG_ARM

#ifndef readq_relaxed

#define readq_relaxed(a) ({			\

#define readq_relaxed(a) ({			\

	u64 val = readl_relaxed((a) + 4);	\

	u64 val = readl_relaxed((a) + 4);	\

	val <<= 32;				\

	val <<= 32;				\
@@ -33,6 +34,7 @@ 
	val;					\

	val;					\

})

})

#endif

#endif

#endif





struct ddr_stats_platform_data {

struct ddr_stats_platform_data {

	phys_addr_t phys_addr_base;

	phys_addr_t phys_addr_base;

drivers/soc/qcom/soc_sleep_stats.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <clocksource/arm_arch_timer.h>

#include <clocksource/arm_arch_timer.h>





#ifdef CONFIG_ARM

#ifdef CONFIG_ARM

#ifndef readq_relaxed

#define readq_relaxed(a) ({			\

#define readq_relaxed(a) ({			\

	u64 val = readl_relaxed((a) + 4);	\

	u64 val = readl_relaxed((a) + 4);	\

	val <<= 32;				\

	val <<= 32;				\
@@ -24,6 +25,7 @@ 
	val;					\

	val;					\

})

})

#endif

#endif

#endif





struct stats_config {

struct stats_config {

	u32 offset_addr;

	u32 offset_addr;