diff options
Diffstat (limited to 'arch/powerpc/platforms/powermac/feature.c')
-rw-r--r-- | arch/powerpc/platforms/powermac/feature.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c index 50ed8890dd33..c8b4a2b115a9 100644 --- a/arch/powerpc/platforms/powermac/feature.c +++ b/arch/powerpc/platforms/powermac/feature.c | |||
@@ -1644,10 +1644,10 @@ static void intrepid_shutdown(struct macio_chip *macio, int sleep_mode) | |||
1644 | KL0_SCC_CELL_ENABLE); | 1644 | KL0_SCC_CELL_ENABLE); |
1645 | 1645 | ||
1646 | MACIO_BIC(KEYLARGO_FCR1, | 1646 | MACIO_BIC(KEYLARGO_FCR1, |
1647 | /*KL1_USB2_CELL_ENABLE |*/ | ||
1648 | KL1_I2S0_CELL_ENABLE | KL1_I2S0_CLK_ENABLE_BIT | | 1647 | KL1_I2S0_CELL_ENABLE | KL1_I2S0_CLK_ENABLE_BIT | |
1649 | KL1_I2S0_ENABLE | KL1_I2S1_CELL_ENABLE | | 1648 | KL1_I2S0_ENABLE | KL1_I2S1_CELL_ENABLE | |
1650 | KL1_I2S1_CLK_ENABLE_BIT | KL1_I2S1_ENABLE); | 1649 | KL1_I2S1_CLK_ENABLE_BIT | KL1_I2S1_ENABLE | |
1650 | KL1_EIDE0_ENABLE); | ||
1651 | if (pmac_mb.board_flags & PMAC_MB_MOBILE) | 1651 | if (pmac_mb.board_flags & PMAC_MB_MOBILE) |
1652 | MACIO_BIC(KEYLARGO_FCR1, KL1_UIDE_RESET_N); | 1652 | MACIO_BIC(KEYLARGO_FCR1, KL1_UIDE_RESET_N); |
1653 | 1653 | ||
@@ -2181,7 +2181,7 @@ static struct pmac_mb_def pmac_mb_defs[] = { | |||
2181 | }, | 2181 | }, |
2182 | { "PowerMac10,1", "Mac mini", | 2182 | { "PowerMac10,1", "Mac mini", |
2183 | PMAC_TYPE_UNKNOWN_INTREPID, intrepid_features, | 2183 | PMAC_TYPE_UNKNOWN_INTREPID, intrepid_features, |
2184 | PMAC_MB_MAY_SLEEP | PMAC_MB_HAS_FW_POWER, | 2184 | PMAC_MB_MAY_SLEEP, |
2185 | }, | 2185 | }, |
2186 | { "iMac,1", "iMac (first generation)", | 2186 | { "iMac,1", "iMac (first generation)", |
2187 | PMAC_TYPE_ORIG_IMAC, paddington_features, | 2187 | PMAC_TYPE_ORIG_IMAC, paddington_features, |
@@ -2293,11 +2293,11 @@ static struct pmac_mb_def pmac_mb_defs[] = { | |||
2293 | }, | 2293 | }, |
2294 | { "PowerBook5,8", "PowerBook G4 15\"", | 2294 | { "PowerBook5,8", "PowerBook G4 15\"", |
2295 | PMAC_TYPE_UNKNOWN_INTREPID, intrepid_features, | 2295 | PMAC_TYPE_UNKNOWN_INTREPID, intrepid_features, |
2296 | PMAC_MB_MAY_SLEEP | PMAC_MB_HAS_FW_POWER | PMAC_MB_MOBILE, | 2296 | PMAC_MB_MAY_SLEEP | PMAC_MB_MOBILE, |
2297 | }, | 2297 | }, |
2298 | { "PowerBook5,9", "PowerBook G4 17\"", | 2298 | { "PowerBook5,9", "PowerBook G4 17\"", |
2299 | PMAC_TYPE_UNKNOWN_INTREPID, intrepid_features, | 2299 | PMAC_TYPE_UNKNOWN_INTREPID, intrepid_features, |
2300 | PMAC_MB_MAY_SLEEP | PMAC_MB_HAS_FW_POWER | PMAC_MB_MOBILE, | 2300 | PMAC_MB_MAY_SLEEP | PMAC_MB_MOBILE, |
2301 | }, | 2301 | }, |
2302 | { "PowerBook6,1", "PowerBook G4 12\"", | 2302 | { "PowerBook6,1", "PowerBook G4 12\"", |
2303 | PMAC_TYPE_UNKNOWN_INTREPID, intrepid_features, | 2303 | PMAC_TYPE_UNKNOWN_INTREPID, intrepid_features, |