提交 f02e5795 编写于 作者: U Uwe Kleine-König 提交者: Russell King

[ARM] 4591/1: ns9xxx: simplify REGSET, REGGET and introduce ..._IDX variants

The semantic of the REGSET macros didn't change, but hopefully
it's more obvious as it's now.

REGGET is changed to return the unshifted value, analogous to
REGSET.  REGGETIM behaves as REGGET before.  All callers changed.

..._IDX is used to work with registers that need a parameter like
BBU_GCONFb1.
Signed-off-by: NUwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
上级 689f2a01
...@@ -46,8 +46,8 @@ static inline u32 ns9xxx_systemclock(void) ...@@ -46,8 +46,8 @@ static inline u32 ns9xxx_systemclock(void)
* *
* Fine. * Fine.
*/ */
return CRYSTAL * (REGGET(pll, SYS_PLL, ND) + 1) return CRYSTAL * (REGGETIM(pll, SYS_PLL, ND) + 1)
>> REGGET(pll, SYS_PLL, FS); >> REGGETIM(pll, SYS_PLL, FS);
} }
static inline u32 ns9xxx_cpuclock(void) __attribute__((const)); static inline u32 ns9xxx_cpuclock(void) __attribute__((const));
......
...@@ -27,9 +27,11 @@ ...@@ -27,9 +27,11 @@
#define io_v2p(x) ((((x) & 0x0f000000) << 4) \ #define io_v2p(x) ((((x) & 0x0f000000) << 4) \
+ ((x) & 0x00ffffff)) + ((x) & 0x00ffffff))
#define __REGSHIFT(mask) ((mask) & (-(mask)))
#define __REGBIT(bit) ((u32)1 << (bit)) #define __REGBIT(bit) ((u32)1 << (bit))
#define __REGBITS(hbit, lbit) ((((u32)1 << ((hbit) - (lbit) + 1)) - 1) << (lbit)) #define __REGBITS(hbit, lbit) ((((u32)1 << ((hbit) - (lbit) + 1)) - 1) << (lbit))
#define __REGVAL(mask, value) (((value) * ((mask) & (-(mask))) & (mask))) #define __REGVAL(mask, value) (((value) * __REGSHIFT(mask)) & (mask))
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
...@@ -39,21 +41,36 @@ ...@@ -39,21 +41,36 @@
# define __REGB(x) (*((volatile u8 *)io_p2v((x)))) # define __REGB(x) (*((volatile u8 *)io_p2v((x))))
# define __REGB2(x) (*((volatile u8 *)io_p2v((x)) + (y))) # define __REGB2(x) (*((volatile u8 *)io_p2v((x)) + (y)))
# define __REGSET(var, field, value) \
((var) = (((var) & ~((field) & ~(value))) | (value)))
# define REGSET(var, reg, field, value) \ # define REGSET(var, reg, field, value) \
((var) = (((var) \ __REGSET(var, reg ## _ ## field, reg ## _ ## field ## _ ## value)
& ~(reg ## _ ## field & \
~ reg ## _ ## field ## _ ## value)) \ # define REGSET_IDX(var, reg, field, idx, value) \
| (reg ## _ ## field ## _ ## value))) __REGSET(var, reg ## _ ## field((idx)), reg ## _ ## field ## _ ## value((idx)))
# define REGSETIM(var, reg, field, value) \ # define REGSETIM(var, reg, field, value) \
((var) = (((var) \ __REGSET(var, reg ## _ ## field, __REGVAL(reg ## _ ## field, (value)))
& ~(reg ## _ ## field & \
~(__REGVAL(reg ## _ ## field, value)))) \ # define REGSETIM_IDX(var, reg, field, idx, value) \
| (__REGVAL(reg ## _ ## field, value)))) __REGSET(var, reg ## _ ## field((idx)), __REGVAL(reg ## _ ## field((idx)), (value)))
# define __REGGET(var, field) \
(((var) & (field)))
# define REGGET(var, reg, field) \ # define REGGET(var, reg, field) \
((var & (reg ## _ ## field)) / \ __REGGET(var, reg ## _ ## field)
((reg ## _ ## field) & (-(reg ## _ ## field))))
# define REGGET_IDX(var, reg, field, idx) \
__REGGET(var, reg ## _ ## field((idx)))
# define REGGETIM(var, reg, field) \
__REGGET(var, reg ## _ ## field) / __REGSHIFT(reg ## _ ## field)
# define REGGETIM_IDX(var, reg, field, idx) \
__REGGET(var, reg ## _ ## field((idx))) / \
__REGSHIFT(reg ## _ ## field((idx)))
#else #else
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册