diff options
-rw-r--r-- | hw/omap.h | 2 | ||||
-rw-r--r-- | hw/omap2.c | 10 | ||||
-rw-r--r-- | hw/omap_dss.c | 8 | ||||
-rw-r--r-- | hw/omap_gptimer.c | 2 | ||||
-rw-r--r-- | hw/omap_i2c.c | 2 | ||||
-rw-r--r-- | hw/omap_l4.c | 4 | ||||
-rw-r--r-- | hw/omap_mmc.c | 2 | ||||
-rw-r--r-- | hw/omap_spi.c | 2 | ||||
-rw-r--r-- | hw/omap_synctimer.c | 2 | ||||
-rw-r--r-- | hw/omap_tap.c | 2 | ||||
-rw-r--r-- | hw/omap_uart.c | 2 |
11 files changed, 19 insertions, 19 deletions
@@ -94,7 +94,7 @@ struct omap_target_agent_s *omap_l4ta_get( const struct omap_l4_region_s *regions, const struct omap_l4_agent_info_s *agents, int cs); -target_phys_addr_t omap_l4_attach_region(struct omap_target_agent_s *ta, +target_phys_addr_t omap_l4_attach(struct omap_target_agent_s *ta, int region, MemoryRegion *mr); target_phys_addr_t omap_l4_region_base(struct omap_target_agent_s *ta, int region); @@ -605,7 +605,7 @@ static struct omap_eac_s *omap_eac_init(struct omap_target_agent_s *ta, memory_region_init_io(&s->iomem, &omap_eac_ops, s, "omap.eac", omap_l4_region_size(ta, 0)); - omap_l4_attach_region(ta, 0, &s->iomem); + omap_l4_attach(ta, 0, &s->iomem); return s; } @@ -793,7 +793,7 @@ static struct omap_sti_s *omap_sti_init(struct omap_target_agent_s *ta, memory_region_init_io(&s->iomem, &omap_sti_ops, s, "omap.sti", omap_l4_region_size(ta, 0)); - omap_l4_attach_region(ta, 0, &s->iomem); + omap_l4_attach(ta, 0, &s->iomem); memory_region_init_io(&s->iomem_fifo, &omap_sti_fifo_ops, s, "omap.sti.fifo", 0x10000); @@ -1813,8 +1813,8 @@ static struct omap_prcm_s *omap_prcm_init(struct omap_target_agent_s *ta, omap_l4_region_size(ta, 0)); memory_region_init_io(&s->iomem1, &omap_prcm_ops, s, "omap.pcrm1", omap_l4_region_size(ta, 1)); - omap_l4_attach_region(ta, 0, &s->iomem0); - omap_l4_attach_region(ta, 1, &s->iomem1); + omap_l4_attach(ta, 0, &s->iomem0); + omap_l4_attach(ta, 1, &s->iomem1); return s; } @@ -2187,7 +2187,7 @@ static struct omap_sysctl_s *omap_sysctl_init(struct omap_target_agent_s *ta, memory_region_init_io(&s->iomem, &omap_sysctl_ops, s, "omap.sysctl", omap_l4_region_size(ta, 0)); - omap_l4_attach_region(ta, 0, &s->iomem); + omap_l4_attach(ta, 0, &s->iomem); return s; } diff --git a/hw/omap_dss.c b/hw/omap_dss.c index 9e592ce..ede640b 100644 --- a/hw/omap_dss.c +++ b/hw/omap_dss.c @@ -1064,10 +1064,10 @@ struct omap_dss_s *omap_dss_init(struct omap_target_agent_s *ta, memory_region_init_io(&s->iomem_im3, &omap_im3_ops, s, "omap.im3", 0x1000); - omap_l4_attach_region(ta, 0, &s->iomem_diss1); - omap_l4_attach_region(ta, 1, &s->iomem_disc1); - omap_l4_attach_region(ta, 2, &s->iomem_rfbi1); - omap_l4_attach_region(ta, 3, &s->iomem_venc1); + omap_l4_attach(ta, 0, &s->iomem_diss1); + omap_l4_attach(ta, 1, &s->iomem_disc1); + omap_l4_attach(ta, 2, &s->iomem_rfbi1); + omap_l4_attach(ta, 3, &s->iomem_venc1); memory_region_add_subregion(sysmem, l3_base, &s->iomem_im3); #if 0 diff --git a/hw/omap_gptimer.c b/hw/omap_gptimer.c index 414b98a..7a14519 100644 --- a/hw/omap_gptimer.c +++ b/hw/omap_gptimer.c @@ -482,7 +482,7 @@ struct omap_gp_timer_s *omap_gp_timer_init(struct omap_target_agent_s *ta, memory_region_init_io(&s->iomem, &omap_gp_timer_ops, s, "omap.gptimer", omap_l4_region_size(ta, 0)); - omap_l4_attach_region(ta, 0, &s->iomem); + omap_l4_attach(ta, 0, &s->iomem); return s; } diff --git a/hw/omap_i2c.c b/hw/omap_i2c.c index ca875f6..5ec422c 100644 --- a/hw/omap_i2c.c +++ b/hw/omap_i2c.c @@ -464,7 +464,7 @@ struct omap_i2c_s *omap2_i2c_init(struct omap_target_agent_s *ta, memory_region_init_io(&s->iomem, &omap_i2c_ops, s, "omap2.i2c", omap_l4_region_size(ta, 0)); - omap_l4_attach_region(ta, 0, &s->iomem); + omap_l4_attach(ta, 0, &s->iomem); return s; } diff --git a/hw/omap_l4.c b/hw/omap_l4.c index 78f02d9..dbad7f6 100644 --- a/hw/omap_l4.c +++ b/hw/omap_l4.c @@ -138,12 +138,12 @@ struct omap_target_agent_s *omap_l4ta_get(struct omap_l4_s *bus, memory_region_init_io(&ta->iomem, &omap_l4ta_ops, ta, "omap.l4ta", omap_l4_region_size(ta, info->ta_region)); - omap_l4_attach_region(ta, info->ta_region, &ta->iomem); + omap_l4_attach(ta, info->ta_region, &ta->iomem); return ta; } -target_phys_addr_t omap_l4_attach_region(struct omap_target_agent_s *ta, +target_phys_addr_t omap_l4_attach(struct omap_target_agent_s *ta, int region, MemoryRegion *mr) { target_phys_addr_t base; diff --git a/hw/omap_mmc.c b/hw/omap_mmc.c index ba960c1..aec0285 100644 --- a/hw/omap_mmc.c +++ b/hw/omap_mmc.c @@ -614,7 +614,7 @@ struct omap_mmc_s *omap2_mmc_init(struct omap_target_agent_s *ta, memory_region_init_io(&s->iomem, &omap_mmc_ops, s, "omap.mmc", omap_l4_region_size(ta, 0)); - omap_l4_attach_region(ta, 0, &s->iomem); + omap_l4_attach(ta, 0, &s->iomem); /* Instantiate the storage */ s->card = sd_init(bd, 0); diff --git a/hw/omap_spi.c b/hw/omap_spi.c index 4823bd0..8f2b697 100644 --- a/hw/omap_spi.c +++ b/hw/omap_spi.c @@ -332,7 +332,7 @@ struct omap_mcspi_s *omap_mcspi_init(struct omap_target_agent_s *ta, int chnum, memory_region_init_io(&s->iomem, &omap_mcspi_ops, s, "omap.mcspi", omap_l4_region_size(ta, 0)); - omap_l4_attach_region(ta, 0, &s->iomem); + omap_l4_attach(ta, 0, &s->iomem); return s; } diff --git a/hw/omap_synctimer.c b/hw/omap_synctimer.c index cd1d754..367f26e 100644 --- a/hw/omap_synctimer.c +++ b/hw/omap_synctimer.c @@ -96,7 +96,7 @@ struct omap_synctimer_s *omap_synctimer_init(struct omap_target_agent_s *ta, omap_synctimer_reset(s); memory_region_init_io(&s->iomem, &omap_synctimer_ops, s, "omap.synctimer", omap_l4_region_size(ta, 0)); - omap_l4_attach_region(ta, 0, &s->iomem); + omap_l4_attach(ta, 0, &s->iomem); return s; } diff --git a/hw/omap_tap.c b/hw/omap_tap.c index 1b4820c..0277c73 100644 --- a/hw/omap_tap.c +++ b/hw/omap_tap.c @@ -112,5 +112,5 @@ void omap_tap_init(struct omap_target_agent_s *ta, { memory_region_init_io(&mpu->tap_iomem, &omap_tap_ops, mpu, "omap.tap", omap_l4_region_size(ta, 0)); - omap_l4_attach_region(ta, 0, &mpu->tap_iomem); + omap_l4_attach(ta, 0, &mpu->tap_iomem); } diff --git a/hw/omap_uart.c b/hw/omap_uart.c index 64fc9f5..167d5c4 100644 --- a/hw/omap_uart.c +++ b/hw/omap_uart.c @@ -165,7 +165,7 @@ struct omap_uart_s *omap2_uart_init(MemoryRegion *sysmem, qemu_irq txdma, qemu_irq rxdma, const char *label, CharDriverState *chr) { - target_phys_addr_t base = omap_l4_attach_region(ta, 0, NULL); + target_phys_addr_t base = omap_l4_attach(ta, 0, NULL); struct omap_uart_s *s = omap_uart_init(base, irq, fclk, iclk, txdma, rxdma, label, chr); |