Commit ebedf0f9 authored by Marek Vasut's avatar Marek Vasut Committed by Peter Maydell
Browse files

nios2: iic: Convert CPU prop to qom link 



Add a const qom link between the CPU and the IIC instead
of passing the CPU link through a qom property.

Signed-off-by: default avatarMarek Vasut <marex@denx.de>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-id: 20170317210627.23532-1-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: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 96dd9c89

hw/intc/nios2_iic.c

+5 −8
Original line number Diff line number Diff line
@@ -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;

}

hw/nios2/10m50_devboard.c

+2 −1
Original line number Diff line number Diff line
@@ -82,7 +82,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++) {