Commit 82d179781bcd81b37e0213085087e1dbf1f6b7f9
1 parent
b7fe5db7
Various reg offset shift typos.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3085 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
2 changed files
with
4 additions
and
4 deletions
hw/pxa2xx.c
| @@ -280,7 +280,7 @@ static void pxa2xx_clkpwr_write(void *opaque, int op2, int reg, int crm, | @@ -280,7 +280,7 @@ static void pxa2xx_clkpwr_write(void *opaque, int op2, int reg, int crm, | ||
| 280 | 280 | ||
| 281 | case 1: | 281 | case 1: |
| 282 | /* Idle */ | 282 | /* Idle */ |
| 283 | - if (!(s->cm_regs[CCCR] & (1 << 31))) { /* CPDIS */ | 283 | + if (!(s->cm_regs[CCCR >> 2] & (1 << 31))) { /* CPDIS */ |
| 284 | cpu_interrupt(s->env, CPU_INTERRUPT_HALT); | 284 | cpu_interrupt(s->env, CPU_INTERRUPT_HALT); |
| 285 | break; | 285 | break; |
| 286 | } | 286 | } |
| @@ -2057,7 +2057,7 @@ struct pxa2xx_state_s *pxa270_init(unsigned int sdram_size, | @@ -2057,7 +2057,7 @@ struct pxa2xx_state_s *pxa270_init(unsigned int sdram_size, | ||
| 2057 | s->lcd = pxa2xx_lcdc_init(0x44000000, s->pic[PXA2XX_PIC_LCD], ds); | 2057 | s->lcd = pxa2xx_lcdc_init(0x44000000, s->pic[PXA2XX_PIC_LCD], ds); |
| 2058 | 2058 | ||
| 2059 | s->cm_base = 0x41300000; | 2059 | s->cm_base = 0x41300000; |
| 2060 | - s->cm_regs[CCCR >> 4] = 0x02000210; /* 416.0 MHz */ | 2060 | + s->cm_regs[CCCR >> 2] = 0x02000210; /* 416.0 MHz */ |
| 2061 | s->clkcfg = 0x00000009; /* Turbo mode active */ | 2061 | s->clkcfg = 0x00000009; /* Turbo mode active */ |
| 2062 | iomemtype = cpu_register_io_memory(0, pxa2xx_cm_readfn, | 2062 | iomemtype = cpu_register_io_memory(0, pxa2xx_cm_readfn, |
| 2063 | pxa2xx_cm_writefn, s); | 2063 | pxa2xx_cm_writefn, s); |
| @@ -2166,7 +2166,7 @@ struct pxa2xx_state_s *pxa255_init(unsigned int sdram_size, | @@ -2166,7 +2166,7 @@ struct pxa2xx_state_s *pxa255_init(unsigned int sdram_size, | ||
| 2166 | s->lcd = pxa2xx_lcdc_init(0x44000000, s->pic[PXA2XX_PIC_LCD], ds); | 2166 | s->lcd = pxa2xx_lcdc_init(0x44000000, s->pic[PXA2XX_PIC_LCD], ds); |
| 2167 | 2167 | ||
| 2168 | s->cm_base = 0x41300000; | 2168 | s->cm_base = 0x41300000; |
| 2169 | - s->cm_regs[CCCR >> 4] = 0x02000210; /* 416.0 MHz */ | 2169 | + s->cm_regs[CCCR >> 2] = 0x02000210; /* 416.0 MHz */ |
| 2170 | s->clkcfg = 0x00000009; /* Turbo mode active */ | 2170 | s->clkcfg = 0x00000009; /* Turbo mode active */ |
| 2171 | iomemtype = cpu_register_io_memory(0, pxa2xx_cm_readfn, | 2171 | iomemtype = cpu_register_io_memory(0, pxa2xx_cm_readfn, |
| 2172 | pxa2xx_cm_writefn, s); | 2172 | pxa2xx_cm_writefn, s); |
target-arm/cpu.h
| @@ -283,7 +283,7 @@ void cpu_arm_set_cp_io(CPUARMState *env, int cpnum, | @@ -283,7 +283,7 @@ void cpu_arm_set_cp_io(CPUARMState *env, int cpnum, | ||
| 283 | #else | 283 | #else |
| 284 | /* The ARM MMU allows 1k pages. */ | 284 | /* The ARM MMU allows 1k pages. */ |
| 285 | /* ??? Linux doesn't actually use these, and they're deprecated in recent | 285 | /* ??? Linux doesn't actually use these, and they're deprecated in recent |
| 286 | - architecture revisions. Maybe an a configure option to disable them. */ | 286 | + architecture revisions. Maybe a configure option to disable them. */ |
| 287 | #define TARGET_PAGE_BITS 10 | 287 | #define TARGET_PAGE_BITS 10 |
| 288 | #endif | 288 | #endif |
| 289 | 289 |