hw/arm/bcm2835_peripherals.c.orig

   1 /*
   2  * Raspberry Pi emulation (c) 2012 Gregory Estrade
   3  * Upstreaming code cleanup [including bcm2835_*] (c) 2013 Jan Petrous
   4  *
   5  * Rasperry Pi 2 emulation and refactoring Copyright (c) 2015, Microsoft
   6  * Written by Andrew Baumann
   7  *
   8  * This code is licensed under the GNU GPLv2 and later.
   9  */
  10
  11 #include "hw/arm/bcm2835_peripherals.h"
  12 #include "hw/misc/bcm2835_mbox_defs.h"
  13 #include "hw/arm/raspi_platform.h"
  14
  15 <<<<<<< HEAD
  16 =======
  17 /* Peripheral base address on the VC (GPU) system bus */
  18 #define BCM2835_VC_PERI_BASE 0x7e000000
  19
  20 >>>>>>> upstreaming-raspi
  21 /* Capabilities for SD controller: no DMA, high-speed, default clocks etc. */
  22 #define BCM2835_SDHC_CAPAREG 0x52034b4
  23
  24 static void bcm2835_peripherals_init(Object *obj)
  25 {
  26     BCM2835PeripheralState *s = BCM2835_PERIPHERALS(obj);
  27
  28     /* Memory region for peripheral devices, which we export to our parent */
  29 <<<<<<< HEAD
  30     memory_region_init_io(&s->peri_mr, OBJECT(s), NULL, s,
  31                           "bcm2835_peripherals", 0x1000000);
  32     object_property_add_child(obj, "peripheral_io", OBJECT(&s->peri_mr), NULL);
  33     sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->peri_mr);
  34
  35     /* Internal memory region for peripheral bus addresses (not exported) */
  36     memory_region_init_io(&s->gpu_bus_mr, OBJECT(s), NULL, s, "bcm2835_gpu_bus",
  37                           (uint64_t)1 << 32);
  38     object_property_add_child(obj, "gpu_bus", OBJECT(&s->gpu_bus_mr), NULL);
  39
  40     /* Internal memory region for communication of mailbox channel data */
  41     memory_region_init_io(&s->mbox_mr, OBJECT(s), NULL, s, "bcm2835_mbox",
  42                           MBOX_CHAN_COUNT << 4);
  43 =======
  44     memory_region_init_io(&s->peri_mr, obj, NULL, s, "bcm2835-peripherals",
  45                           0x1000000);
  46     object_property_add_child(obj, "peripheral-io", OBJECT(&s->peri_mr), NULL);
  47     sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->peri_mr);
  48
  49     /* Internal memory region for peripheral bus addresses (not exported) */
  50     memory_region_init(&s->gpu_bus_mr, obj, "bcm2835-gpu", (uint64_t)1 << 32);
  51     object_property_add_child(obj, "gpu-bus", OBJECT(&s->gpu_bus_mr), NULL);
  52
  53     /* Internal memory region for request/response communication with
  54      * mailbox-addressable peripherals (not exported)
  55      */
  56     memory_region_init(&s->mbox_mr, obj, "bcm2835-mbox",
  57                        MBOX_CHAN_COUNT << MBOX_AS_CHAN_SHIFT);
  58 >>>>>>> upstreaming-raspi
  59
  60     /* Interrupt Controller */
  61     object_initialize(&s->ic, sizeof(s->ic), TYPE_BCM2835_IC);
  62     object_property_add_child(obj, "ic", OBJECT(&s->ic), NULL);
  63     qdev_set_parent_bus(DEVICE(&s->ic), sysbus_get_default());
  64
  65     /* UART0 */
  66     s->uart0 = SYS_BUS_DEVICE(object_new("pl011"));
  67     object_property_add_child(obj, "uart0", OBJECT(s->uart0), NULL);
  68     qdev_set_parent_bus(DEVICE(s->uart0), sysbus_get_default());
  69
  70 <<<<<<< HEAD
  71     /* AUX / UART1 */
  72     object_initialize(&s->aux, sizeof(s->aux), TYPE_BCM2835_AUX);
  73     object_property_add_child(obj, "aux", OBJECT(&s->aux), NULL);
  74     qdev_set_parent_bus(DEVICE(&s->aux), sysbus_get_default());
  75
  76     /* System timer */
  77     object_initialize(&s->st, sizeof(s->st), TYPE_BCM2835_ST);
  78     object_property_add_child(obj, "systimer", OBJECT(&s->st), NULL);
  79     qdev_set_parent_bus(DEVICE(&s->st), sysbus_get_default());
  80
  81     /* ARM timer */
  82     object_initialize(&s->timer, sizeof(s->timer), TYPE_BCM2835_TIMER);
  83     object_property_add_child(obj, "armtimer", OBJECT(&s->timer), NULL);
  84     qdev_set_parent_bus(DEVICE(&s->timer), sysbus_get_default());
  85
  86     /* USB controller */
  87     object_initialize(&s->usb, sizeof(s->usb), TYPE_BCM2835_USB);
  88     object_property_add_child(obj, "usb", OBJECT(&s->usb), NULL);
  89     qdev_set_parent_bus(DEVICE(&s->usb), sysbus_get_default());
  90
  91     object_property_add_const_link(OBJECT(&s->usb), "dma_mr",
  92                                    OBJECT(&s->gpu_bus_mr), &error_abort);
  93
  94     /* MPHI - Message-based Parallel Host Interface */
  95     object_initialize(&s->mphi, sizeof(s->mphi), TYPE_BCM2835_MPHI);
  96     object_property_add_child(obj, "mphi", OBJECT(&s->mphi), NULL);
  97     qdev_set_parent_bus(DEVICE(&s->mphi), sysbus_get_default());
  98
  99 =======
 100 >>>>>>> upstreaming-raspi
 101     /* Mailboxes */
 102     object_initialize(&s->mboxes, sizeof(s->mboxes), TYPE_BCM2835_MBOX);
 103     object_property_add_child(obj, "mbox", OBJECT(&s->mboxes), NULL);
 104     qdev_set_parent_bus(DEVICE(&s->mboxes), sysbus_get_default());
 105
 106 <<<<<<< HEAD
 107     object_property_add_const_link(OBJECT(&s->mboxes), "mbox_mr",
 108                                    OBJECT(&s->mbox_mr), &error_abort);
 109
 110     /* Power management */
 111     object_initialize(&s->power, sizeof(s->power), TYPE_BCM2835_POWER);
 112     object_property_add_child(obj, "power", OBJECT(&s->power), NULL);
 113     qdev_set_parent_bus(DEVICE(&s->power), sysbus_get_default());
 114
 115     /* Framebuffer */
 116     object_initialize(&s->fb, sizeof(s->fb), TYPE_BCM2835_FB);
 117     object_property_add_child(obj, "fb", OBJECT(&s->fb), NULL);
 118     object_property_add_alias(obj, "vcram-size", OBJECT(&s->fb), "vcram-size",
 119                               &error_abort);
 120     qdev_set_parent_bus(DEVICE(&s->fb), sysbus_get_default());
 121
 122     object_property_add_const_link(OBJECT(&s->fb), "dma_mr",
 123                                    OBJECT(&s->gpu_bus_mr), &error_abort);
 124
 125 =======
 126     object_property_add_const_link(OBJECT(&s->mboxes), "mbox-mr",
 127                                    OBJECT(&s->mbox_mr), &error_abort);
 128
 129 >>>>>>> upstreaming-raspi
 130     /* Property channel */
 131     object_initialize(&s->property, sizeof(s->property), TYPE_BCM2835_PROPERTY);
 132     object_property_add_child(obj, "property", OBJECT(&s->property), NULL);
 133     qdev_set_parent_bus(DEVICE(&s->property), sysbus_get_default());
 134
 135 <<<<<<< HEAD
 136     object_property_add_const_link(OBJECT(&s->property), "bcm2835_fb",
 137                                    OBJECT(&s->fb), &error_abort);
 138     object_property_add_const_link(OBJECT(&s->property), "dma_mr",
 139 =======
 140     object_property_add_const_link(OBJECT(&s->property), "dma-mr",
 141 >>>>>>> upstreaming-raspi
 142                                    OBJECT(&s->gpu_bus_mr), &error_abort);
 143
 144     /* Extended Mass Media Controller */
 145     object_initialize(&s->sdhci, sizeof(s->sdhci), TYPE_SYSBUS_SDHCI);
 146     object_property_add_child(obj, "sdhci", OBJECT(&s->sdhci), NULL);
 147     qdev_set_parent_bus(DEVICE(&s->sdhci), sysbus_get_default());
 148 <<<<<<< HEAD
 149
 150     /* DMA Channels */
 151     object_initialize(&s->dma, sizeof(s->dma), TYPE_BCM2835_DMA);
 152     object_property_add_child(obj, "dma", OBJECT(&s->dma), NULL);
 153     qdev_set_parent_bus(DEVICE(&s->dma), sysbus_get_default());
 154
 155     object_property_add_const_link(OBJECT(&s->dma), "dma_mr",
 156                                    OBJECT(&s->gpu_bus_mr), &error_abort);
 157
 158 =======
 159 >>>>>>> upstreaming-raspi
 160 }
 161
 162 static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp)
 163 {
 164     BCM2835PeripheralState *s = BCM2835_PERIPHERALS(dev);
 165 <<<<<<< HEAD
 166     MemoryRegion *ram;
 167     Error *err = NULL;
 168     uint32_t ram_size, vcram_size;
 169     int n;
 170
 171     /* Map peripherals and RAM into the GPU address space. */
 172     memory_region_init_alias(&s->peri_mr_alias, OBJECT(s),
 173                              "bcm2835_peripherals", &s->peri_mr, 0,
 174 =======
 175     Object *obj;
 176     MemoryRegion *ram;
 177     Error *err = NULL;
 178     uint32_t ram_size;
 179     int n;
 180
 181     obj = object_property_get_link(OBJECT(dev), "ram", &err);
 182     if (obj == NULL) {
 183         error_setg(errp, "%s: required ram link not found: %s",
 184                    __func__, error_get_pretty(err));
 185         return;
 186     }
 187
 188     ram = MEMORY_REGION(obj);
 189     ram_size = memory_region_size(ram);
 190
 191     /* Map peripherals and RAM into the GPU address space. */
 192     memory_region_init_alias(&s->peri_mr_alias, OBJECT(s),
 193                              "bcm2835-peripherals", &s->peri_mr, 0,
 194 >>>>>>> upstreaming-raspi
 195                              memory_region_size(&s->peri_mr));
 196
 197     memory_region_add_subregion_overlap(&s->gpu_bus_mr, BCM2835_VC_PERI_BASE,
 198                                         &s->peri_mr_alias, 1);
 199
 200 <<<<<<< HEAD
 201     /* XXX: assume that RAM is contiguous and mapped at system address zero */
 202     ram = memory_region_find(get_system_memory(), 0, 1).mr;
 203     assert(ram != NULL && memory_region_size(ram) >= 128 * 1024 * 1024);
 204     ram_size = memory_region_size(ram);
 205
 206     /* RAM is aliased four times (different cache configurations) on the GPU */
 207     for (n = 0; n < 4; n++) {
 208         memory_region_init_alias(&s->ram_alias[n], OBJECT(s),
 209                                  "bcm2835_gpu_ram_alias[*]", ram, 0, ram_size);
 210 =======
 211     /* RAM is aliased four times (different cache configurations) on the GPU */
 212     for (n = 0; n < 4; n++) {
 213         memory_region_init_alias(&s->ram_alias[n], OBJECT(s),
 214                                  "bcm2835-gpu-ram-alias[*]", ram, 0, ram_size);
 215 >>>>>>> upstreaming-raspi
 216         memory_region_add_subregion_overlap(&s->gpu_bus_mr, (hwaddr)n << 30,
 217                                             &s->ram_alias[n], 0);
 218     }
 219
 220     /* Interrupt Controller */
 221     object_property_set_bool(OBJECT(&s->ic), true, "realized", &err);
 222     if (err) {
 223         error_propagate(errp, err);
 224         return;
 225     }
 226
 227     memory_region_add_subregion(&s->peri_mr, ARMCTRL_IC_OFFSET,
 228                 sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->ic), 0));
 229     sysbus_pass_irq(SYS_BUS_DEVICE(s), SYS_BUS_DEVICE(&s->ic));
 230
 231     /* UART0 */
 232     object_property_set_bool(OBJECT(s->uart0), true, "realized", &err);
 233     if (err) {
 234         error_propagate(errp, err);
 235         return;
 236     }
 237
 238     memory_region_add_subregion(&s->peri_mr, UART0_OFFSET,
 239                                 sysbus_mmio_get_region(s->uart0, 0));
 240     sysbus_connect_irq(s->uart0, 0,
 241         qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ,
 242 <<<<<<< HEAD
 243                                INTERRUPT_VC_UART));
 244
 245     /* AUX / UART1 */
 246     object_property_set_bool(OBJECT(&s->aux), true, "realized", &err);
 247     if (err) {
 248         error_propagate(errp, err);
 249         return;
 250     }
 251
 252     memory_region_add_subregion(&s->peri_mr, UART1_OFFSET,
 253                 sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->aux), 0));
 254     sysbus_connect_irq(SYS_BUS_DEVICE(&s->aux), 0,
 255         qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ,
 256                                INTERRUPT_AUX));
 257
 258     /* System timer */
 259     object_property_set_bool(OBJECT(&s->st), true, "realized", &err);
 260     if (err) {
 261         error_propagate(errp, err);
 262         return;
 263     }
 264
 265     memory_region_add_subregion(&s->peri_mr, ST_OFFSET,
 266                 sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->st), 0));
 267     sysbus_connect_irq(SYS_BUS_DEVICE(&s->st), 0,
 268         qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ,
 269                                INTERRUPT_TIMER0));
 270     sysbus_connect_irq(SYS_BUS_DEVICE(&s->st), 1,
 271         qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ,
 272                                INTERRUPT_TIMER1));
 273     sysbus_connect_irq(SYS_BUS_DEVICE(&s->st), 2,
 274         qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ,
 275                                INTERRUPT_TIMER2));
 276     sysbus_connect_irq(SYS_BUS_DEVICE(&s->st), 3,
 277         qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ,
 278                                INTERRUPT_TIMER3));
 279
 280     /* ARM timer */
 281     object_property_set_bool(OBJECT(&s->timer), true, "realized", &err);
 282     if (err) {
 283         error_propagate(errp, err);
 284         return;
 285     }
 286
 287     memory_region_add_subregion(&s->peri_mr, ARMCTRL_TIMER0_1_OFFSET,
 288                 sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->timer), 0));
 289     sysbus_connect_irq(SYS_BUS_DEVICE(&s->timer), 0,
 290         qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_ARM_IRQ,
 291                                INTERRUPT_ARM_TIMER - ARM_IRQ0_BASE)); /* XXX */
 292
 293     /* USB controller */
 294     object_property_set_bool(OBJECT(&s->usb), true, "realized", &err);
 295     if (err) {
 296         error_propagate(errp, err);
 297         return;
 298     }
 299
 300     memory_region_add_subregion(&s->peri_mr, USB_OFFSET,
 301                 sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->usb), 0));
 302     sysbus_connect_irq(SYS_BUS_DEVICE(&s->usb), 0,
 303         qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ,
 304                                INTERRUPT_VC_USB));
 305
 306     /* MPHI - Message-based Parallel Host Interface */
 307     object_property_set_bool(OBJECT(&s->mphi), true, "realized", &err);
 308     if (err) {
 309         error_propagate(errp, err);
 310         return;
 311     }
 312
 313     memory_region_add_subregion(&s->peri_mr, MPHI_OFFSET,
 314                 sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->mphi), 0));
 315     sysbus_connect_irq(SYS_BUS_DEVICE(&s->mphi), 0,
 316         qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ,
 317                                INTERRUPT_HOSTPORT));
 318 =======
 319                                INTERRUPT_UART));
 320 >>>>>>> upstreaming-raspi
 321
 322     /* Mailboxes */
 323     object_property_set_bool(OBJECT(&s->mboxes), true, "realized", &err);
 324     if (err) {
 325         error_propagate(errp, err);
 326         return;
 327     }
 328
 329     memory_region_add_subregion(&s->peri_mr, ARMCTRL_0_SBM_OFFSET,
 330                 sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->mboxes), 0));
 331     sysbus_connect_irq(SYS_BUS_DEVICE(&s->mboxes), 0,
 332         qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_ARM_IRQ,
 333 <<<<<<< HEAD
 334                                INTERRUPT_ARM_MAILBOX - ARM_IRQ0_BASE));
 335
 336     /* Mailbox-addressable peripherals use the private mbox_mr address space
 337      * and pseudo-irqs to dispatch requests and responses. */
 338
 339     /* Power management */
 340     object_property_set_bool(OBJECT(&s->power), true, "realized", &err);
 341     if (err) {
 342         error_propagate(errp, err);
 343         return;
 344     }
 345
 346     memory_region_add_subregion(&s->mbox_mr, MBOX_CHAN_POWER << MBOX_AS_CHAN_SHIFT,
 347                 sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->power), 0));
 348     sysbus_connect_irq(SYS_BUS_DEVICE(&s->power), 0,
 349                        qdev_get_gpio_in(DEVICE(&s->mboxes), MBOX_CHAN_POWER));
 350
 351     /* Framebuffer */
 352     vcram_size = (uint32_t)object_property_get_int(OBJECT(s), "vcram-size",
 353                                                    &err);
 354     if (err) {
 355         error_propagate(errp, err);
 356         return;
 357     }
 358
 359     object_property_set_int(OBJECT(&s->fb), ram_size - vcram_size,
 360                             "vcram-base", &err);
 361     if (err) {
 362         error_propagate(errp, err);
 363         return;
 364     }
 365
 366     object_property_set_bool(OBJECT(&s->fb), true, "realized", &err);
 367 =======
 368                                INTERRUPT_ARM_MAILBOX));
 369
 370     /* Property channel */
 371     object_property_set_int(OBJECT(&s->property), ram_size, "ram-size", &err);
 372 >>>>>>> upstreaming-raspi
 373     if (err) {
 374         error_propagate(errp, err);
 375         return;
 376     }
 377
 378 <<<<<<< HEAD
 379     memory_region_add_subregion(&s->mbox_mr, MBOX_CHAN_FB << MBOX_AS_CHAN_SHIFT,
 380                 sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->fb), 0));
 381     sysbus_connect_irq(SYS_BUS_DEVICE(&s->fb), 0,
 382                        qdev_get_gpio_in(DEVICE(&s->mboxes), MBOX_CHAN_FB));
 383
 384     /* Property channel */
 385 =======
 386 >>>>>>> upstreaming-raspi
 387     object_property_set_bool(OBJECT(&s->property), true, "realized", &err);
 388     if (err) {
 389         error_propagate(errp, err);
 390         return;
 391     }
 392
 393     memory_region_add_subregion(&s->mbox_mr,
 394                 MBOX_CHAN_PROPERTY << MBOX_AS_CHAN_SHIFT,
 395                 sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->property), 0));
 396     sysbus_connect_irq(SYS_BUS_DEVICE(&s->property), 0,
 397                       qdev_get_gpio_in(DEVICE(&s->mboxes), MBOX_CHAN_PROPERTY));
 398
 399     /* Extended Mass Media Controller */
 400     object_property_set_int(OBJECT(&s->sdhci), BCM2835_SDHC_CAPAREG, "capareg",
 401                             &err);
 402     if (err) {
 403         error_propagate(errp, err);
 404         return;
 405     }
 406
 407 <<<<<<< HEAD
 408     object_property_set_bool(OBJECT(&s->sdhci), true, "bcm2835-quirk", &err);
 409     if (err) {
 410         error_propagate(errp, err);
 411         return;
 412     }
 413
 414 =======
 415 >>>>>>> upstreaming-raspi
 416     object_property_set_bool(OBJECT(&s->sdhci), true, "realized", &err);
 417     if (err) {
 418         error_propagate(errp, err);
 419         return;
 420     }
 421
 422     memory_region_add_subregion(&s->peri_mr, EMMC_OFFSET,
 423                 sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->sdhci), 0));
 424     sysbus_connect_irq(SYS_BUS_DEVICE(&s->sdhci), 0,
 425         qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ,
 426 <<<<<<< HEAD
 427                                INTERRUPT_VC_ARASANSDIO));
 428
 429     /* DMA Channels */
 430     object_property_set_bool(OBJECT(&s->dma), true, "realized", &err);
 431     if (err) {
 432         error_propagate(errp, err);
 433         return;
 434     }
 435
 436     memory_region_add_subregion(&s->peri_mr, DMA_OFFSET,
 437                 sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->dma), 0));
 438     memory_region_add_subregion(&s->peri_mr, DMA15_OFFSET,
 439                 sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->dma), 1));
 440
 441     sysbus_connect_irq(SYS_BUS_DEVICE(&s->dma), 0,
 442                        qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ, INTERRUPT_DMA0));
 443     sysbus_connect_irq(SYS_BUS_DEVICE(&s->dma), 1,
 444                        qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ, INTERRUPT_DMA1));
 445     sysbus_connect_irq(SYS_BUS_DEVICE(&s->dma), 2,
 446                        qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ, INTERRUPT_VC_DMA2));
 447     sysbus_connect_irq(SYS_BUS_DEVICE(&s->dma), 3,
 448                        qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ, INTERRUPT_VC_DMA3));
 449     sysbus_connect_irq(SYS_BUS_DEVICE(&s->dma), 4,
 450                        qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ, INTERRUPT_DMA4));
 451     sysbus_connect_irq(SYS_BUS_DEVICE(&s->dma), 5,
 452                        qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ, INTERRUPT_DMA5));
 453     sysbus_connect_irq(SYS_BUS_DEVICE(&s->dma), 6,
 454                        qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ, INTERRUPT_DMA6));
 455     sysbus_connect_irq(SYS_BUS_DEVICE(&s->dma), 7,
 456                        qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ, INTERRUPT_DMA7));
 457     sysbus_connect_irq(SYS_BUS_DEVICE(&s->dma), 8,
 458                        qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ, INTERRUPT_DMA8));
 459     sysbus_connect_irq(SYS_BUS_DEVICE(&s->dma), 9,
 460                        qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ, INTERRUPT_DMA9));
 461     sysbus_connect_irq(SYS_BUS_DEVICE(&s->dma), 10,
 462                        qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ, INTERRUPT_DMA10));
 463     sysbus_connect_irq(SYS_BUS_DEVICE(&s->dma), 11,
 464                        qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ, INTERRUPT_DMA11));
 465     sysbus_connect_irq(SYS_BUS_DEVICE(&s->dma), 12,
 466                        qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ, INTERRUPT_DMA12));
 467 =======
 468                                INTERRUPT_ARASANSDIO));
 469 >>>>>>> upstreaming-raspi
 470 }
 471
 472 static void bcm2835_peripherals_class_init(ObjectClass *oc, void *data)
 473 {
 474     DeviceClass *dc = DEVICE_CLASS(oc);
 475
 476     dc->realize = bcm2835_peripherals_realize;
 477 }
 478
 479 static const TypeInfo bcm2835_peripherals_type_info = {
 480     .name = TYPE_BCM2835_PERIPHERALS,
 481     .parent = TYPE_SYS_BUS_DEVICE,
 482     .instance_size = sizeof(BCM2835PeripheralState),
 483     .instance_init = bcm2835_peripherals_init,
 484     .class_init = bcm2835_peripherals_class_init,
 485 };
 486
 487 static void bcm2835_peripherals_register_types(void)
 488 {
 489     type_register_static(&bcm2835_peripherals_type_info);
 490 }
 491
 492 type_init(bcm2835_peripherals_register_types)