diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-09-22 18:23:14 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-09-22 18:23:14 +0100 |
| commit | e678c56f169bb576b607cda2a39c0b626ebfb221 (patch) | |
| tree | c22d8a7b3bba5280c0986efc892b8cebf9855f3d /hw/timer/imx_gpt.c | |
| parent | 430da7a81d356e368ccd88dcca60f38da9aa5b9a (diff) | |
| parent | d675765a0244af1d65c292f2508009f1bd13e1b6 (diff) | |
| download | qemu-e678c56f169bb576b607cda2a39c0b626ebfb221.zip qemu-e678c56f169bb576b607cda2a39c0b626ebfb221.tar.gz qemu-e678c56f169bb576b607cda2a39c0b626ebfb221.tar.bz2 | |
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20160922' into staging
target-arm queue:
* add Cortex-A7 CPU
* new ast2500 SoC model and evaluation board
* palmetto-bmc: remove stray double assignment
* aspeed: clean up RAM size handling
* ptimer: framework for defining policy bits to change
behaviour choices for different timer devices
* ptimer: add some test cases
* cadence_gem: add queue support
* loader: support loading images to specified address spaces
* loader: support auto-detect of ELF architecture from file
* dma: xlnx-zynq-devcfg: Fix up XLNX_ZYNQ_DEVCFG_R_MAX
* vmstateify ssd0323
* vmstateify ssi-sd
* disas/arm.c: remove unused macros
* imx: use 'const char', not 'char const'
# gpg: Signature made Thu 22 Sep 2016 18:20:22 BST
# gpg: using RSA key 0x3C2525ED14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
# gpg: aka "Peter Maydell <pmaydell@gmail.com>"
# gpg: aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>"
# Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83 15CF 3C25 25ED 1436 0CDE
* remotes/pmaydell/tags/pull-target-arm-20160922: (36 commits)
imx: Use 'const char', not 'char const'
disas/arm.c: Remove unused macro definitions
vmstateify ssi-sd
vmstateify ssd0323 display
dma: xlnx-zynq-devcfg: Fix up XLNX_ZYNQ_DEVCFG_R_MAX
loader: Add AddressSpace loading support to targphys
loader: Add AddressSpace loading support to uImages
loader: Add AddressSpace loading support to ELFs
loader: Allow a custom AddressSpace when loading ROMs
loader: Use the specified MemoryRegion
loader: Allow ELF loader to auto-detect the ELF arch
xlnx-zynqmp: Set the number of priority queues
cadence_gem: Correct indentation
cadence_gem: Add queue support
cadence_gem: Add support for screening
cadence_gem: Add the num-priority-queues property
cadence_gem: QOMify Cadence GEM
tests: Add ptimer tests
hw/ptimer: Suppress error messages under qtest
hw/ptimer: Introduce timer policy feature
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/timer/imx_gpt.c')
| -rw-r--r-- | hw/timer/imx_gpt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/timer/imx_gpt.c b/hw/timer/imx_gpt.c index 82bc73c..010ccbf 100644 --- a/hw/timer/imx_gpt.c +++ b/hw/timer/imx_gpt.c @@ -29,7 +29,7 @@ } \ } while (0) -static char const *imx_gpt_reg_name(uint32_t reg) +static const char *imx_gpt_reg_name(uint32_t reg) { switch (reg) { case 0: @@ -461,7 +461,7 @@ static void imx_gpt_realize(DeviceState *dev, Error **errp) sysbus_init_mmio(sbd, &s->iomem); bh = qemu_bh_new(imx_gpt_timeout, s); - s->timer = ptimer_init(bh); + s->timer = ptimer_init(bh, PTIMER_POLICY_DEFAULT); } static void imx_gpt_class_init(ObjectClass *klass, void *data) |