From patchwork Wed Jun 13 04:46:51 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: 164530 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 C7FC0B6FCC for ; Wed, 13 Jun 2012 14:39:05 +1000 (EST) Received: from localhost ([::1]:47313 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SefMF-00080p-Kv for incoming@patchwork.ozlabs.org; Wed, 13 Jun 2012 00:39:03 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35771) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SefM4-00080X-0Q for qemu-devel@nongnu.org; Wed, 13 Jun 2012 00:38:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SefM2-00088i-Aa for qemu-devel@nongnu.org; Wed, 13 Jun 2012 00:38:51 -0400 Received: from mail-pz0-f47.google.com ([209.85.210.47]:63957) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SefM2-00086a-4L for qemu-devel@nongnu.org; Wed, 13 Jun 2012 00:38:50 -0400 Received: by mail-pz0-f47.google.com with SMTP id h21so408707dal.34 for ; Tue, 12 Jun 2012 21:38:49 -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=yCtg0lhEC5dJiS3WU7bQMGRc9J4Y/pxsf+Txm/GkMQA=; b=I3Hmh31Mksm7aoC5nZ6djDfjTqwEYGjG13LR9C+RWwbex5rDBSOvqiZiRdo7kTPWEb /PuYJ9+pj+2kgy1R9R4iDInj15K81Lia2OZsEU/TPDlM0kT9E6I0R9++izOpXwSNKoW2 Dd/jLDkNc80TNPUOXLjk4g2KVnVKn58gRccXnyjzwo/mZ46Bf5uAYskRAZnRsPil5nC5 XDoBzEMWYQe+G2cZX0VmPbeWB2wTzs143hwI6mrZI7HTrjJDyfsSihxJExcD3l43U7+S tw16CPHPABYiGVwxlCRGvO+gJYr0RX7A7nFYDGqKeQfTP9LAfAEczpNi1fhNkntmzQH4 6HYA== Received: by 10.68.226.168 with SMTP id rt8mr33006129pbc.23.1339562329011; Tue, 12 Jun 2012 21:38:49 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id pg1sm4370041pbb.41.2012.06.12.21.38.45 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 12 Jun 2012 21:38:47 -0700 (PDT) From: "Peter A. G. Crosthwaite" To: edgar.iglesias@gmail.com, qemu-devel@nongnu.org Date: Wed, 13 Jun 2012 14:46:51 +1000 Message-Id: <18cf993e615d81b1f7f2a71d6ef696a20089022d.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: ALoCoQmlAvXEry0Qk3JRiHVuEaHIz2k/Ieqgu4rvw7WthAW4BKyHcAcCTKXtAEBaceawJfnRDo/W X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.210.47 Cc: peter.crosthwaite@petalogix.com, monstr@monstr.eu, john.williams@petalogix.com Subject: [Qemu-devel] [PATCH v2 11/11] xilinx_axidma: 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,axi-dma. 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_axidma.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/xilinx.h b/hw/xilinx.h index 8f915b4..7df21eb 100644 --- a/hw/xilinx.h +++ b/hw/xilinx.h @@ -75,7 +75,7 @@ xilinx_axiethernetdma_create(void *dmach, { DeviceState *dev = NULL; - dev = qdev_create(NULL, "xilinx,axidma"); + dev = qdev_create(NULL, "xlnx.axi-dma"); qdev_prop_set_uint32(dev, "freqhz", freqhz); qdev_prop_set_ptr(dev, "dmach", dmach); qdev_init_nofail(dev); diff --git a/hw/xilinx_axidma.c b/hw/xilinx_axidma.c index 59373b5..f4bec37 100644 --- a/hw/xilinx_axidma.c +++ b/hw/xilinx_axidma.c @@ -473,7 +473,7 @@ static int xilinx_axidma_init(SysBusDevice *dev) xlx_dma_connect_dma(s->dmach, s, axidma_push); memory_region_init_io(&s->iomem, &axidma_ops, s, - "axidma", R_MAX * 4 * 2); + "xlnx.axi-dma", R_MAX * 4 * 2); sysbus_init_mmio(dev, &s->iomem); for (i = 0; i < 2; i++) { @@ -502,7 +502,7 @@ static void axidma_class_init(ObjectClass *klass, void *data) } static TypeInfo axidma_info = { - .name = "xilinx,axidma", + .name = "xlnx.axi-dma", .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(struct XilinxAXIDMA), .class_init = axidma_class_init,