Commit fa73f991 authored by Blue Swirl's avatar Blue Swirl
Browse files

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/cadence_gem: Make rx_desc_addr and tx_desc_addr uint32_t
  i.MX31: KZM-ARM11-01 evaluation board
  i.MX31: Interrupt Controller
  i.MX31: Timers
  i.MX31: Clock Control Module
  i.MX: UART support
  Exynos4: add RTC device
  hw/exynos4210.c: Fix misleading initialization of IROM mirror
  hw/exynos4210_pwm.c: Fix STOP status in tick handler.
  ARM: hw/exynos4210_mct.c: Fix a bug which hangs Linux kernel.
parents 11f8cdbc 8279e042

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -207,6 +207,12 @@ M: qemu-devel@nongnu.org 
S: Orphan

F: hw/gumstix.c



i.MX31

M: Peter Chubb <peter.chubb@nicta.com.au>

S: Odd fixes

F: hw/imx*

F: hw/kzm.c



Integrator CP

M: Paul Brook <paul@codesourcery.com>

M: Peter Maydell <peter.maydell@linaro.org>

hw/arm/Makefile.objs

+3 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ obj-y += realview_gic.o realview.o arm_sysctl.o arm11mpcore.o a9mpcore.o 
obj-y += exynos4210_gic.o exynos4210_combiner.o exynos4210.o

obj-y += exynos4_boards.o exynos4210_uart.o exynos4210_pwm.o

obj-y += exynos4210_pmu.o exynos4210_mct.o exynos4210_fimd.o

obj-y += exynos4210_rtc.o

obj-y += arm_l2x0.o

obj-y += arm_mptimer.o a15mpcore.o

obj-y += armv7m.o armv7m_nvic.o stellaris.o pl022.o stellaris_enet.o
@@ -34,6 +35,8 @@ obj-y += framebuffer.o 
obj-y += vexpress.o

obj-y += strongarm.o

obj-y += collie.o

obj-y += imx_serial.o imx_ccm.o imx_timer.o imx_avic.o

obj-y += kzm.o

obj-y += pl041.o lm4549.o

obj-$(CONFIG_FDT) += ../device_tree.o

hw/cadence_gem.c

+2 −2
Original line number Diff line number Diff line
@@ -339,8 +339,8 @@ typedef struct { 
    uint8_t phy_loop; /* Are we in phy loopback? */



    /* The current DMA descriptor pointers */

    target_phys_addr_t rx_desc_addr;

    target_phys_addr_t tx_desc_addr;

    uint32_t rx_desc_addr;

    uint32_t tx_desc_addr;



} GemState;

hw/exynos4210.c

+9 −1
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ 
/* PWM */

#define EXYNOS4210_PWM_BASE_ADDR       0x139D0000



/* RTC */

#define EXYNOS4210_RTC_BASE_ADDR       0x10070000



/* MCT */

#define EXYNOS4210_MCT_BASE_ADDR       0x10050000
@@ -216,7 +219,7 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem, 
    /* mirror of iROM */

    memory_region_init_alias(&s->irom_alias_mem, "exynos4210.irom_alias",

                             &s->irom_mem,

                             EXYNOS4210_IROM_BASE_ADDR,

                             0,

                             EXYNOS4210_IROM_SIZE);

    memory_region_set_readonly(&s->irom_alias_mem, true);

    memory_region_add_subregion(system_mem, EXYNOS4210_IROM_MIRROR_BASE_ADDR,
@@ -258,6 +261,11 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem, 
                          s->irq_table[exynos4210_get_irq(22, 3)],

                          s->irq_table[exynos4210_get_irq(22, 4)],

                          NULL);

    /* RTC */

    sysbus_create_varargs("exynos4210.rtc", EXYNOS4210_RTC_BASE_ADDR,

                          s->irq_table[exynos4210_get_irq(23, 0)],

                          s->irq_table[exynos4210_get_irq(23, 1)],

                          NULL);



    /* Multi Core Timer */

    dev = qdev_create(NULL, "exynos4210.mct");

hw/exynos4210_mct.c

+0 −4
Original line number Diff line number Diff line
@@ -376,10 +376,6 @@ static uint64_t exynos4210_gfrc_get_count(Exynos4210MCTGT *s) 
{

    uint64_t count = 0;

    count = ptimer_get_count(s->ptimer_frc);

    if (!count) {

        /* Timer event was generated and s->reg.cnt holds adequate value */

        return s->reg.cnt;

    }

    count = s->count - count;

    return s->reg.cnt + count;

}