tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[PATCH] m32r: support a synthesizable M32700 core
This patch is for supporting a synthesizable M32700 core for the Mappi-II FPGA
board.
On the core, location of MFT (Multi-Function Timer) registers is slightly
different from the M32700 chip.
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
authored by
Hirokazu Takata
and committed by
Linus Torvalds
f894cb5c
8b03a632
+4
-3
+4
-3
include/asm-m32r/m32102.h
+4
-3
include/asm-m32r/m32102.h
···
104
104
#define M32R_MFT5RLD_PORTL (0x0C+M32R_MFT5_OFFSET) /* MFT4 reload */
105
105
#define M32R_MFT5CMPRLD_PORTL (0x10+M32R_MFT5_OFFSET) /* MFT4 compare reload */
106
106
107
-
#if defined(CONFIG_CHIP_M32700) || defined(CONFIG_CHIP_M32104)
107
+
#if (defined(CONFIG_CHIP_M32700) && !defined(CONFIG_PLAT_MAPPI2)) \
108
+
|| defined(CONFIG_CHIP_M32104)
108
109
#define M32R_MFTCR_MFT0MSK (1UL<<31) /* b0 */
109
110
#define M32R_MFTCR_MFT1MSK (1UL<<30) /* b1 */
110
111
#define M32R_MFTCR_MFT2MSK (1UL<<29) /* b2 */
···
118
117
#define M32R_MFTCR_MFT3EN (1UL<<20) /* b11 */
119
118
#define M32R_MFTCR_MFT4EN (1UL<<19) /* b12 */
120
119
#define M32R_MFTCR_MFT5EN (1UL<<18) /* b13 */
121
-
#else /* not CONFIG_CHIP_M32700 && not CONFIG_CHIP_M32104 */
120
+
#else
122
121
#define M32R_MFTCR_MFT0MSK (1UL<<15) /* b16 */
123
122
#define M32R_MFTCR_MFT1MSK (1UL<<14) /* b17 */
124
123
#define M32R_MFTCR_MFT2MSK (1UL<<13) /* b18 */
···
131
130
#define M32R_MFTCR_MFT3EN (1UL<<4) /* b27 */
132
131
#define M32R_MFTCR_MFT4EN (1UL<<3) /* b28 */
133
132
#define M32R_MFTCR_MFT5EN (1UL<<2) /* b29 */
134
-
#endif /* not CONFIG_CHIP_M32700 && not CONFIG_CHIP_M32104 */
133
+
#endif
135
134
136
135
#define M32R_MFTMOD_CC_MASK (1UL<<15) /* b16 */
137
136
#define M32R_MFTMOD_TCCR (1UL<<13) /* b18 */