diff options
Diffstat (limited to 'arch/mips/sgi-ip22/ip22-mc.c')
-rw-r--r-- | arch/mips/sgi-ip22/ip22-mc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/mips/sgi-ip22/ip22-mc.c b/arch/mips/sgi-ip22/ip22-mc.c index d22262ee685..75ada8a9713 100644 --- a/arch/mips/sgi-ip22/ip22-mc.c +++ b/arch/mips/sgi-ip22/ip22-mc.c | |||
@@ -139,11 +139,11 @@ void __init sgimc_init(void) | |||
139 | * zero. | 139 | * zero. |
140 | */ | 140 | */ |
141 | /* don't touch parity settings for IP28 */ | 141 | /* don't touch parity settings for IP28 */ |
142 | #ifndef CONFIG_SGI_IP28 | ||
143 | tmp = sgimc->cpuctrl0; | 142 | tmp = sgimc->cpuctrl0; |
144 | tmp |= (SGIMC_CCTRL0_EPERRGIO | SGIMC_CCTRL0_EPERRMEM | | 143 | #ifndef CONFIG_SGI_IP28 |
145 | SGIMC_CCTRL0_R4KNOCHKPARR); | 144 | tmp |= SGIMC_CCTRL0_EPERRGIO | SGIMC_CCTRL0_EPERRMEM; |
146 | #endif | 145 | #endif |
146 | tmp |= SGIMC_CCTRL0_R4KNOCHKPARR; | ||
147 | sgimc->cpuctrl0 = tmp; | 147 | sgimc->cpuctrl0 = tmp; |
148 | 148 | ||
149 | /* Step 3: Setup the MC write buffer depth, this is controlled | 149 | /* Step 3: Setup the MC write buffer depth, this is controlled |
@@ -178,7 +178,8 @@ void __init sgimc_init(void) | |||
178 | */ | 178 | */ |
179 | 179 | ||
180 | /* First the basic invariants across all GIO64 implementations. */ | 180 | /* First the basic invariants across all GIO64 implementations. */ |
181 | tmp = SGIMC_GIOPAR_HPC64; /* All 1st HPC's interface at 64bits */ | 181 | tmp = sgimc->giopar & SGIMC_GIOPAR_GFX64; /* keep gfx 64bit settings */ |
182 | tmp |= SGIMC_GIOPAR_HPC64; /* All 1st HPC's interface at 64bits */ | ||
182 | tmp |= SGIMC_GIOPAR_ONEBUS; /* Only one physical GIO bus exists */ | 183 | tmp |= SGIMC_GIOPAR_ONEBUS; /* Only one physical GIO bus exists */ |
183 | 184 | ||
184 | if (ip22_is_fullhouse()) { | 185 | if (ip22_is_fullhouse()) { |
@@ -193,7 +194,6 @@ void __init sgimc_init(void) | |||
193 | tmp |= SGIMC_GIOPAR_PLINEEXP0; /* exp[01] pipelined */ | 194 | tmp |= SGIMC_GIOPAR_PLINEEXP0; /* exp[01] pipelined */ |
194 | tmp |= SGIMC_GIOPAR_PLINEEXP1; | 195 | tmp |= SGIMC_GIOPAR_PLINEEXP1; |
195 | tmp |= SGIMC_GIOPAR_MASTEREISA; /* EISA masters */ | 196 | tmp |= SGIMC_GIOPAR_MASTEREISA; /* EISA masters */ |
196 | tmp |= SGIMC_GIOPAR_GFX64; /* GFX at 64 bits */ | ||
197 | } | 197 | } |
198 | } else { | 198 | } else { |
199 | /* Guiness specific settings. */ | 199 | /* Guiness specific settings. */ |