9e5b0cc19c
Sync the patches with those sent upstream for v3.12. Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 37778
27 lines
842 B
Diff
27 lines
842 B
Diff
From 3af962f91035ae4500e63c758c49f1c067bdae09 Mon Sep 17 00:00:00 2001
|
|
From: John Crispin <blogic@openwrt.org>
|
|
Date: Sun, 19 May 2013 00:42:23 +0200
|
|
Subject: [PATCH 04/33] MIPS: ralink: add rt_sysc_m32 helper
|
|
|
|
Signed-off-by: John Crispin <blogic@openwrt.org>
|
|
---
|
|
arch/mips/include/asm/mach-ralink/ralink_regs.h | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
--- a/arch/mips/include/asm/mach-ralink/ralink_regs.h
|
|
+++ b/arch/mips/include/asm/mach-ralink/ralink_regs.h
|
|
@@ -26,6 +26,13 @@ static inline u32 rt_sysc_r32(unsigned r
|
|
return __raw_readl(rt_sysc_membase + reg);
|
|
}
|
|
|
|
+static inline void rt_sysc_m32(u32 clr, u32 set, unsigned reg)
|
|
+{
|
|
+ u32 val = rt_sysc_r32(reg) & ~clr;
|
|
+
|
|
+ __raw_writel(val | set, rt_sysc_membase + reg);
|
|
+}
|
|
+
|
|
static inline void rt_memc_w32(u32 val, unsigned reg)
|
|
{
|
|
__raw_writel(val, rt_memc_membase + reg);
|