Revision a171fe39 hw/pxa2xx.c

b/hw/pxa2xx.c
1531 1531

  
1532 1532
    s->dma = pxa27x_dma_init(0x40000000, s->pic[PXA2XX_PIC_DMA]);
1533 1533

  
1534
    pxa27x_timer_init(0x40a00000, &s->pic[PXA2XX_PIC_OST_0],
1535
                    s->pic[PXA27X_PIC_OST_4_11], s->env);
1536

  
1534 1537
    s->gpio = pxa2xx_gpio_init(0x40e00000, s->env, s->pic, 121);
1535 1538

  
1539
    s->mmc = pxa2xx_mmci_init(0x41100000, s->pic[PXA2XX_PIC_MMC], s->dma);
1540

  
1536 1541
    for (i = 0; pxa270_serial[i].io_base; i ++)
1537 1542
        if (serial_hds[i])
1538 1543
            serial_mm_init(pxa270_serial[i].io_base, 2,
......
1543 1548
        s->fir = pxa2xx_fir_init(0x40800000, s->pic[PXA2XX_PIC_ICP],
1544 1549
                        s->dma, serial_hds[i]);
1545 1550

  
1551
    if (ds)
1552
        s->lcd = pxa2xx_lcdc_init(0x44000000, s->pic[PXA2XX_PIC_LCD], ds);
1553

  
1546 1554
    s->cm_base = 0x41300000;
1547 1555
    s->cm_regs[CCCR >> 4] = 0x02000210;	/* 416.0 MHz */
1548 1556
    s->clkcfg = 0x00000009;		/* Turbo mode active */
......
1575 1583
        cpu_register_physical_memory(ssp[i].base, 0xfff, iomemtype);
1576 1584
    }
1577 1585

  
1586
    if (usb_enabled) {
1587
        usb_ohci_init_pxa(0x4c000000, 3, -1, s->pic[PXA2XX_PIC_USBH1]);
1588
    }
1589

  
1590
    s->pcmcia[0] = pxa2xx_pcmcia_init(0x20000000);
1591
    s->pcmcia[1] = pxa2xx_pcmcia_init(0x30000000);
1592

  
1578 1593
    s->rtc_base = 0x40900000;
1579 1594
    iomemtype = cpu_register_io_memory(0, pxa2xx_rtc_readfn,
1580 1595
                    pxa2xx_rtc_writefn, s);
......
1609 1624

  
1610 1625
    s->dma = pxa255_dma_init(0x40000000, s->pic[PXA2XX_PIC_DMA]);
1611 1626

  
1627
    pxa25x_timer_init(0x40a00000, &s->pic[PXA2XX_PIC_OST_0], s->env);
1628

  
1612 1629
    s->gpio = pxa2xx_gpio_init(0x40e00000, s->env, s->pic, 121);
1613 1630

  
1631
    s->mmc = pxa2xx_mmci_init(0x41100000, s->pic[PXA2XX_PIC_MMC], s->dma);
1632

  
1614 1633
    for (i = 0; pxa255_serial[i].io_base; i ++)
1615 1634
        if (serial_hds[i])
1616 1635
            serial_mm_init(pxa255_serial[i].io_base, 2,
......
1621 1640
        s->fir = pxa2xx_fir_init(0x40800000, s->pic[PXA2XX_PIC_ICP],
1622 1641
                        s->dma, serial_hds[i]);
1623 1642

  
1643
    if (ds)
1644
        s->lcd = pxa2xx_lcdc_init(0x44000000, s->pic[PXA2XX_PIC_LCD], ds);
1645

  
1624 1646
    s->cm_base = 0x41300000;
1625 1647
    s->cm_regs[CCCR >> 4] = 0x02000210;	/* 416.0 MHz */
1626 1648
    s->clkcfg = 0x00000009;		/* Turbo mode active */
......
1653 1675
        cpu_register_physical_memory(ssp[i].base, 0xfff, iomemtype);
1654 1676
    }
1655 1677

  
1678
    if (usb_enabled) {
1679
        usb_ohci_init_pxa(0x4c000000, 3, -1, s->pic[PXA2XX_PIC_USBH1]);
1680
    }
1681

  
1682
    s->pcmcia[0] = pxa2xx_pcmcia_init(0x20000000);
1683
    s->pcmcia[1] = pxa2xx_pcmcia_init(0x30000000);
1684

  
1656 1685
    s->rtc_base = 0x40900000;
1657 1686
    iomemtype = cpu_register_io_memory(0, pxa2xx_rtc_readfn,
1658 1687
                    pxa2xx_rtc_writefn, s);

Also available in: Unified diff