summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--hw/omap.h2
-rw-r--r--hw/omap2.c12
-rw-r--r--hw/omap_dss.c16
-rw-r--r--hw/omap_gptimer.c4
-rw-r--r--hw/omap_i2c.c4
-rw-r--r--hw/omap_l4.c12
-rw-r--r--hw/omap_mmc.c4
-rw-r--r--hw/omap_spi.c4
-rw-r--r--hw/omap_synctimer.c5
-rw-r--r--hw/omap_tap.c5
10 files changed, 30 insertions, 38 deletions
diff --git a/hw/omap.h b/hw/omap.h
index 8bd1810..d12f402 100644
--- a/hw/omap.h
+++ b/hw/omap.h
@@ -96,8 +96,6 @@ target_phys_addr_t omap_l4_attach(struct omap_target_agent_s *ta, int region,
int iotype);
target_phys_addr_t omap_l4_region_base(struct omap_target_agent_s *ta,
int region);
-int l4_register_io_memory(CPUReadMemoryFunc * const *mem_read,
- CPUWriteMemoryFunc * const *mem_write, void *opaque);
/* OMAP2 SDRAM controller */
struct omap_sdrc_s;
diff --git a/hw/omap2.c b/hw/omap2.c
index e299884..8a0fa73 100644
--- a/hw/omap2.c
+++ b/hw/omap2.c
@@ -784,8 +784,8 @@ static struct omap_sti_s *omap_sti_init(struct omap_target_agent_s *ta,
s->chr = chr ?: qemu_chr_new("null", "null", NULL);
- iomemtype = l4_register_io_memory(omap_sti_readfn,
- omap_sti_writefn, s);
+ iomemtype = cpu_register_io_memory(omap_sti_readfn,
+ omap_sti_writefn, s, DEVICE_NATIVE_ENDIAN);
omap_l4_attach(ta, 0, iomemtype);
iomemtype = cpu_register_io_memory(omap_sti_fifo_readfn,
@@ -1798,8 +1798,8 @@ static struct omap_prcm_s *omap_prcm_init(struct omap_target_agent_s *ta,
s->mpu = mpu;
omap_prcm_coldreset(s);
- iomemtype = l4_register_io_memory(omap_prcm_readfn,
- omap_prcm_writefn, s);
+ iomemtype = cpu_register_io_memory(omap_prcm_readfn,
+ omap_prcm_writefn, s, DEVICE_NATIVE_ENDIAN);
omap_l4_attach(ta, 0, iomemtype);
omap_l4_attach(ta, 1, iomemtype);
@@ -2168,8 +2168,8 @@ static struct omap_sysctl_s *omap_sysctl_init(struct omap_target_agent_s *ta,
s->mpu = mpu;
omap_sysctl_reset(s);
- iomemtype = l4_register_io_memory(omap_sysctl_readfn,
- omap_sysctl_writefn, s);
+ iomemtype = cpu_register_io_memory(omap_sysctl_readfn,
+ omap_sysctl_writefn, s, DEVICE_NATIVE_ENDIAN);
omap_l4_attach(ta, 0, iomemtype);
return s;
diff --git a/hw/omap_dss.c b/hw/omap_dss.c
index b4a8b4c..b138c23 100644
--- a/hw/omap_dss.c
+++ b/hw/omap_dss.c
@@ -1037,14 +1037,14 @@ struct omap_dss_s *omap_dss_init(struct omap_target_agent_s *ta,
s->drq = drq;
omap_dss_reset(s);
- iomemtype[0] = l4_register_io_memory(omap_diss1_readfn,
- omap_diss1_writefn, s);
- iomemtype[1] = l4_register_io_memory(omap_disc1_readfn,
- omap_disc1_writefn, s);
- iomemtype[2] = l4_register_io_memory(omap_rfbi1_readfn,
- omap_rfbi1_writefn, s);
- iomemtype[3] = l4_register_io_memory(omap_venc1_readfn,
- omap_venc1_writefn, s);
+ iomemtype[0] = cpu_register_io_memory(omap_diss1_readfn,
+ omap_diss1_writefn, s, DEVICE_NATIVE_ENDIAN);
+ iomemtype[1] = cpu_register_io_memory(omap_disc1_readfn,
+ omap_disc1_writefn, s, DEVICE_NATIVE_ENDIAN);
+ iomemtype[2] = cpu_register_io_memory(omap_rfbi1_readfn,
+ omap_rfbi1_writefn, s, DEVICE_NATIVE_ENDIAN);
+ iomemtype[3] = cpu_register_io_memory(omap_venc1_readfn,
+ omap_venc1_writefn, s, DEVICE_NATIVE_ENDIAN);
iomemtype[4] = cpu_register_io_memory(omap_im3_readfn,
omap_im3_writefn, s, DEVICE_NATIVE_ENDIAN);
omap_l4_attach(ta, 0, iomemtype[0]);
diff --git a/hw/omap_gptimer.c b/hw/omap_gptimer.c
index 704b000..c1cbdf8 100644
--- a/hw/omap_gptimer.c
+++ b/hw/omap_gptimer.c
@@ -476,8 +476,8 @@ struct omap_gp_timer_s *omap_gp_timer_init(struct omap_target_agent_s *ta,
omap_gp_timer_reset(s);
omap_gp_timer_clk_setup(s);
- iomemtype = l4_register_io_memory(omap_gp_timer_readfn,
- omap_gp_timer_writefn, s);
+ iomemtype = cpu_register_io_memory(omap_gp_timer_readfn,
+ omap_gp_timer_writefn, s, DEVICE_NATIVE_ENDIAN);
omap_l4_attach(ta, 0, iomemtype);
return s;
diff --git a/hw/omap_i2c.c b/hw/omap_i2c.c
index 11577b1..52c38ba 100644
--- a/hw/omap_i2c.c
+++ b/hw/omap_i2c.c
@@ -457,8 +457,8 @@ struct omap_i2c_s *omap2_i2c_init(struct omap_target_agent_s *ta,
s->bus = i2c_init_bus(NULL, "i2c");
omap_i2c_reset(s);
- iomemtype = l4_register_io_memory(omap_i2c_readfn,
- omap_i2c_writefn, s);
+ iomemtype = cpu_register_io_memory(omap_i2c_readfn,
+ omap_i2c_writefn, s, DEVICE_NATIVE_ENDIAN);
omap_l4_attach(ta, 0, iomemtype);
return s;
diff --git a/hw/omap_l4.c b/hw/omap_l4.c
index ebec874..a19ea70 100644
--- a/hw/omap_l4.c
+++ b/hw/omap_l4.c
@@ -20,14 +20,6 @@
#include "hw.h"
#include "omap.h"
-int l4_register_io_memory(CPUReadMemoryFunc * const *mem_read,
- CPUWriteMemoryFunc * const *mem_write,
- void *opaque)
-{
- return cpu_register_io_memory(mem_read, mem_write, opaque,
- DEVICE_NATIVE_ENDIAN);
-}
-
struct omap_l4_s {
target_phys_addr_t base;
int ta_num;
@@ -132,8 +124,8 @@ struct omap_target_agent_s *omap_l4ta_get(struct omap_l4_s *bus,
ta->status = 0x00000000;
ta->control = 0x00000200; /* XXX 01000200 for L4TAO */
- iomemtype = l4_register_io_memory(omap_l4ta_readfn,
- omap_l4ta_writefn, ta);
+ iomemtype = cpu_register_io_memory(omap_l4ta_readfn,
+ omap_l4ta_writefn, ta, DEVICE_NATIVE_ENDIAN);
ta->base = omap_l4_attach(ta, info->ta_region, iomemtype);
return ta;
diff --git a/hw/omap_mmc.c b/hw/omap_mmc.c
index a1afeb5..b42cf90 100644
--- a/hw/omap_mmc.c
+++ b/hw/omap_mmc.c
@@ -612,8 +612,8 @@ struct omap_mmc_s *omap2_mmc_init(struct omap_target_agent_s *ta,
omap_mmc_reset(s);
- iomemtype = l4_register_io_memory(omap_mmc_readfn,
- omap_mmc_writefn, s);
+ iomemtype = cpu_register_io_memory(omap_mmc_readfn,
+ omap_mmc_writefn, s, DEVICE_NATIVE_ENDIAN);
omap_l4_attach(ta, 0, iomemtype);
/* Instantiate the storage */
diff --git a/hw/omap_spi.c b/hw/omap_spi.c
index 6030ad9..c20f425 100644
--- a/hw/omap_spi.c
+++ b/hw/omap_spi.c
@@ -327,8 +327,8 @@ struct omap_mcspi_s *omap_mcspi_init(struct omap_target_agent_s *ta, int chnum,
}
omap_mcspi_reset(s);
- iomemtype = l4_register_io_memory(omap_mcspi_readfn,
- omap_mcspi_writefn, s);
+ iomemtype = cpu_register_io_memory(omap_mcspi_readfn,
+ omap_mcspi_writefn, s, DEVICE_NATIVE_ENDIAN);
omap_l4_attach(ta, 0, iomemtype);
return s;
diff --git a/hw/omap_synctimer.c b/hw/omap_synctimer.c
index b47ca88..ece5388 100644
--- a/hw/omap_synctimer.c
+++ b/hw/omap_synctimer.c
@@ -89,8 +89,9 @@ struct omap_synctimer_s *omap_synctimer_init(struct omap_target_agent_s *ta,
struct omap_synctimer_s *s = g_malloc0(sizeof(*s));
omap_synctimer_reset(s);
- omap_l4_attach(ta, 0, l4_register_io_memory(
- omap_synctimer_readfn, omap_synctimer_writefn, s));
+ omap_l4_attach(ta, 0, cpu_register_io_memory(
+ omap_synctimer_readfn, omap_synctimer_writefn, s,
+ DEVICE_NATIVE_ENDIAN));
return s;
}
diff --git a/hw/omap_tap.c b/hw/omap_tap.c
index 1f18ddd..e685288 100644
--- a/hw/omap_tap.c
+++ b/hw/omap_tap.c
@@ -107,6 +107,7 @@ static CPUWriteMemoryFunc * const omap_tap_writefn[] = {
void omap_tap_init(struct omap_target_agent_s *ta,
struct omap_mpu_state_s *mpu)
{
- omap_l4_attach(ta, 0, l4_register_io_memory(
- omap_tap_readfn, omap_tap_writefn, mpu));
+ omap_l4_attach(ta, 0, cpu_register_io_memory(
+ omap_tap_readfn, omap_tap_writefn, mpu,
+ DEVICE_NATIVE_ENDIAN));
}
OpenPOWER on IntegriCloud