diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/rtl8712/rtl8712_debugctrl_bitdef.h | |
parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8712/rtl8712_debugctrl_bitdef.h')
-rw-r--r-- | drivers/staging/rtl8712/rtl8712_debugctrl_bitdef.h | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/drivers/staging/rtl8712/rtl8712_debugctrl_bitdef.h b/drivers/staging/rtl8712/rtl8712_debugctrl_bitdef.h new file mode 100644 index 0000000..7b34d40 --- /dev/null +++ b/drivers/staging/rtl8712/rtl8712_debugctrl_bitdef.h @@ -0,0 +1,36 @@ +#ifndef __RTL8712_DEBUGCTRL_BITDEF_H__ +#define __RTL8712_DEBUGCTRL_BITDEF_H__ + +/*BIST*/ +#define _BIST_RST BIT(0) + +/*LMS*/ +#define _LMS_MSK 0x03 + +/*WDG_CTRL*/ +#define _OVSEL_MSK 0x0600 +#define _OVSEL_SHT 9 +#define _WDGCLR BIT(8) +#define _WDGEN_MSK 0x00FF +#define _WDGEN_SHT 0 + +/*INTM*/ +#define _TXTIMER_MSK 0xF000 +#define _TXTIMER_SHT 12 +#define _TXNUM_MSK 0x0F00 +#define _TXNUM_SHT 8 +#define _RXTIMER_MSK 0x00F0 +#define _RXTIMER_SHT 4 +#define _RXNUM_MSK 0x000F +#define _RXNUM_SHT 0 + +/*FDLOCKTURN0*/ +/*FDLOCKTURN1*/ +#define _TURN1 BIT(0) + +/*FDLOCKFLAG0*/ +/*FDLOCKFLAG1*/ +#define _LOCKFLAG1_MSK 0x03 + + +#endif /* __RTL8712_DEBUGCTRL_BITDEF_H__ */ |