diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2012-03-17 16:23:19 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2012-03-17 16:23:19 +0000 |
| commit | 103f9af2a1ad6427533ae2c92d9e1e721b2ae902 (patch) | |
| tree | 28d1d8db605390fe5c806791a04e7600701eb2c2 /hw/omap.h | |
| parent | 69784eaec335d09619639db4da6c1e4770290526 (diff) | |
| parent | 14dd5faa7e168d70760902c269dc68f3104b8ed6 (diff) | |
| download | focaccia-qemu-103f9af2a1ad6427533ae2c92d9e1e721b2ae902.tar.gz focaccia-qemu-103f9af2a1ad6427533ae2c92d9e1e721b2ae902.zip | |
Merge branch 'arm-devs.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm
* 'arm-devs.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm: hw/pxa2xx.c: Fix handling of pxa2xx_i2c variable offset within region hw/pxa2xx_lcd.c: drop target_phys_addr_t usage in device state hw/pxa2xx_dma.c: drop target_phys_addr_t usage in device state ARM: Remove unnecessary subpage workarounds hw/omap_i2c: Convert to qdev
Diffstat (limited to 'hw/omap.h')
| -rw-r--r-- | hw/omap.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/hw/omap.h b/hw/omap.h index 63ef847ed0..6c3d004719 100644 --- a/hw/omap.h +++ b/hw/omap.h @@ -764,16 +764,7 @@ void omap_mmc_handlers(struct omap_mmc_s *s, qemu_irq ro, qemu_irq cover); void omap_mmc_enable(struct omap_mmc_s *s, int enable); /* omap_i2c.c */ -struct omap_i2c_s; -struct omap_i2c_s *omap_i2c_init(MemoryRegion *sysmem, - target_phys_addr_t base, - qemu_irq irq, - qemu_irq *dma, - omap_clk clk); -struct omap_i2c_s *omap2_i2c_init(struct omap_target_agent_s *ta, - qemu_irq irq, qemu_irq *dma, omap_clk fclk, omap_clk iclk); -void omap_i2c_reset(struct omap_i2c_s *s); -i2c_bus *omap_i2c_bus(struct omap_i2c_s *s); +i2c_bus *omap_i2c_bus(DeviceState *omap_i2c); # define cpu_is_omap310(cpu) (cpu->mpu_model == omap310) # define cpu_is_omap1510(cpu) (cpu->mpu_model == omap1510) @@ -867,7 +858,7 @@ struct omap_mpu_state_s { struct omap_pwl_s *pwl; struct omap_pwt_s *pwt; - struct omap_i2c_s *i2c[2]; + DeviceState *i2c[2]; struct omap_rtc_s *rtc; |