[PATCH] pmu_register_sleep_notifier needs ADB_PMU

[PATCH] pmu_register_sleep_notifier needs ADB_PMU

[Olaf Hering]

a simple patch for a pegsos user:
https://bugzilla.novell.com/show_bug.cgi?id=119606

arch/ppc/platforms/built-in.o(.init.text+0x10a4): In function `core99_wake_up':
: undefined reference to `pmu_register_sleep_notifier'
make[1]: *** [.tmp_vmlinux1] Error 1

Signed-off-by: Olaf Hering <olh@suse.de>

 arch/ppc/platforms/pmac_sleep.S |    2 +-
 arch/ppc/platforms/pmac_time.c  |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Index: linux-2.6.14-rc5/arch/ppc/platforms/pmac_sleep.S
===================================================================
--- linux-2.6.14-rc5.orig/arch/ppc/platforms/pmac_sleep.S
+++ linux-2.6.14-rc5/arch/ppc/platforms/pmac_sleep.S
@@ -46,7 +46,7 @@
 	.section .text
 	.align	5
 
-#if defined(CONFIG_PM) || defined(CONFIG_CPU_FREQ_PMAC)
+#if (defined(CONFIG_PM) || defined(CONFIG_CPU_FREQ_PMAC)) && defined(CONFIG_ADB_PMU)
 
 /* This gets called by via-pmu.c late during the sleep process.
  * The PMU was already send the sleep command and will shut us down
Index: linux-2.6.14-rc5/arch/ppc/platforms/pmac_time.c
===================================================================
--- linux-2.6.14-rc5.orig/arch/ppc/platforms/pmac_time.c
+++ linux-2.6.14-rc5/arch/ppc/platforms/pmac_time.c
@@ -206,7 +206,7 @@ via_calibrate_decr(void)
 	return 1;
 }
 
-#ifdef CONFIG_PM
+#if defined(CONFIG_PM) && defined(CONFIG_ADB_PMU)
 /*
  * Reset the time after a sleep.
  */
@@ -251,7 +251,7 @@ pmac_calibrate_decr(void)
 	struct device_node *cpu;
 	unsigned int freq, *fp;
 
-#ifdef CONFIG_PM
+#if defined(CONFIG_PM) && defined(CONFIG_ADB_PMU)
 	pmu_register_sleep_notifier(&time_sleep_notifier);
 #endif /* CONFIG_PM */
 
-- 
short story of a lazy sysadmin:
 alias appserv=wotan

Re: [PATCH] pmu_register_sleep_notifier needs ADB_PMU

[Olaf Hering]

 On Sat, Oct 22, Olaf Hering wrote:

> 
> a simple patch for a pegsos user:
> https://bugzilla.novell.com/show_bug.cgi?id=119606

Still not fully fixed:


drivers/video/aty/radeon_pm.c: In function `radeonfb_pm_init':
drivers/video/aty/radeon_pm.c:2769: warning: implicit declaration of function `pmac_call_feature'
drivers/video/aty/radeon_pm.c:2769: error: `PMAC_FTR_DEVICE_CAN_WAKE' undeclared (first use in this function)
drivers/video/aty/radeon_pm.c:2769: error: (Each undeclared identifier is reported only once
drivers/video/aty/radeon_pm.c:2769: error: for each function it appears in.)
drivers/video/aty/radeon_pm.c:2770: warning: implicit declaration of function `pmac_set_early_video_resume'

 drivers/video/aty/radeon_pm.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

Index: linux-2.6.15-rc1-olh/drivers/video/aty/radeon_pm.c
===================================================================
--- linux-2.6.15-rc1-olh.orig/drivers/video/aty/radeon_pm.c
+++ linux-2.6.15-rc1-olh/drivers/video/aty/radeon_pm.c
@@ -1321,7 +1321,7 @@ static void radeon_pm_full_reset_sdram(s
 	mdelay( 15);
 }
 
-#ifdef CONFIG_PPC_OF
+#ifdef CONFIG_PPC_PMAC
 
 static void radeon_pm_reset_pad_ctlr_strength(struct radeonfb_info *rinfo)
 {
@@ -2401,7 +2401,7 @@ static void radeon_reinitialize_QW(struc
 }
 #endif /* 0 */
 
-#endif /* CONFIG_PPC_OF */
+#endif /* CONFIG_PPC_PMAC */
 
 static void radeon_set_suspend(struct radeonfb_info *rinfo, int suspend)
 {
@@ -2700,7 +2700,7 @@ int radeonfb_pci_resume(struct pci_dev *
 	return rc;
 }
 
-#ifdef CONFIG_PPC_OF
+#ifdef CONFIG_PPC_PMAC
 static void radeonfb_early_resume(void *data)
 {
         struct radeonfb_info *rinfo = data;
@@ -2734,7 +2734,7 @@ void radeonfb_pm_init(struct radeonfb_in
 	 * BIOS does tho. Right now, all this PM stuff is pmac-only for that
 	 * reason. --BenH
 	 */
-#if defined(CONFIG_PM) && defined(CONFIG_PPC_OF)
+#if defined(CONFIG_PM) && defined(CONFIG_PPC_PMAC)
 	if (_machine == _MACH_Pmac && rinfo->of_node) {
 		if (rinfo->is_mobility && rinfo->pm_reg &&
 		    rinfo->family <= CHIP_FAMILY_RV250)
@@ -2778,12 +2778,12 @@ void radeonfb_pm_init(struct radeonfb_in
 		OUTREG(TV_DAC_CNTL, INREG(TV_DAC_CNTL) | 0x07000000);
 #endif
 	}
-#endif /* defined(CONFIG_PM) && defined(CONFIG_PPC_OF) */
+#endif /* defined(CONFIG_PM) && defined(CONFIG_PPC_PMAC) */
 }
 
 void radeonfb_pm_exit(struct radeonfb_info *rinfo)
 {
-#if defined(CONFIG_PM) && defined(CONFIG_PPC_OF)
+#if defined(CONFIG_PM) && defined(CONFIG_PPC_PMAC)
 	if (rinfo->pm_mode != radeon_pm_none)
 		pmac_set_early_video_resume(NULL, NULL);
 #endif

-- 
short story of a lazy sysadmin:
 alias appserv=wotan