mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/omap1.c: Separate PWT from omap_mpu_state

Browse Source 
Signed-off-by: Juha Riihimäki <juha.riihimaki@nokia.com>
[Riku Voipio: Fixes and restructuring patchset]
Signed-off-by: Riku Voipio <riku.voipio@iki.fi>
[Peter Maydell: More fixes and cleanups for upstream submission]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Juha Riihimäki 2011-12-20 08:11:33 +00:00 committed by Peter Maydell
parent 8717d88ac7
commit 0375953475
2 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/omap.h
View File

@ -829,7 +829,6 @@ struct omap_mpu_state_s {
MemoryRegion tcmi_iomem; MemoryRegion tcmi_iomem;
MemoryRegion clkm_iomem; MemoryRegion clkm_iomem;
MemoryRegion clkdsp_iomem; MemoryRegion clkdsp_iomem;
MemoryRegion pwt_iomem;
MemoryRegion mpui_io_iomem; MemoryRegion mpui_io_iomem;
MemoryRegion tap_iomem; MemoryRegion tap_iomem;
MemoryRegion imif_ram; MemoryRegion imif_ram;
@ -867,14 +866,7 @@ struct omap_mpu_state_s {
struct omap_uwire_s *microwire; struct omap_uwire_s *microwire;
struct omap_pwl_s *pwl; struct omap_pwl_s *pwl;
struct omap_pwt_s *pwt;
struct {
uint8_t frc;
uint8_t vrc;
uint8_t gcr;
omap_clk clk;
} pwt;
struct omap_i2c_s *i2c[2]; struct omap_i2c_s *i2c[2];
struct omap_rtc_s *rtc; struct omap_rtc_s *rtc;

57
hw/omap1.c
View File

@ -2392,10 +2392,18 @@ static struct omap_pwl_s *omap_pwl_init(MemoryRegion *system_memory,
} }
/* Pulse-Width Tone module */ /* Pulse-Width Tone module */
struct omap_pwt_s {
MemoryRegion iomem;
uint8_t frc;
uint8_t vrc;
uint8_t gcr;
omap_clk clk;
};
static uint64_t omap_pwt_read(void *opaque, target_phys_addr_t addr, static uint64_t omap_pwt_read(void *opaque, target_phys_addr_t addr,
unsigned size) unsigned size)
{ {
struct omap_mpu_state_s *s = (struct omap_mpu_state_s *) opaque; struct omap_pwt_s *s = (struct omap_pwt_s *) opaque;
int offset = addr & OMAP_MPUI_REG_MASK; int offset = addr & OMAP_MPUI_REG_MASK;
if (size != 1) { if (size != 1) {
@ -2404,11 +2412,11 @@ static uint64_t omap_pwt_read(void *opaque, target_phys_addr_t addr,
switch (offset) { switch (offset) {
case 0x00: /* FRC */ case 0x00: /* FRC */
return s->pwt.frc; return s->frc;
case 0x04: /* VCR */ case 0x04: /* VCR */
return s->pwt.vrc; return s->vrc;
case 0x08: /* GCR */ case 0x08: /* GCR */
return s->pwt.gcr; return s->gcr;
} }
OMAP_BAD_REG(addr); OMAP_BAD_REG(addr);
return 0; return 0;
@ -2417,7 +2425,7 @@ static uint64_t omap_pwt_read(void *opaque, target_phys_addr_t addr,
static void omap_pwt_write(void *opaque, target_phys_addr_t addr, static void omap_pwt_write(void *opaque, target_phys_addr_t addr,
uint64_t value, unsigned size) uint64_t value, unsigned size)
{ {
struct omap_mpu_state_s *s = (struct omap_mpu_state_s *) opaque; struct omap_pwt_s *s = (struct omap_pwt_s *) opaque;
int offset = addr & OMAP_MPUI_REG_MASK; int offset = addr & OMAP_MPUI_REG_MASK;
if (size != 1) { if (size != 1) {
@ -2426,16 +2434,16 @@ static void omap_pwt_write(void *opaque, target_phys_addr_t addr,
switch (offset) { switch (offset) {
case 0x00: /* FRC */ case 0x00: /* FRC */
s->pwt.frc = value & 0x3f; s->frc = value & 0x3f;
break; break;
case 0x04: /* VRC */ case 0x04: /* VRC */
if ((value ^ s->pwt.vrc) & 1) { if ((value ^ s->vrc) & 1) {
if (value & 1) if (value & 1)
printf("%s: %iHz buzz on\n", __FUNCTION__, (int) printf("%s: %iHz buzz on\n", __FUNCTION__, (int)
/* 1.5 MHz from a 12-MHz or 13-MHz PWT_CLK */ /* 1.5 MHz from a 12-MHz or 13-MHz PWT_CLK */
((omap_clk_getrate(s->pwt.clk) >> 3) / ((omap_clk_getrate(s->clk) >> 3) /
/* Pre-multiplexer divider */ /* Pre-multiplexer divider */
((s->pwt.gcr & 2) ? 1 : 154) / ((s->gcr & 2) ? 1 : 154) /
/* Octave multiplexer */ /* Octave multiplexer */
(2 << (value & 3)) * (2 << (value & 3)) *
/* 101/107 divider */ /* 101/107 divider */
@ -2450,10 +2458,10 @@ static void omap_pwt_write(void *opaque, target_phys_addr_t addr,
else else
printf("%s: silence!\n", __FUNCTION__); printf("%s: silence!\n", __FUNCTION__);
} }
s->pwt.vrc = value & 0x7f; s->vrc = value & 0x7f;
break; break;
case 0x08: /* GCR */ case 0x08: /* GCR */
s->pwt.gcr = value & 3; s->gcr = value & 3;
break; break;
default: default:
OMAP_BAD_REG(addr); OMAP_BAD_REG(addr);
@ -2467,23 +2475,25 @@ static const MemoryRegionOps omap_pwt_ops = {
.endianness = DEVICE_NATIVE_ENDIAN, .endianness = DEVICE_NATIVE_ENDIAN,
}; };
static void omap_pwt_reset(struct omap_mpu_state_s *s) static void omap_pwt_reset(struct omap_pwt_s *s)
{ {
s->pwt.frc = 0; s->frc = 0;
s->pwt.vrc = 0; s->vrc = 0;
s->pwt.gcr = 0; s->gcr = 0;
} }
static void omap_pwt_init(MemoryRegion *system_memory, static struct omap_pwt_s *omap_pwt_init(MemoryRegion *system_memory,
target_phys_addr_t base, struct omap_mpu_state_s *s, target_phys_addr_t base,
omap_clk clk) omap_clk clk)
{ {
s->pwt.clk = clk; struct omap_pwt_s *s = g_malloc0(sizeof(*s));
s->clk = clk;
omap_pwt_reset(s); omap_pwt_reset(s);
memory_region_init_io(&s->pwt_iomem, &omap_pwt_ops, s, memory_region_init_io(&s->iomem, &omap_pwt_ops, s,
"omap-pwt", 0x800); "omap-pwt", 0x800);
memory_region_add_subregion(system_memory, base, &s->pwt_iomem); memory_region_add_subregion(system_memory, base, &s->iomem);
return s;
} }
/* Real-time Clock module */ /* Real-time Clock module */
@ -3679,7 +3689,7 @@ static void omap1_mpu_reset(void *opaque)
omap_mpuio_reset(mpu->mpuio); omap_mpuio_reset(mpu->mpuio);
omap_uwire_reset(mpu->microwire); omap_uwire_reset(mpu->microwire);
omap_pwl_reset(mpu->pwl); omap_pwl_reset(mpu->pwl);
omap_pwt_reset(mpu); omap_pwt_reset(mpu->pwt);
omap_i2c_reset(mpu->i2c[0]); omap_i2c_reset(mpu->i2c[0]);
omap_rtc_reset(mpu->rtc); omap_rtc_reset(mpu->rtc);
omap_mcbsp_reset(mpu->mcbsp1); omap_mcbsp_reset(mpu->mcbsp1);
@ -3974,7 +3984,8 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion *system_memory,
s->pwl = omap_pwl_init(system_memory, 0xfffb5800, s->pwl = omap_pwl_init(system_memory, 0xfffb5800,
omap_findclk(s, "armxor_ck")); omap_findclk(s, "armxor_ck"));
omap_pwt_init(system_memory, 0xfffb6000, s, omap_findclk(s, "armxor_ck")); s->pwt = omap_pwt_init(system_memory, 0xfffb6000,
omap_findclk(s, "armxor_ck"));
s->i2c[0] = omap_i2c_init(system_memory, 0xfffb3800, s->i2c[0] = omap_i2c_init(system_memory, 0xfffb3800,
qdev_get_gpio_in(s->ih[1], OMAP_INT_I2C), qdev_get_gpio_in(s->ih[1], OMAP_INT_I2C),