diff options
Diffstat (limited to 'arch/sh/kernel')
-rw-r--r-- | arch/sh/kernel/Makefile_32 | 1 | ||||
-rw-r--r-- | arch/sh/kernel/Makefile_64 | 1 | ||||
-rw-r--r-- | arch/sh/kernel/cf-enabler.c | 168 |
3 files changed, 0 insertions, 170 deletions
diff --git a/arch/sh/kernel/Makefile_32 b/arch/sh/kernel/Makefile_32 index df25304ad780..3c975ab45590 100644 --- a/arch/sh/kernel/Makefile_32 +++ b/arch/sh/kernel/Makefile_32 | |||
@@ -17,7 +17,6 @@ obj-y := debugtraps.o disassemble.o idle.o io.o io_generic.o irq.o \ | |||
17 | obj-y += cpu/ timers/ | 17 | obj-y += cpu/ timers/ |
18 | obj-$(CONFIG_VSYSCALL) += vsyscall/ | 18 | obj-$(CONFIG_VSYSCALL) += vsyscall/ |
19 | obj-$(CONFIG_SMP) += smp.o | 19 | obj-$(CONFIG_SMP) += smp.o |
20 | obj-$(CONFIG_CF_ENABLER) += cf-enabler.o | ||
21 | obj-$(CONFIG_SH_STANDARD_BIOS) += sh_bios.o | 20 | obj-$(CONFIG_SH_STANDARD_BIOS) += sh_bios.o |
22 | obj-$(CONFIG_KGDB) += kgdb.o | 21 | obj-$(CONFIG_KGDB) += kgdb.o |
23 | obj-$(CONFIG_SH_CPU_FREQ) += cpufreq.o | 22 | obj-$(CONFIG_SH_CPU_FREQ) += cpufreq.o |
diff --git a/arch/sh/kernel/Makefile_64 b/arch/sh/kernel/Makefile_64 index 678408cc35ca..fe425d7f6871 100644 --- a/arch/sh/kernel/Makefile_64 +++ b/arch/sh/kernel/Makefile_64 | |||
@@ -7,7 +7,6 @@ obj-y := debugtraps.o idle.o io.o io_generic.o irq.o machvec.o process_64.o \ | |||
7 | obj-y += cpu/ timers/ | 7 | obj-y += cpu/ timers/ |
8 | obj-$(CONFIG_VSYSCALL) += vsyscall/ | 8 | obj-$(CONFIG_VSYSCALL) += vsyscall/ |
9 | obj-$(CONFIG_SMP) += smp.o | 9 | obj-$(CONFIG_SMP) += smp.o |
10 | obj-$(CONFIG_CF_ENABLER) += cf-enabler.o | ||
11 | obj-$(CONFIG_SH_STANDARD_BIOS) += sh_bios.o | 10 | obj-$(CONFIG_SH_STANDARD_BIOS) += sh_bios.o |
12 | obj-$(CONFIG_SH_CPU_FREQ) += cpufreq.o | 11 | obj-$(CONFIG_SH_CPU_FREQ) += cpufreq.o |
13 | obj-$(CONFIG_MODULES) += sh_ksyms_64.o module.o | 12 | obj-$(CONFIG_MODULES) += sh_ksyms_64.o module.o |
diff --git a/arch/sh/kernel/cf-enabler.c b/arch/sh/kernel/cf-enabler.c deleted file mode 100644 index bea40339919b..000000000000 --- a/arch/sh/kernel/cf-enabler.c +++ /dev/null | |||
@@ -1,168 +0,0 @@ | |||
1 | /* $Id: cf-enabler.c,v 1.4 2004/02/22 22:44:36 kkojima Exp $ | ||
2 | * | ||
3 | * linux/drivers/block/cf-enabler.c | ||
4 | * | ||
5 | * Copyright (C) 1999 Niibe Yutaka | ||
6 | * Copyright (C) 2000 Toshiharu Nozawa | ||
7 | * Copyright (C) 2001 A&D Co., Ltd. | ||
8 | * | ||
9 | * Enable the CF configuration. | ||
10 | */ | ||
11 | |||
12 | #include <linux/init.h> | ||
13 | #include <linux/mm.h> | ||
14 | #include <linux/vmalloc.h> | ||
15 | #include <linux/interrupt.h> | ||
16 | #include <asm/io.h> | ||
17 | #include <asm/irq.h> | ||
18 | |||
19 | /* | ||
20 | * You can connect Compact Flash directly to the bus of SuperH. | ||
21 | * This is the enabler for that. | ||
22 | * | ||
23 | * SIM: How generic is this really? It looks pretty board, or at | ||
24 | * least SH sub-type, specific to me. | ||
25 | * I know it doesn't work on the Overdrive! | ||
26 | */ | ||
27 | |||
28 | /* | ||
29 | * 0xB8000000 : Attribute | ||
30 | * 0xB8001000 : Common Memory | ||
31 | * 0xBA000000 : I/O | ||
32 | */ | ||
33 | #if defined(CONFIG_CPU_SH4) | ||
34 | /* SH4 can't access PCMCIA interface through P2 area. | ||
35 | * we must remap it with appropriate attribute bit of the page set. | ||
36 | * this part is based on Greg Banks' hd64465_ss.c implementation - Masahiro Abe */ | ||
37 | |||
38 | #if defined(CONFIG_CF_AREA6) | ||
39 | #define slot_no 0 | ||
40 | #else | ||
41 | #define slot_no 1 | ||
42 | #endif | ||
43 | |||
44 | /* use this pointer to access to directly connected compact flash io area*/ | ||
45 | void *cf_io_base; | ||
46 | |||
47 | static int __init allocate_cf_area(void) | ||
48 | { | ||
49 | pgprot_t prot; | ||
50 | unsigned long paddrbase, psize; | ||
51 | |||
52 | /* open I/O area window */ | ||
53 | paddrbase = virt_to_phys((void*)CONFIG_CF_BASE_ADDR); | ||
54 | psize = PAGE_SIZE; | ||
55 | prot = PAGE_KERNEL_PCC(slot_no, _PAGE_PCC_IO16); | ||
56 | cf_io_base = p3_ioremap(paddrbase, psize, prot.pgprot); | ||
57 | if (!cf_io_base) { | ||
58 | printk("allocate_cf_area : can't open CF I/O window!\n"); | ||
59 | return -ENOMEM; | ||
60 | } | ||
61 | /* printk("p3_ioremap(paddr=0x%08lx, psize=0x%08lx, prot=0x%08lx)=0x%08lx\n", | ||
62 | paddrbase, psize, prot.pgprot, cf_io_base);*/ | ||
63 | |||
64 | /* XXX : do we need attribute and common-memory area also? */ | ||
65 | |||
66 | return 0; | ||
67 | } | ||
68 | #endif | ||
69 | |||
70 | static int __init cf_init_default(void) | ||
71 | { | ||
72 | /* You must have enabled the card, and set the level interrupt | ||
73 | * before reaching this point. Possibly in boot ROM or boot loader. | ||
74 | */ | ||
75 | #if defined(CONFIG_CPU_SH4) | ||
76 | allocate_cf_area(); | ||
77 | #endif | ||
78 | |||
79 | return 0; | ||
80 | } | ||
81 | |||
82 | #if defined(CONFIG_SH_SOLUTION_ENGINE) | ||
83 | #include <mach-se/mach/se.h> | ||
84 | #elif defined(CONFIG_SH_7722_SOLUTION_ENGINE) | ||
85 | #include <mach-se/mach/se7722.h> | ||
86 | #elif defined(CONFIG_SH_7721_SOLUTION_ENGINE) | ||
87 | #include <mach-se/mach/se7721.h> | ||
88 | #endif | ||
89 | |||
90 | /* | ||
91 | * SolutionEngine Seriese | ||
92 | * | ||
93 | * about MS770xSE | ||
94 | * 0xB8400000 : Common Memory | ||
95 | * 0xB8500000 : Attribute | ||
96 | * 0xB8600000 : I/O | ||
97 | * | ||
98 | * about MS7722SE | ||
99 | * 0xB0400000 : Common Memory | ||
100 | * 0xB0500000 : Attribute | ||
101 | * 0xB0600000 : I/O | ||
102 | */ | ||
103 | |||
104 | #if defined(CONFIG_SH_SOLUTION_ENGINE) || \ | ||
105 | defined(CONFIG_SH_7722_SOLUTION_ENGINE) || \ | ||
106 | defined(CONFIG_SH_7721_SOLUTION_ENGINE) | ||
107 | static int __init cf_init_se(void) | ||
108 | { | ||
109 | if ((ctrl_inw(MRSHPC_CSR) & 0x000c) != 0) | ||
110 | return 0; /* Not detected */ | ||
111 | |||
112 | if ((ctrl_inw(MRSHPC_CSR) & 0x0080) == 0) { | ||
113 | ctrl_outw(0x0674, MRSHPC_CPWCR); /* Card Vcc is 3.3v? */ | ||
114 | } else { | ||
115 | ctrl_outw(0x0678, MRSHPC_CPWCR); /* Card Vcc is 5V */ | ||
116 | } | ||
117 | |||
118 | /* | ||
119 | * PC-Card window open | ||
120 | * flag == COMMON/ATTRIBUTE/IO | ||
121 | */ | ||
122 | /* common window open */ | ||
123 | ctrl_outw(0x8a84, MRSHPC_MW0CR1); | ||
124 | if((ctrl_inw(MRSHPC_CSR) & 0x4000) != 0) | ||
125 | /* common mode & bus width 16bit SWAP = 1*/ | ||
126 | ctrl_outw(0x0b00, MRSHPC_MW0CR2); | ||
127 | else | ||
128 | /* common mode & bus width 16bit SWAP = 0*/ | ||
129 | ctrl_outw(0x0300, MRSHPC_MW0CR2); | ||
130 | |||
131 | /* attribute window open */ | ||
132 | ctrl_outw(0x8a85, MRSHPC_MW1CR1); | ||
133 | if ((ctrl_inw(MRSHPC_CSR) & 0x4000) != 0) | ||
134 | /* attribute mode & bus width 16bit SWAP = 1*/ | ||
135 | ctrl_outw(0x0a00, MRSHPC_MW1CR2); | ||
136 | else | ||
137 | /* attribute mode & bus width 16bit SWAP = 0*/ | ||
138 | ctrl_outw(0x0200, MRSHPC_MW1CR2); | ||
139 | |||
140 | /* I/O window open */ | ||
141 | ctrl_outw(0x8a86, MRSHPC_IOWCR1); | ||
142 | ctrl_outw(0x0008, MRSHPC_CDCR); /* I/O card mode */ | ||
143 | if ((ctrl_inw(MRSHPC_CSR) & 0x4000) != 0) | ||
144 | ctrl_outw(0x0a00, MRSHPC_IOWCR2); /* bus width 16bit SWAP = 1*/ | ||
145 | else | ||
146 | ctrl_outw(0x0200, MRSHPC_IOWCR2); /* bus width 16bit SWAP = 0*/ | ||
147 | |||
148 | ctrl_outw(0x2000, MRSHPC_ICR); | ||
149 | ctrl_outb(0x00, PA_MRSHPC_MW2 + 0x206); | ||
150 | ctrl_outb(0x42, PA_MRSHPC_MW2 + 0x200); | ||
151 | return 0; | ||
152 | } | ||
153 | #else | ||
154 | static int __init cf_init_se(void) | ||
155 | { | ||
156 | return -1; | ||
157 | } | ||
158 | #endif | ||
159 | |||
160 | static int __init cf_init(void) | ||
161 | { | ||
162 | if (mach_is_se() || mach_is_7722se() || mach_is_7721se()) | ||
163 | return cf_init_se(); | ||
164 | |||
165 | return cf_init_default(); | ||
166 | } | ||
167 | |||
168 | __initcall (cf_init); | ||