ARM PXA: invalid clocks settings.
Subsystems (5)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 ARM PXA: invalid clocks settings.
This patch fixes some bugs in the CPU clocks settings entered by commit 7053acbd78336abf5d4bc3d8a875a03624cfb83f. These bugs also prevent the system in going to sleep correctly leaving it into a non consistent status.
The clocks enable/disable defines was changed from:
#define CKEN_CAMERA (1 << 24)
to:
#define CKEN_CAMERA (24)
so direct access to the CKEN register should be now in the form:
CKEN |= (1 << CKEN_CAMERA)
Signed-off-by Rodolfo Giometti <[email protected]>
--- arch/arm/mach-pxa/pxa27x.c | 5 +++-- sound/arm/pxa2xx-ac97.c | 2 +- sound/soc/pxa/pxa2xx-ac97.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-)
arch/arm/mach-pxa/pxa27x.c +3 -2
@@ -140,9 +140,10 @@ void pxa_cpu_pm_enter(suspend_state_t state)extern void pxa_cpu_resume (void );if (state ==PM_SUSPEND_STANDBY ) -CKEN =CKEN_MEMC |CKEN_OSTIMER |CKEN_LCD |CKEN_PWM0 ; +CKEN = (1 <<CKEN_MEMC ) | (1 <<CKEN_OSTIMER ) | \ + (1 <<CKEN_LCD ) | (1 <<CKEN_PWM0 );else -CKEN =CKEN_MEMC |CKEN_OSTIMER ; +CKEN = (1 <<CKEN_MEMC ) | (1 <<CKEN_OSTIMER );/* ensure voltage-change sequencer not initiated, which hangs */ PCFR &= ~PCFR_FVC ;
sound/arm/pxa2xx-ac97.c +1 -1
@@ -361,7 +361,7 @@ static int __devinit pxa2xx_ac97_probe(struct platform_device *dev) err:if (card)snd_card_free (card); -if (CKEN &CKEN_AC97 ) { +if (CKEN & (1 <<CKEN_AC97 )) {GCR |=GCR_ACLINK_OFF ;free_irq (IRQ_AC97 ,NULL );pxa_set_cken (CKEN_AC97 ,0 );
sound/soc/pxa/pxa2xx-ac97.c +1 -1
@@ -300,7 +300,7 @@ static int pxa2xx_ac97_probe(struct platform_device *pdev)return 0 ; err: -if (CKEN &CKEN_AC97 ) { +if (CKEN & (1 <<CKEN_AC97 )) {GCR |=GCR_ACLINK_OFF ;free_irq (IRQ_AC97 ,NULL );pxa_set_cken (CKEN_AC97 ,0 );
Signature · 9 lines
1.5.2.2 -- GNU/Linux Solutions e-mail: [email protected] Linux Device Driver [email protected] Embedded Systems [email protected] UNIX programming phone: +39 349 2432127