Revision 565d2895

b/hw/pxa2xx.c
168 168
        break;
169 169

  
170 170
    case OSCC:
171
        s->cm_regs[addr >> 2] &= ~0x6e;
171
        s->cm_regs[addr >> 2] &= ~0x6c;
172 172
        s->cm_regs[addr >> 2] |= value & 0x6e;
173
        if ((value >> 1) & 1)			/* OON */
174
            s->cm_regs[addr >> 2] |= 1 << 0;	/* Oscillator is now stable */
173 175
        break;
174 176

  
175 177
    default:
b/hw/pxa2xx_timer.c
364 364
    struct pxa2xx_timer4_s *t = (struct pxa2xx_timer4_s *) opaque;
365 365
    pxa2xx_timer_info *i = (pxa2xx_timer_info *) t->info;
366 366

  
367
    pxa2xx_timer_tick4(opaque);
367
    pxa2xx_timer_tick(opaque);
368 368
    if (t->control & (1 << 3))
369 369
        t->clock = 0;
370 370
    if (t->control & (1 << 6))

Also available in: Unified diff