Commit 1eeb5c7d authored by Clement Deschamps's avatar Clement Deschamps Committed by Peter Maydell
Browse files

bcm2835: add sdhost and gpio controllers 



This adds the bcm2835_sdhost and bcm2835_gpio to the BCM2835 platform.

For supporting the SD controller selection (alternate function of GPIOs
48-53), the bcm2835_gpio now exposes an sdbus.
It also has a link to both the sdbus of sdhci and sdhost controllers,
and the card is reparented from one bus to another when the alternate
function of GPIOs 48-53 is modified.

Signed-off-by: default avatarClement Deschamps <clement.deschamps@antfield.fr>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Message-id: 1488293711-14195-5-git-send-email-peter.maydell@linaro.org
Message-id: 20170224164021.9066-5-clement.deschamps@antfield.fr
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent d72fc9dc

hw/arm/bcm2835_peripherals.c

+41 −2
Original line number Diff line number Diff line
@@ -96,6 +96,11 @@ static void bcm2835_peripherals_init(Object *obj) 
    object_property_add_child(obj, "sdhci", OBJECT(&s->sdhci), NULL);

    qdev_set_parent_bus(DEVICE(&s->sdhci), sysbus_get_default());



    /* SDHOST */

    object_initialize(&s->sdhost, sizeof(s->sdhost), TYPE_BCM2835_SDHOST);

    object_property_add_child(obj, "sdhost", OBJECT(&s->sdhost), NULL);

    qdev_set_parent_bus(DEVICE(&s->sdhost), sysbus_get_default());



    /* DMA Channels */

    object_initialize(&s->dma, sizeof(s->dma), TYPE_BCM2835_DMA);

    object_property_add_child(obj, "dma", OBJECT(&s->dma), NULL);
@@ -103,6 +108,16 @@ static void bcm2835_peripherals_init(Object *obj) 


    object_property_add_const_link(OBJECT(&s->dma), "dma-mr",

                                   OBJECT(&s->gpu_bus_mr), &error_abort);



    /* GPIO */

    object_initialize(&s->gpio, sizeof(s->gpio), TYPE_BCM2835_GPIO);

    object_property_add_child(obj, "gpio", OBJECT(&s->gpio), NULL);

    qdev_set_parent_bus(DEVICE(&s->gpio), sysbus_get_default());



    object_property_add_const_link(OBJECT(&s->gpio), "sdbus-sdhci",

                                   OBJECT(&s->sdhci.sdbus), &error_abort);

    object_property_add_const_link(OBJECT(&s->gpio), "sdbus-sdhost",

                                   OBJECT(&s->sdhost.sdbus), &error_abort);

}



static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp)
@@ -267,13 +282,20 @@ static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp) 
    sysbus_connect_irq(SYS_BUS_DEVICE(&s->sdhci), 0,

        qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ,

                               INTERRUPT_ARASANSDIO));

    object_property_add_alias(OBJECT(s), "sd-bus", OBJECT(&s->sdhci), "sd-bus",

                              &err);



    /* SDHOST */

    object_property_set_bool(OBJECT(&s->sdhost), true, "realized", &err);

    if (err) {

        error_propagate(errp, err);

        return;

    }



    memory_region_add_subregion(&s->peri_mr, MMCI0_OFFSET,

                sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->sdhost), 0));

    sysbus_connect_irq(SYS_BUS_DEVICE(&s->sdhost), 0,

        qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ,

                               INTERRUPT_SDIO));



    /* DMA Channels */

    object_property_set_bool(OBJECT(&s->dma), true, "realized", &err);

    if (err) {
@@ -292,6 +314,23 @@ static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp) 
                                                  BCM2835_IC_GPU_IRQ,

                                                  INTERRUPT_DMA0 + n));

    }



    /* GPIO */

    object_property_set_bool(OBJECT(&s->gpio), true, "realized", &err);

    if (err) {

        error_propagate(errp, err);

        return;

    }



    memory_region_add_subregion(&s->peri_mr, GPIO_OFFSET,

                sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->gpio), 0));



    object_property_add_alias(OBJECT(s), "sd-bus", OBJECT(&s->gpio), "sd-bus",

                              &err);

    if (err) {

        error_propagate(errp, err);

        return;

    }

}



static void bcm2835_peripherals_class_init(ObjectClass *oc, void *data)

include/hw/arm/bcm2835_peripherals.h

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
#include "hw/misc/bcm2835_rng.h"

#include "hw/misc/bcm2835_mbox.h"

#include "hw/sd/sdhci.h"

#include "hw/sd/bcm2835_sdhost.h"

#include "hw/gpio/bcm2835_gpio.h"



#define TYPE_BCM2835_PERIPHERALS "bcm2835-peripherals"

#define BCM2835_PERIPHERALS(obj) \
@@ -45,6 +47,8 @@ typedef struct BCM2835PeripheralState { 
    BCM2835RngState rng;

    BCM2835MboxState mboxes;

    SDHCIState sdhci;

    BCM2835SDHostState sdhost;

    BCM2835GpioState gpio;

} BCM2835PeripheralState;



#endif /* BCM2835_PERIPHERALS_H */