A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-12 15:49:17 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "drivers: rpmsg: rpm-smd: define readq_relaxed for ARM variants"

Browse source
This commit is contained in:
qctecmdr 2020-11-23 19:13:34 -08:00 • committed by Gerrit - the friendly Code Review server
commit 5030e53cf0
2 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
drivers/rpmsg/rpm-smd.c
View file

@ -72,6 +72,15 @@
k = get_next_kvp(k))
#ifdef CONFIG_ARM
#define readq_relaxed(a) ({ \
u64 val = readl_relaxed((a) + 4); \
val <<= 32; \
val |= readl_relaxed((a)); \
val; \
})
#endif
/* Debug Definitions */
enum {
MSM_RPM_LOG_REQUEST_PRETTY = BIT(0),
@ -1560,7 +1569,7 @@ static int qcom_smd_rpm_probe(struct rpmsg_device *rpdev)
int ret = 0;
int irq;
void __iomem *reg_base;
uint32_t version = V0_PROTOCOL_VERSION; /* set to default v0 format */
uint64_t version = V0_PROTOCOL_VERSION; /* set to default v0 format */
p = of_find_compatible_node(NULL, NULL, "qcom,rpm-smd");
if (!p) {

9
drivers/soc/qcom/rpm_master_stat.c
View file

@ -37,6 +37,15 @@
#define GET_FIELD(a) ((strnstr(#a, ".", 80) + 1))
#ifdef CONFIG_ARM
#define readq_relaxed(a) ({ \
u64 val = readl_relaxed((a) + 4); \
val <<= 32; \
val |= readl_relaxed((a)); \
val; \
})
#endif
struct msm_rpm_master_stats_platform_data {
phys_addr_t phys_addr_base;
u32 phys_size;