From patchwork Wed Jun 13 04:46:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peter A. G. Crosthwaite" X-Patchwork-Id: 164539 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A9283B6FCB for ; Wed, 13 Jun 2012 15:39:42 +1000 (EST) Received: from localhost ([::1]:45265 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SefLa-0006xG-OS for incoming@patchwork.ozlabs.org; Wed, 13 Jun 2012 00:38:22 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35516) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SefLO-0006l6-9N for qemu-devel@nongnu.org; Wed, 13 Jun 2012 00:38:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SefLM-00080B-Dc for qemu-devel@nongnu.org; Wed, 13 Jun 2012 00:38:09 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:42162) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SefLM-0007uz-8L for qemu-devel@nongnu.org; Wed, 13 Jun 2012 00:38:08 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so1836767pbb.4 for ; Tue, 12 Jun 2012 21:38:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references:x-gm-message-state; bh=9Po2ia6/NJdy0xGszUlaq9SAnFVYmeHmYXfxheHqV6Y=; b=kCKglOOoX7gSDl46C1OkGhnJdRR+A6E96UYbdBPP52O1HtWus/TPET5P2MFs6TlgK6 /o3oAXMCznfolR4TYbjbglTbY5Bh6e59IW9TeVzBujQpOMy9HZjVf69+xAGXtQSRU+ws A7PxpGagWso+bxQeuO4iSjexf0DHqOqkepdy1pG1aJ/2w1ZnkLDgNkmsW93J5hEOYbnW x2mmjmeEzLlrQJpgg0SVM5JZ4GT/yGJo+23Srt1phi3I7FQbi2MbVC5YJ+Dx/Jjf27E+ gmOeOPDFawNnOYVeqmFmR9z/R48N6PEBefdRHln74bhU1hgqJk940HBCK/zrOzHbsSBF DPTQ== Received: by 10.68.234.35 with SMTP id ub3mr46536859pbc.8.1339562287210; Tue, 12 Jun 2012 21:38:07 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id ru4sm4356814pbc.66.2012.06.12.21.38.03 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 12 Jun 2012 21:38:05 -0700 (PDT) From: "Peter A. G. Crosthwaite" To: edgar.iglesias@gmail.com, qemu-devel@nongnu.org Date: Wed, 13 Jun 2012 14:46:45 +1000 Message-Id: <83d316791ba43df195935931f8d4ce192967965e.1339562634.git.peter.crosthwaite@petalogix.com> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQkFwJOywa18hD5mGIrDeiYMCgfsGGRLKbOrTXo+uLWASTH3cjgHg3EwBxHHV5zhjSUx7jBH X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: peter.crosthwaite@petalogix.com, monstr@monstr.eu, john.williams@petalogix.com Subject: [Qemu-devel] [PATCH v2 05/11] xilinx_intc: changed device name X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Changed device name to xlnx,xps-intc. This is the exact name of the device in the xilinx EDK development tools. Signed-off-by: Peter A. G. Crosthwaite --- hw/xilinx.h | 2 +- hw/xilinx_intc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/xilinx.h b/hw/xilinx.h index 9ff4c2b..c183e2f 100644 --- a/hw/xilinx.h +++ b/hw/xilinx.h @@ -6,7 +6,7 @@ xilinx_intc_create(target_phys_addr_t base, qemu_irq irq, int kind_of_intr) { DeviceState *dev; - dev = qdev_create(NULL, "xilinx,intc"); + dev = qdev_create(NULL, "xlnx.xps-intc"); qdev_prop_set_uint32(dev, "kind-of-intr", kind_of_intr); qdev_init_nofail(dev); sysbus_mmio_map(sysbus_from_qdev(dev), 0, base); diff --git a/hw/xilinx_intc.c b/hw/xilinx_intc.c index 553f848..386fd30 100644 --- a/hw/xilinx_intc.c +++ b/hw/xilinx_intc.c @@ -156,7 +156,7 @@ static int xilinx_intc_init(SysBusDevice *dev) qdev_init_gpio_in(&dev->qdev, irq_handler, 32); sysbus_init_irq(dev, &p->parent_irq); - memory_region_init_io(&p->mmio, &pic_ops, p, "xilinx-pic", R_MAX * 4); + memory_region_init_io(&p->mmio, &pic_ops, p, "xlnx.xps-intc", R_MAX * 4); sysbus_init_mmio(dev, &p->mmio); return 0; } @@ -176,7 +176,7 @@ static void xilinx_intc_class_init(ObjectClass *klass, void *data) } static TypeInfo xilinx_intc_info = { - .name = "xilinx,intc", + .name = "xlnx.xps-intc", .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(struct xlx_pic), .class_init = xilinx_intc_class_init,