Skip to content

L
linux
Commit af5d5df2 authored by Hirokazu Takata's avatar Hirokazu Takata Committed by Linus Torvalds
Browse files
Options

[PATCH] m32r: fix for use of Mappi PCC 

Here is a patch to fix compile errors for an Mappi evaluation board.  -
Just change from CONFIG_M32RPCC to CONFIG_M32R_PCC.

Thanks to Naoto Sugai for reporting.
Signed-off-by: default avatarHirokazu Takata <takata@linux-m32r.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b6863133
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 17 deletions
arch/m32r/kernel/io_mappi.c
View file @ af5d5df2
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32RPCC) #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
#include <linux/types.h> #include <linux/types.h>
#define M32R_PCC_IOMAP_SIZE 0x1000 #define M32R_PCC_IOMAP_SIZE 0x1000
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
extern void pcc_ioread(int, unsigned long, void *, size_t, size_t, int); extern void pcc_ioread(int, unsigned long, void *, size_t, size_t, int);
extern void pcc_iowrite(int, unsigned long, void *, size_t, size_t, int); extern void pcc_iowrite(int, unsigned long, void *, size_t, size_t, int);
#endif /* CONFIG_PCMCIA && CONFIG_M32RPCC */ #endif /* CONFIG_PCMCIA && CONFIG_M32R_PCC */
#define PORT2ADDR(port) _port2addr(port) #define PORT2ADDR(port) _port2addr(port)
...@@ -80,7 +80,7 @@ unsigned char _inb(unsigned long port) ...@@ -80,7 +80,7 @@ unsigned char _inb(unsigned long port)
if (port >= 0x300 && port < 0x320) if (port >= 0x300 && port < 0x320)
return _ne_inb(PORT2ADDR_NE(port)); return _ne_inb(PORT2ADDR_NE(port));
else else
#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32RPCC) #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
unsigned char b; unsigned char b;
pcc_ioread(0, port, &b, sizeof(b), 1, 0); pcc_ioread(0, port, &b, sizeof(b), 1, 0);
...@@ -100,7 +100,7 @@ unsigned short _inw(unsigned long port) ...@@ -100,7 +100,7 @@ unsigned short _inw(unsigned long port)
if (port >= 0x300 && port < 0x320) if (port >= 0x300 && port < 0x320)
return _ne_inw(PORT2ADDR_NE(port)); return _ne_inw(PORT2ADDR_NE(port));
else else
#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32RPCC) #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
unsigned short w; unsigned short w;
pcc_ioread(0, port, &w, sizeof(w), 1, 0); pcc_ioread(0, port, &w, sizeof(w), 1, 0);
...@@ -116,7 +116,7 @@ unsigned short _inw(unsigned long port) ...@@ -116,7 +116,7 @@ unsigned short _inw(unsigned long port)
unsigned long _inl(unsigned long port) unsigned long _inl(unsigned long port)
{ {
#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32RPCC) #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
unsigned long l; unsigned long l;
pcc_ioread(0, port, &l, sizeof(l), 1, 0); pcc_ioread(0, port, &l, sizeof(l), 1, 0);
...@@ -137,7 +137,7 @@ unsigned char _inb_p(unsigned long port) ...@@ -137,7 +137,7 @@ unsigned char _inb_p(unsigned long port)
if (port >= 0x300 && port < 0x320) if (port >= 0x300 && port < 0x320)
v = _ne_inb(PORT2ADDR_NE(port)); v = _ne_inb(PORT2ADDR_NE(port));
else else
#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32RPCC) #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
unsigned char b; unsigned char b;
pcc_ioread(0, port, &b, sizeof(b), 1, 0); pcc_ioread(0, port, &b, sizeof(b), 1, 0);
...@@ -161,7 +161,7 @@ unsigned short _inw_p(unsigned long port) ...@@ -161,7 +161,7 @@ unsigned short _inw_p(unsigned long port)
if (port >= 0x300 && port < 0x320) if (port >= 0x300 && port < 0x320)
v = _ne_inw(PORT2ADDR_NE(port)); v = _ne_inw(PORT2ADDR_NE(port));
else else
#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32RPCC) #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
unsigned short w; unsigned short w;
pcc_ioread(0, port, &w, sizeof(w), 1, 0); pcc_ioread(0, port, &w, sizeof(w), 1, 0);
...@@ -192,7 +192,7 @@ void _outb(unsigned char b, unsigned long port) ...@@ -192,7 +192,7 @@ void _outb(unsigned char b, unsigned long port)
if (port >= 0x300 && port < 0x320) if (port >= 0x300 && port < 0x320)
_ne_outb(b, PORT2ADDR_NE(port)); _ne_outb(b, PORT2ADDR_NE(port));
else else
#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32RPCC) #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
pcc_iowrite(0, port, &b, sizeof(b), 1, 0); pcc_iowrite(0, port, &b, sizeof(b), 1, 0);
} else if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) { } else if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) {
...@@ -207,7 +207,7 @@ void _outw(unsigned short w, unsigned long port) ...@@ -207,7 +207,7 @@ void _outw(unsigned short w, unsigned long port)
if (port >= 0x300 && port < 0x320) if (port >= 0x300 && port < 0x320)
_ne_outw(w, PORT2ADDR_NE(port)); _ne_outw(w, PORT2ADDR_NE(port));
else else
#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32RPCC) #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
pcc_iowrite(0, port, &w, sizeof(w), 1, 0); pcc_iowrite(0, port, &w, sizeof(w), 1, 0);
} else if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) { } else if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) {
...@@ -219,7 +219,7 @@ void _outw(unsigned short w, unsigned long port) ...@@ -219,7 +219,7 @@ void _outw(unsigned short w, unsigned long port)
void _outl(unsigned long l, unsigned long port) void _outl(unsigned long l, unsigned long port)
{ {
#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32RPCC) #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
pcc_iowrite(0, port, &l, sizeof(l), 1, 0); pcc_iowrite(0, port, &l, sizeof(l), 1, 0);
} else if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) { } else if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) {
...@@ -234,7 +234,7 @@ void _outb_p(unsigned char b, unsigned long port) ...@@ -234,7 +234,7 @@ void _outb_p(unsigned char b, unsigned long port)
if (port >= 0x300 && port < 0x320) if (port >= 0x300 && port < 0x320)
_ne_outb(b, PORT2ADDR_NE(port)); _ne_outb(b, PORT2ADDR_NE(port));
else else
#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32RPCC) #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
pcc_iowrite(0, port, &b, sizeof(b), 1, 0); pcc_iowrite(0, port, &b, sizeof(b), 1, 0);
} else if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) { } else if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) {
...@@ -251,7 +251,7 @@ void _outw_p(unsigned short w, unsigned long port) ...@@ -251,7 +251,7 @@ void _outw_p(unsigned short w, unsigned long port)
if (port >= 0x300 && port < 0x320) if (port >= 0x300 && port < 0x320)
_ne_outw(w, PORT2ADDR_NE(port)); _ne_outw(w, PORT2ADDR_NE(port));
else else
#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32RPCC) #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
pcc_iowrite(0, port, &w, sizeof(w), 1, 0); pcc_iowrite(0, port, &w, sizeof(w), 1, 0);
} else if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) { } else if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) {
...@@ -277,7 +277,7 @@ void _insb(unsigned int port, void * addr, unsigned long count) ...@@ -277,7 +277,7 @@ void _insb(unsigned int port, void * addr, unsigned long count)
if (port >= 0x300 && port < 0x320){ if (port >= 0x300 && port < 0x320){
portp = PORT2ADDR_NE(port); portp = PORT2ADDR_NE(port);
while(count--) *buf++ = *(volatile unsigned char *)portp; while(count--) *buf++ = *(volatile unsigned char *)portp;
#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32RPCC) #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
} else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { } else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
pcc_ioread(0, port, (void *)addr, sizeof(unsigned char), count, 1); pcc_ioread(0, port, (void *)addr, sizeof(unsigned char), count, 1);
} else if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) { } else if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) {
...@@ -297,7 +297,7 @@ void _insw(unsigned int port, void * addr, unsigned long count) ...@@ -297,7 +297,7 @@ void _insw(unsigned int port, void * addr, unsigned long count)
if (port >= 0x300 && port < 0x320) { if (port >= 0x300 && port < 0x320) {
portp = PORT2ADDR_NE(port); portp = PORT2ADDR_NE(port);
while (count--) *buf++ = _ne_inw(portp); while (count--) *buf++ = _ne_inw(portp);
#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32RPCC) #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
} else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { } else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
pcc_ioread(0, port, (void *)addr, sizeof(unsigned short), count, 1); pcc_ioread(0, port, (void *)addr, sizeof(unsigned short), count, 1);
} else if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) { } else if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) {
...@@ -326,7 +326,7 @@ void _outsb(unsigned int port, const void * addr, unsigned long count) ...@@ -326,7 +326,7 @@ void _outsb(unsigned int port, const void * addr, unsigned long count)
if (port >= 0x300 && port < 0x320) { if (port >= 0x300 && port < 0x320) {
portp = PORT2ADDR_NE(port); portp = PORT2ADDR_NE(port);
while (count--) _ne_outb(*buf++, portp); while (count--) _ne_outb(*buf++, portp);
#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32RPCC) #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
} else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { } else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
pcc_iowrite(0, port, (void *)addr, sizeof(unsigned char), count, 1); pcc_iowrite(0, port, (void *)addr, sizeof(unsigned char), count, 1);
} else if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) { } else if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) {
...@@ -346,7 +346,7 @@ void _outsw(unsigned int port, const void * addr, unsigned long count) ...@@ -346,7 +346,7 @@ void _outsw(unsigned int port, const void * addr, unsigned long count)
if (port >= 0x300 && port < 0x320) { if (port >= 0x300 && port < 0x320) {
portp = PORT2ADDR_NE(port); portp = PORT2ADDR_NE(port);
while (count--) _ne_outw(*buf++, portp); while (count--) _ne_outw(*buf++, portp);
#if defined(CONFIG_PCMCIA) && defined(CONFIG_M32RPCC) #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC)
} else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { } else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) {
pcc_iowrite(0, port, (void *)addr, sizeof(unsigned short), count, 1); pcc_iowrite(0, port, (void *)addr, sizeof(unsigned short), count, 1);
} else if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) { } else if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) {
......
arch/m32r/kernel/setup_mappi.c
View file @ af5d5df2
...@@ -140,7 +140,7 @@ void __init init_IRQ(void) ...@@ -140,7 +140,7 @@ void __init init_IRQ(void)
disable_mappi_irq(M32R_IRQ_SIO1_S); disable_mappi_irq(M32R_IRQ_SIO1_S);
#endif /* CONFIG_SERIAL_M32R_SIO */ #endif /* CONFIG_SERIAL_M32R_SIO */
#if defined(CONFIG_M32RPCC) #if defined(CONFIG_M32R_PCC)
/* INT1 : pccard0 interrupt */ /* INT1 : pccard0 interrupt */
irq_desc[M32R_IRQ_INT1].status = IRQ_DISABLED; irq_desc[M32R_IRQ_INT1].status = IRQ_DISABLED;
irq_desc[M32R_IRQ_INT1].handler = &mappi_irq_type; irq_desc[M32R_IRQ_INT1].handler = &mappi_irq_type;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7