OMAP: Refactor DSS/DSI

(includes earlier 'omap_dss prepare for omap3' patch)

Signed-off-by: Juha Riihimäki <juha.riihimaki@nokia.com>

1 files changed, 7 insertions, 10 deletions

diff --git a/hw/omap.h b/hw/omap.h
index 9ed96258a0..48acdfac13 100644
--- a/hw/omap.h
+++ b/hw/omap.h
@@ -20,6 +20,8 @@
 #include "memory.h"
 # define hw_omap_h		"omap.h"
 
+#include "sysemu.h"
+#include "dsi.h"
 #include "spi.h"
 
 # define OMAP_EMIFS_BASE	0x00000000
@@ -936,15 +938,10 @@ struct rfbi_chip_s {
     void (*block)(void *opaque, int dc, void *buf, size_t len, int pitch);
     uint16_t (*read)(void *opaque, int dc);
 };
-struct omap_dss_s;
-void omap_dss_reset(struct omap_dss_s *s);
-struct omap_dss_s *omap_dss_init(struct omap_target_agent_s *ta,
-                MemoryRegion *sysmem,
-                target_phys_addr_t l3_base,
-                qemu_irq irq, qemu_irq drq,
-                omap_clk fck1, omap_clk fck2, omap_clk ck54m,
-                omap_clk ick1, omap_clk ick2);
-void omap_rfbi_attach(struct omap_dss_s *s, int cs, struct rfbi_chip_s *chip);
+DSIHost *omap_dsi_host(DeviceState *dev);
+void omap_rfbi_attach(DeviceState *dev, int cs, const struct rfbi_chip_s *chip);
+void omap_lcd_panel_attach(DeviceState *dev);
+void omap_digital_panel_attach(DeviceState *dev);
 
 /* omap_mmc.c */
 struct omap_mmc_s;
@@ -1127,7 +1124,7 @@ struct omap_mpu_state_s {
 
     DeviceState *mcspi;
 
-    struct omap_dss_s *dss;
+    DeviceState *dss;
 
     struct omap_eac_s *eac;
     MemoryRegion bootrom;