[PATCH 16/20] powerpc/powermac: Use pm_power_off rather than ppc_md.power_off
flat view
STALE4396d
SUPERSEDED
From: Alexander Graf <hidden>
Date: 2014-10-01 13:28:22
Subsystem:
linux for power macintosh, linux for powerpc (32-bit and 64-bit), the rest · Maintainers:
Madhavan Srinivasan, Linus Torvalds
Revision v1 of 2 in this series.
Revisions (2)
- v1 current
- v2 [diff vs current]
The generic power off callback is pm_power_off. Use that one rather than the powerpc specific ppc_md.power_off. Signed-off-by: Alexander Graf <redacted> --- arch/powerpc/platforms/powermac/setup.c | 147 ++++++++++++++++---------------- 1 file changed, 74 insertions(+), 73 deletions(-)
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 141f8899..d3b0a87 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c@@ -274,6 +274,78 @@ static void __init l2cr_init(void) } #endif +#ifdef CONFIG_ADB_CUDA +static void cuda_restart(void) +{ + struct adb_request req; + + cuda_request(&req, NULL, 2, CUDA_PACKET, CUDA_RESET_SYSTEM); + for (;;) + cuda_poll(); +} + +static void cuda_shutdown(void) +{ + struct adb_request req; + + cuda_request(&req, NULL, 2, CUDA_PACKET, CUDA_POWERDOWN); + for (;;) + cuda_poll(); +} + +#else +#define cuda_restart() +#define cuda_shutdown() +#endif + +#ifndef CONFIG_ADB_PMU +#define pmu_restart() +#define pmu_shutdown() +#endif + +#ifndef CONFIG_PMAC_SMU +#define smu_restart() +#define smu_shutdown() +#endif + +static void pmac_restart(char *cmd) +{ + switch (sys_ctrler) { + case SYS_CTRLER_CUDA: + cuda_restart(); + break; + case SYS_CTRLER_PMU: + pmu_restart(); + break; + case SYS_CTRLER_SMU: + smu_restart(); + break; + default: ; + } +} + +static void pmac_power_off(void) +{ + switch (sys_ctrler) { + case SYS_CTRLER_CUDA: + cuda_shutdown(); + break; + case SYS_CTRLER_PMU: + pmu_shutdown(); + break; + case SYS_CTRLER_SMU: + smu_shutdown(); + break; + default: ; + } +} + +static void +pmac_halt(void) +{ + pmac_power_off(); +} + static void __init pmac_setup_arch(void) { struct device_node *cpu, *ic;
@@ -341,6 +413,8 @@ static void __init pmac_setup_arch(void) __adb_probe_sync = 1; } #endif /* CONFIG_ADB */ + + pm_power_off = pmac_power_off; } #ifdef CONFIG_SCSI
@@ -382,78 +456,6 @@ void __init_refok note_bootable_part(dev_t dev, int part, int goodness) current_root_goodness = goodness; } -#ifdef CONFIG_ADB_CUDA -static void cuda_restart(void) -{ - struct adb_request req; - - cuda_request(&req, NULL, 2, CUDA_PACKET, CUDA_RESET_SYSTEM); - for (;;) - cuda_poll(); -} - -static void cuda_shutdown(void) -{ - struct adb_request req; - - cuda_request(&req, NULL, 2, CUDA_PACKET, CUDA_POWERDOWN); - for (;;) - cuda_poll(); -} - -#else -#define cuda_restart() -#define cuda_shutdown() -#endif - -#ifndef CONFIG_ADB_PMU -#define pmu_restart() -#define pmu_shutdown() -#endif - -#ifndef CONFIG_PMAC_SMU -#define smu_restart() -#define smu_shutdown() -#endif - -static void pmac_restart(char *cmd) -{ - switch (sys_ctrler) { - case SYS_CTRLER_CUDA: - cuda_restart(); - break; - case SYS_CTRLER_PMU: - pmu_restart(); - break; - case SYS_CTRLER_SMU: - smu_restart(); - break; - default: ; - } -} - -static void pmac_power_off(void) -{ - switch (sys_ctrler) { - case SYS_CTRLER_CUDA: - cuda_shutdown(); - break; - case SYS_CTRLER_PMU: - pmu_shutdown(); - break; - case SYS_CTRLER_SMU: - smu_shutdown(); - break; - default: ; - } -} - -static void -pmac_halt(void) -{ - pmac_power_off(); -} - /* * Early initialization. */
@@ -663,7 +665,6 @@ define_machine(powermac) { .get_irq = NULL, /* changed later */ .pci_irq_fixup = pmac_pci_irq_fixup, .restart = pmac_restart, - .power_off = pmac_power_off, .halt = pmac_halt, .time_init = pmac_time_init, .get_boot_time = pmac_get_boot_time,
--
1.8.1.4