omap_lcdc: remove imif, emiff from structure

Not used.

Acked-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Avi Kivity <avi@redhat.com>
master
Avi Kivity 2011-08-30 11:56:30 +03:00
parent 763b946c28
commit 9898b79abe
3 changed files with 3 additions and 10 deletions

View File

@ -744,8 +744,7 @@ void omap_tap_init(struct omap_target_agent_s *ta,
struct omap_lcd_panel_s; struct omap_lcd_panel_s;
void omap_lcdc_reset(struct omap_lcd_panel_s *s); void omap_lcdc_reset(struct omap_lcd_panel_s *s);
struct omap_lcd_panel_s *omap_lcdc_init(target_phys_addr_t base, qemu_irq irq, struct omap_lcd_panel_s *omap_lcdc_init(target_phys_addr_t base, qemu_irq irq,
struct omap_dma_lcd_channel_s *dma, struct omap_dma_lcd_channel_s *dma, omap_clk clk);
ram_addr_t imif_base, ram_addr_t emiff_base, omap_clk clk);
/* omap_dss.c */ /* omap_dss.c */
struct rfbi_chip_s { struct rfbi_chip_s {

View File

@ -3872,8 +3872,7 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion *system_memory,
omap_findclk(s, "clk32-kHz")); omap_findclk(s, "clk32-kHz"));
s->lcd = omap_lcdc_init(0xfffec000, s->irq[0][OMAP_INT_LCD_CTRL], s->lcd = omap_lcdc_init(0xfffec000, s->irq[0][OMAP_INT_LCD_CTRL],
omap_dma_get_lcdch(s->dma), imif_base, emiff_base, omap_dma_get_lcdch(s->dma), omap_findclk(s, "lcd_ck"));
omap_findclk(s, "lcd_ck"));
omap_ulpd_pm_init(system_memory, 0xfffe0800, s); omap_ulpd_pm_init(system_memory, 0xfffe0800, s);
omap_pin_cfg_init(system_memory, 0xfffe1000, s); omap_pin_cfg_init(system_memory, 0xfffe1000, s);

View File

@ -24,8 +24,6 @@
struct omap_lcd_panel_s { struct omap_lcd_panel_s {
qemu_irq irq; qemu_irq irq;
DisplayState *state; DisplayState *state;
ram_addr_t imif_base;
ram_addr_t emiff_base;
int plm; int plm;
int tft; int tft;
@ -436,8 +434,7 @@ void omap_lcdc_reset(struct omap_lcd_panel_s *s)
} }
struct omap_lcd_panel_s *omap_lcdc_init(target_phys_addr_t base, qemu_irq irq, struct omap_lcd_panel_s *omap_lcdc_init(target_phys_addr_t base, qemu_irq irq,
struct omap_dma_lcd_channel_s *dma, struct omap_dma_lcd_channel_s *dma, omap_clk clk)
ram_addr_t imif_base, ram_addr_t emiff_base, omap_clk clk)
{ {
int iomemtype; int iomemtype;
struct omap_lcd_panel_s *s = (struct omap_lcd_panel_s *) struct omap_lcd_panel_s *s = (struct omap_lcd_panel_s *)
@ -445,8 +442,6 @@ struct omap_lcd_panel_s *omap_lcdc_init(target_phys_addr_t base, qemu_irq irq,
s->irq = irq; s->irq = irq;
s->dma = dma; s->dma = dma;
s->imif_base = imif_base;
s->emiff_base = emiff_base;
omap_lcdc_reset(s); omap_lcdc_reset(s);
iomemtype = cpu_register_io_memory(omap_lcdc_readfn, iomemtype = cpu_register_io_memory(omap_lcdc_readfn,