diff options
| -rw-r--r-- | sys/arch/arm/xscale/pxa2x0_apm.c | 70 | ||||
| -rw-r--r-- | sys/arch/zaurus/dev/zaurus_apm.c | 6 |
2 files changed, 70 insertions, 6 deletions
diff --git a/sys/arch/arm/xscale/pxa2x0_apm.c b/sys/arch/arm/xscale/pxa2x0_apm.c index 780983da4aa..ebe1fd1af0a 100644 --- a/sys/arch/arm/xscale/pxa2x0_apm.c +++ b/sys/arch/arm/xscale/pxa2x0_apm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pxa2x0_apm.c,v 1.15 2005/08/12 03:23:02 uwe Exp $ */ +/* $OpenBSD: pxa2x0_apm.c,v 1.16 2005/10/31 04:56:14 drahn Exp $ */ /*- * Copyright (c) 2001 Alexander Guy. All rights reserved. @@ -92,6 +92,8 @@ int apm_handle_event(struct pxa2x0_apm_softc *, u_int); void apm_thread_create(void *); void apm_thread(void *); +int pxa2x0_setperf(int speed); + int apm_record_event(struct pxa2x0_apm_softc *, u_int); void filt_apmrdetach(struct knote *kn); int filt_apmread(struct knote *kn, long hint); @@ -303,6 +305,8 @@ void apm_suspend(struct pxa2x0_apm_softc *sc) { + resettodr(); + dopowerhooks(PWR_SUSPEND); if (cold) @@ -322,6 +326,8 @@ apm_resume(struct pxa2x0_apm_softc *sc) dopowerhooks(PWR_RESUME); + inittodr(0); + /* * Clear the OTG Peripheral hold after running the pxaudc and pxaohci * powerhooks to re-enable their operation. See 3.8.1.2 @@ -892,8 +898,6 @@ suspend_again: /* XXX control battery charging in sleep mode. */ - resettodr(); - /* XXX schedule RTC alarm to check the battery, or schedule XXX wake-up shortly before an already programmed alarm? */ @@ -1141,8 +1145,6 @@ suspend_again: */ bus_space_write_4(sc->sc_iot, sc->sc_pm_ioh, POWMAN_PMCR, 0); - inittodr(0); - bus_space_write_4(sc->sc_iot, ost_ioh, OST_OSMR0, sd.sd_osmr0); bus_space_write_4(sc->sc_iot, ost_ioh, OST_OSMR1, sd.sd_osmr1); bus_space_write_4(sc->sc_iot, ost_ioh, OST_OSMR2, sd.sd_osmr2); @@ -1378,3 +1380,61 @@ pxa2x0_pi2c_print(struct pxa2x0_apm_softc *sc) } #endif +extern int perflevel; +int +pxa2x0_setperf(int speed) +{ + struct pxa2x0_apm_softc *sc; + int s; + + sc = apm_cd.cd_devs[0]; + + s = disable_interrupts(I32_bit|F32_bit); + + if (speed <= 30) { + pxa27x_run_mode(); + pxa27x_fastbus_run_mode(0, MDREFR_LOW); + delay(1); + pxa27x_cpu_speed_91(); + if (perflevel > 50) + pxa2x0_pi2c_setvoltage(sc->sc_iot, sc->sc_pm_ioh, + PI2C_VOLTAGE_LOW); + perflevel = 25; + } else if (speed < 60) { + if (perflevel < 50) + pxa2x0_pi2c_setvoltage(sc->sc_iot, sc->sc_pm_ioh, + PI2C_VOLTAGE_HIGH); + + pxa27x_frequency_change(CCCR_A | CCCR_TURBO_X2 | CCCR_RUN_X16, + CLKCFG_F, &pxa2x0_memcfg); + + /* XXX is the delay long enough, and necessary at all? */ + delay(1); + + pxa27x_fastbus_run_mode(1, pxa2x0_memcfg.mdrefr_high); + perflevel = 50; + } else { + if (perflevel < 50) + pxa2x0_pi2c_setvoltage(sc->sc_iot, sc->sc_pm_ioh, + PI2C_VOLTAGE_HIGH); + + /* Change to 208Mhz run mode with fast-bus still disabled. */ + pxa27x_frequency_change(CCCR_A | CCCR_TURBO_X2 | CCCR_RUN_X16, + CLKCFG_F, &pxa2x0_memcfg); + + /* XXX is the delay long enough, and necessary at all? */ + delay(1); + + pxa27x_fastbus_run_mode(1, pxa2x0_memcfg.mdrefr_high); + + /* Change to 416Mhz turbo mode with fast-bus enabled. */ + pxa27x_frequency_change(CCCR_A | CCCR_TURBO_X2 | CCCR_RUN_X16, + CLKCFG_B | CLKCFG_F | CLKCFG_T, &pxa2x0_memcfg); + + perflevel = 100; + } + + restore_interrupts(s); + + return 0; +} diff --git a/sys/arch/zaurus/dev/zaurus_apm.c b/sys/arch/zaurus/dev/zaurus_apm.c index feedff79b1e..6ae4960c825 100644 --- a/sys/arch/zaurus/dev/zaurus_apm.c +++ b/sys/arch/zaurus/dev/zaurus_apm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zaurus_apm.c,v 1.8 2005/05/27 05:14:41 uwe Exp $ */ +/* $OpenBSD: zaurus_apm.c,v 1.9 2005/10/31 04:56:14 drahn Exp $ */ /* * Copyright (c) 2005 Uwe Stuehler <uwe@bsdx.de> @@ -21,6 +21,7 @@ #include <sys/kernel.h> #include <sys/timeout.h> #include <sys/conf.h> +#include <sys/sysctl.h> #include <arm/xscale/pxa2x0reg.h> #include <arm/xscale/pxa2x0var.h> @@ -146,6 +147,7 @@ int zapm_get_event(struct pxa2x0_apm_softc *, u_int *); void zapm_power_info(struct pxa2x0_apm_softc *, struct apm_power_info *); void zapm_suspend(struct pxa2x0_apm_softc *); int zapm_resume(struct pxa2x0_apm_softc *); +int pxa2x0_setperf(int); int @@ -191,6 +193,8 @@ apm_attach(struct device *parent, struct device *self, void *aux) #if 0 (void)shutdownhook_establish(zapm_shutdown, NULL); #endif + + cpu_setperf = pxa2x0_setperf; } #if 0 |