From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:48625) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rd57f-0007Xy-KI for qemu-devel@nongnu.org; Tue, 20 Dec 2011 14:13:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rd57a-0006e7-3T for qemu-devel@nongnu.org; Tue, 20 Dec 2011 14:13:11 -0500 Received: from smtp191.dfw.emailsrvr.com ([67.192.241.191]:38346) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rd57a-0006e0-0J for qemu-devel@nongnu.org; Tue, 20 Dec 2011 14:13:06 -0500 Message-ID: <4EF0DE44.90602@calxeda.com> Date: Tue, 20 Dec 2011 13:13:08 -0600 From: Mark Langsdorf MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH 6/9] ahci: add support for non-PCI based controllers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kwolf@redhat.com, qemu-devel@nongnu.org, paul@codesourcery.com, peter.maydell@linaro.org From: Rob Herring Add support for ahci on sysbus. Signed-off-by: Rob Herring Signed-off-by: Mark Langsdorf --- hw/ide/ahci.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 135d0ee..8b56509 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -25,6 +25,7 @@ #include #include #include +#include #include "monitor.h" #include "dma.h" @@ -1214,3 +1215,37 @@ void ahci_reset(void *opaque) ahci_reset_port(s, i); } } + +typedef struct PlatAHCIState { + SysBusDevice busdev; + AHCIState ahci; +} PlatAHCIState; + +static int plat_ahci_init(SysBusDevice *dev) +{ + PlatAHCIState *s = FROM_SYSBUS(PlatAHCIState, dev); + ahci_init(&s->ahci, &dev->qdev, 1); + + sysbus_init_mmio(dev, &s->ahci.mem); + sysbus_init_irq(dev, &s->ahci.irq); + + qemu_register_reset(ahci_reset, &s->ahci); + return 0; +} + +static SysBusDeviceInfo plat_ahci_info[] = { + { + .qdev.name = "plat-ahci", + .qdev.size = sizeof(PlatAHCIState), + .init = plat_ahci_init, + },{ + /* end of list */ + } +}; + +static void plat_ahci_register(void) +{ + sysbus_register_withprop(plat_ahci_info); +} +device_init(plat_ahci_register); + -- 1.7.5.4