aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ppc')
-rw-r--r--arch/ppc/platforms/pmac_feature.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/arch/ppc/platforms/pmac_feature.c b/arch/ppc/platforms/pmac_feature.c
index f0bb3d39b686..867336ad5d36 100644
--- a/arch/ppc/platforms/pmac_feature.c
+++ b/arch/ppc/platforms/pmac_feature.c
@@ -1591,8 +1591,10 @@ intrepid_shutdown(struct macio_chip* macio, int sleep_mode)
1591} 1591}
1592 1592
1593 1593
1594static void __pmac pmac_tweak_clock_spreading(struct macio_chip* macio, int enable) 1594void __pmac pmac_tweak_clock_spreading(int enable)
1595{ 1595{
1596 struct macio_chip* macio = &macio_chips[0];
1597
1596 /* Hack for doing clock spreading on some machines PowerBooks and 1598 /* Hack for doing clock spreading on some machines PowerBooks and
1597 * iBooks. This implements the "platform-do-clockspreading" OF 1599 * iBooks. This implements the "platform-do-clockspreading" OF
1598 * property as decoded manually on various models. For safety, we also 1600 * property as decoded manually on various models. For safety, we also
@@ -1707,9 +1709,6 @@ core99_sleep(void)
1707 macio->type != macio_intrepid) 1709 macio->type != macio_intrepid)
1708 return -ENODEV; 1710 return -ENODEV;
1709 1711
1710 /* Disable clock spreading */
1711 pmac_tweak_clock_spreading(macio, 0);
1712
1713 /* We power off the wireless slot in case it was not done 1712 /* We power off the wireless slot in case it was not done
1714 * by the driver. We don't power it on automatically however 1713 * by the driver. We don't power it on automatically however
1715 */ 1714 */
@@ -1852,9 +1851,6 @@ core99_wake_up(void)
1852 UN_OUT(UNI_N_CLOCK_CNTL, save_unin_clock_ctl); 1851 UN_OUT(UNI_N_CLOCK_CNTL, save_unin_clock_ctl);
1853 udelay(100); 1852 udelay(100);
1854 1853
1855 /* Enable clock spreading */
1856 pmac_tweak_clock_spreading(macio, 1);
1857
1858 return 0; 1854 return 0;
1859} 1855}
1860 1856
@@ -2822,7 +2818,7 @@ set_initial_features(void)
2822 * clock spreading now. This should be a platform function but we 2818 * clock spreading now. This should be a platform function but we
2823 * don't do these at the moment 2819 * don't do these at the moment
2824 */ 2820 */
2825 pmac_tweak_clock_spreading(&macio_chips[0], 1); 2821 pmac_tweak_clock_spreading(1);
2826 2822
2827#endif /* CONFIG_POWER4 */ 2823#endif /* CONFIG_POWER4 */
2828 2824