Message ID | 1316603816-12601-1-git-send-email-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | bdbc1b3cd4fbec9f7219e05e77874b489e61b217 |
Headers | show |
diff --git a/hw/omap1.c b/hw/omap1.c index 614fd31..6237b6f 100644 --- a/hw/omap1.c +++ b/hw/omap1.c @@ -3847,6 +3847,7 @@ struct omap_mpu_state_s *omap310_mpu_init(unsigned long sdram_size, s->gpio = qdev_create(NULL, "omap-gpio"); qdev_prop_set_int32(s->gpio, "mpu_model", s->mpu_model); + qdev_prop_set_ptr(s->gpio, "clk", omap_findclk(s, "arm_gpio_ck")); qdev_init_nofail(s->gpio); sysbus_connect_irq(sysbus_from_qdev(s->gpio), 0, s->irq[0][OMAP_INT_GPIO_BANK1]);
Wire up the OMAP1 GPIO clock -- this fixes a hw_error() on startup with OMAP1 based machines (sx1, cheetah). Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- This might textually conflict with Avi's memory API batch 8; I'm posting it for review anyway so I can put it together in a pullreq with the other outstanding omap patches which I'll rebase once batch 8 is committed. hw/omap1.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)