diff options
Diffstat (limited to 'arch/sh/boards/se/73180')
-rw-r--r-- | arch/sh/boards/se/73180/io.c | 6 | ||||
-rw-r--r-- | arch/sh/boards/se/73180/irq.c | 9 | ||||
-rw-r--r-- | arch/sh/boards/se/73180/led.c | 15 |
3 files changed, 6 insertions, 24 deletions
diff --git a/arch/sh/boards/se/73180/io.c b/arch/sh/boards/se/73180/io.c index 755df5ac4a4e..72715575458b 100644 --- a/arch/sh/boards/se/73180/io.c +++ b/arch/sh/boards/se/73180/io.c | |||
@@ -99,6 +99,7 @@ bad_outb(struct iop *p, unsigned char value, unsigned long port) | |||
99 | badio(inw, port); | 99 | badio(inw, port); |
100 | } | 100 | } |
101 | 101 | ||
102 | #ifdef CONFIG_SMC91X | ||
102 | /* MSTLANEX01 LAN at 0xb400:0000 */ | 103 | /* MSTLANEX01 LAN at 0xb400:0000 */ |
103 | static struct iop laniop = { | 104 | static struct iop laniop = { |
104 | .start = 0x300, | 105 | .start = 0x300, |
@@ -110,6 +111,7 @@ static struct iop laniop = { | |||
110 | .outb = simple_outb, | 111 | .outb = simple_outb, |
111 | .outw = simple_outw, | 112 | .outw = simple_outw, |
112 | }; | 113 | }; |
114 | #endif | ||
113 | 115 | ||
114 | /* NE2000 pc card NIC */ | 116 | /* NE2000 pc card NIC */ |
115 | static struct iop neiop = { | 117 | static struct iop neiop = { |
@@ -123,6 +125,7 @@ static struct iop neiop = { | |||
123 | .outw = simple_outw, | 125 | .outw = simple_outw, |
124 | }; | 126 | }; |
125 | 127 | ||
128 | #ifdef CONFIG_IDE | ||
126 | /* CF in CF slot */ | 129 | /* CF in CF slot */ |
127 | static struct iop cfiop = { | 130 | static struct iop cfiop = { |
128 | .base = 0xb0600000, | 131 | .base = 0xb0600000, |
@@ -132,12 +135,13 @@ static struct iop cfiop = { | |||
132 | .outb = pcc_outb, | 135 | .outb = pcc_outb, |
133 | .outw = simple_outw, | 136 | .outw = simple_outw, |
134 | }; | 137 | }; |
138 | #endif | ||
135 | 139 | ||
136 | static __inline__ struct iop * | 140 | static __inline__ struct iop * |
137 | port2iop(unsigned long port) | 141 | port2iop(unsigned long port) |
138 | { | 142 | { |
139 | if (0) ; | 143 | if (0) ; |
140 | #if defined(CONFIG_SMC91111) | 144 | #if defined(CONFIG_SMC91X) |
141 | else if (laniop.check(&laniop, port)) | 145 | else if (laniop.check(&laniop, port)) |
142 | return &laniop; | 146 | return &laniop; |
143 | #endif | 147 | #endif |
diff --git a/arch/sh/boards/se/73180/irq.c b/arch/sh/boards/se/73180/irq.c index 4344d0ef24aa..2c62b8ea350e 100644 --- a/arch/sh/boards/se/73180/irq.c +++ b/arch/sh/boards/se/73180/irq.c | |||
@@ -7,7 +7,6 @@ | |||
7 | * Modified for SH-Mobile SolutionEngine 73180 Support | 7 | * Modified for SH-Mobile SolutionEngine 73180 Support |
8 | * by YOSHII Takashi <yoshii-takashi@hitachi-ul.co.jp> | 8 | * by YOSHII Takashi <yoshii-takashi@hitachi-ul.co.jp> |
9 | * | 9 | * |
10 | * | ||
11 | */ | 10 | */ |
12 | 11 | ||
13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
@@ -17,14 +16,6 @@ | |||
17 | #include <asm/mach/se73180.h> | 16 | #include <asm/mach/se73180.h> |
18 | 17 | ||
19 | static int | 18 | static int |
20 | intreq2irq(int i) | ||
21 | { | ||
22 | if (i == 5) | ||
23 | return 10; | ||
24 | return 32 + 7 - i; | ||
25 | } | ||
26 | |||
27 | static int | ||
28 | irq2intreq(int irq) | 19 | irq2intreq(int irq) |
29 | { | 20 | { |
30 | if (irq == 10) | 21 | if (irq == 10) |
diff --git a/arch/sh/boards/se/73180/led.c b/arch/sh/boards/se/73180/led.c index 610439fde6ee..4b72e9a3ead9 100644 --- a/arch/sh/boards/se/73180/led.c +++ b/arch/sh/boards/se/73180/led.c | |||
@@ -14,21 +14,8 @@ | |||
14 | #include <linux/sched.h> | 14 | #include <linux/sched.h> |
15 | #include <asm/mach/se73180.h> | 15 | #include <asm/mach/se73180.h> |
16 | 16 | ||
17 | static void | ||
18 | mach_led(int position, int value) | ||
19 | { | ||
20 | volatile unsigned short *p = (volatile unsigned short *) PA_LED; | ||
21 | |||
22 | if (value) { | ||
23 | *p |= (1 << LED_SHIFT); | ||
24 | } else { | ||
25 | *p &= ~(1 << LED_SHIFT); | ||
26 | } | ||
27 | } | ||
28 | |||
29 | /* Cycle the LED's in the clasic Knightrider/Sun pattern */ | 17 | /* Cycle the LED's in the clasic Knightrider/Sun pattern */ |
30 | void | 18 | void heartbeat_73180se(void) |
31 | heartbeat_73180se(void) | ||
32 | { | 19 | { |
33 | static unsigned int cnt = 0, period = 0; | 20 | static unsigned int cnt = 0, period = 0; |
34 | volatile unsigned short *p = (volatile unsigned short *) PA_LED; | 21 | volatile unsigned short *p = (volatile unsigned short *) PA_LED; |