diff mbox

[V3] nios2: iic: Convert CPU prop to qom link

Message ID 20170317210627.23532-1-marex@denx.de (mailing list archive)
State New, archived
Headers show

Commit Message

Marek Vasut March 17, 2017, 9:06 p.m. UTC 
Add a const qom link between the CPU and the IIC instead
of passing the CPU link through a qom property.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexander Graf <agraf@suse.de>
Cc: Chris Wulff <crwulff@gmail.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Jeff Da Silva <jdasilva@altera.com>
Cc: Ley Foon Tan <lftan@altera.com>
Cc: Markus Armbruster <armbru@redhat.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Sandra Loosemore <sandra@codesourcery.com>
Cc: Yves Vandervennet <yvanderv@altera.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
---
V2: Retain dc->cannot_instantiate_with_device_add_yet = true
    in altera_iic_class_init() since the device is still not
    device_add() creatable.
V3: Update the comment in altera_iic_class_init()
---
 hw/intc/nios2_iic.c       | 13 +++++--------
 hw/nios2/10m50_devboard.c |  3 ++-
 2 files changed, 7 insertions(+), 9 deletions(-)

Comments

Peter Maydell March 18, 2017, 7:55 p.m. UTC | #1 
On 17 March 2017 at 21:06, Marek Vasut <marex@denx.de> wrote:
> Add a const qom link between the CPU and the IIC instead
> of passing the CPU link through a qom property.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Alexander Graf <agraf@suse.de>
> Cc: Chris Wulff <crwulff@gmail.com>
> Cc: Igor Mammedov <imammedo@redhat.com>
> Cc: Jeff Da Silva <jdasilva@altera.com>
> Cc: Ley Foon Tan <lftan@altera.com>
> Cc: Markus Armbruster <armbru@redhat.com>
> Cc: Richard Henderson <rth@twiddle.net>
> Cc: Sandra Loosemore <sandra@codesourcery.com>
> Cc: Yves Vandervennet <yvanderv@altera.com>
> Reviewed-by: Markus Armbruster <armbru@redhat.com>
> ---
> V2: Retain dc->cannot_instantiate_with_device_add_yet = true
>     in altera_iic_class_init() since the device is still not
>     device_add() creatable.
> V3: Update the comment in altera_iic_class_init()

Applied to master, thanks.

-- PMM
diff mbox

Patch

diff --git a/hw/intc/nios2_iic.c b/hw/intc/nios2_iic.c
index 818ab1b315..190b6fdbf3 100644
--- a/hw/intc/nios2_iic.c
+++ b/hw/intc/nios2_iic.c
@@ -62,17 +62,15 @@  static void altera_iic_init(Object *obj)
     sysbus_init_irq(SYS_BUS_DEVICE(obj), &pv->parent_irq);
 }
 
-static Property altera_iic_properties[] = {
-    DEFINE_PROP_PTR("cpu", AlteraIIC, cpu),
-    DEFINE_PROP_END_OF_LIST(),
-};
-
 static void altera_iic_realize(DeviceState *dev, Error **errp)
 {
     struct AlteraIIC *pv = ALTERA_IIC(dev);
+    Error *err = NULL;
 
+    pv->cpu = object_property_get_link(OBJECT(dev), "cpu", &err);
     if (!pv->cpu) {
-        error_setg(errp, "altera,iic: CPU not connected");
+        error_setg(errp, "altera,iic: CPU link not found: %s",
+                   error_get_pretty(err));
         return;
     }
 }
@@ -81,8 +79,7 @@  static void altera_iic_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
 
-    dc->props = altera_iic_properties;
-    /* Reason: pointer property "cpu" */
+    /* Reason: needs to be wired up, e.g. by nios2_10m50_ghrd_init() */
     dc->cannot_instantiate_with_device_add_yet = true;
     dc->realize = altera_iic_realize;
 }
diff --git a/hw/nios2/10m50_devboard.c b/hw/nios2/10m50_devboard.c
index 0d8b9aa58f..c18e0b2a17 100644
--- a/hw/nios2/10m50_devboard.c
+++ b/hw/nios2/10m50_devboard.c
@@ -83,7 +83,8 @@  static void nios2_10m50_ghrd_init(MachineState *machine)
 
     /* Register: Internal Interrupt Controller (IIC) */
     dev = qdev_create(NULL, "altera,iic");
-    qdev_prop_set_ptr(dev, "cpu", cpu);
+    object_property_add_const_link(OBJECT(dev), "cpu", OBJECT(cpu),
+                                   &error_abort);
     qdev_init_nofail(dev);
     sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, cpu_irq[0]);
     for (i = 0; i < 32; i++) {