diff options
Diffstat (limited to 'arch/sh/kernel/cf-enabler.c')
-rw-r--r-- | arch/sh/kernel/cf-enabler.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/arch/sh/kernel/cf-enabler.c b/arch/sh/kernel/cf-enabler.c index 1c3b99642e1c..01ff4d05aab0 100644 --- a/arch/sh/kernel/cf-enabler.c +++ b/arch/sh/kernel/cf-enabler.c | |||
@@ -83,6 +83,8 @@ static int __init cf_init_default(void) | |||
83 | #include <asm/se.h> | 83 | #include <asm/se.h> |
84 | #elif defined(CONFIG_SH_7722_SOLUTION_ENGINE) | 84 | #elif defined(CONFIG_SH_7722_SOLUTION_ENGINE) |
85 | #include <asm/se7722.h> | 85 | #include <asm/se7722.h> |
86 | #elif defined(CONFIG_SH_7721_SOLUTION_ENGINE) | ||
87 | #include <asm/se7721.h> | ||
86 | #endif | 88 | #endif |
87 | 89 | ||
88 | /* | 90 | /* |
@@ -99,7 +101,9 @@ static int __init cf_init_default(void) | |||
99 | * 0xB0600000 : I/O | 101 | * 0xB0600000 : I/O |
100 | */ | 102 | */ |
101 | 103 | ||
102 | #if defined(CONFIG_SH_SOLUTION_ENGINE) || defined(CONFIG_SH_7722_SOLUTION_ENGINE) | 104 | #if defined(CONFIG_SH_SOLUTION_ENGINE) || \ |
105 | defined(CONFIG_SH_7722_SOLUTION_ENGINE) || \ | ||
106 | defined(CONFIG_SH_7721_SOLUTION_ENGINE) | ||
103 | static int __init cf_init_se(void) | 107 | static int __init cf_init_se(void) |
104 | { | 108 | { |
105 | if ((ctrl_inw(MRSHPC_CSR) & 0x000c) != 0) | 109 | if ((ctrl_inw(MRSHPC_CSR) & 0x000c) != 0) |
@@ -112,7 +116,7 @@ static int __init cf_init_se(void) | |||
112 | } | 116 | } |
113 | 117 | ||
114 | /* | 118 | /* |
115 | * PC-Card window open | 119 | * PC-Card window open |
116 | * flag == COMMON/ATTRIBUTE/IO | 120 | * flag == COMMON/ATTRIBUTE/IO |
117 | */ | 121 | */ |
118 | /* common window open */ | 122 | /* common window open */ |
@@ -122,7 +126,7 @@ static int __init cf_init_se(void) | |||
122 | ctrl_outw(0x0b00, MRSHPC_MW0CR2); | 126 | ctrl_outw(0x0b00, MRSHPC_MW0CR2); |
123 | else | 127 | else |
124 | /* common mode & bus width 16bit SWAP = 0*/ | 128 | /* common mode & bus width 16bit SWAP = 0*/ |
125 | ctrl_outw(0x0300, MRSHPC_MW0CR2); | 129 | ctrl_outw(0x0300, MRSHPC_MW0CR2); |
126 | 130 | ||
127 | /* attribute window open */ | 131 | /* attribute window open */ |
128 | ctrl_outw(0x8a85, MRSHPC_MW1CR1); | 132 | ctrl_outw(0x8a85, MRSHPC_MW1CR1); |
@@ -155,10 +159,9 @@ static int __init cf_init_se(void) | |||
155 | 159 | ||
156 | int __init cf_init(void) | 160 | int __init cf_init(void) |
157 | { | 161 | { |
158 | if( mach_is_se() || mach_is_7722se() ){ | 162 | if (mach_is_se() || mach_is_7722se() || mach_is_7721se()) |
159 | return cf_init_se(); | 163 | return cf_init_se(); |
160 | } | 164 | |
161 | |||
162 | return cf_init_default(); | 165 | return cf_init_default(); |
163 | } | 166 | } |
164 | 167 | ||