From patchwork Wed Jun 13 04:46:44 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: 164540 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 3B445B6FA3 for ; Wed, 13 Jun 2012 15:41:54 +1000 (EST) Received: from localhost ([::1]:46059 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SefLc-0007M3-Md for incoming@patchwork.ozlabs.org; Wed, 13 Jun 2012 00:38:24 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35454) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SefLG-0006Nh-W1 for qemu-devel@nongnu.org; Wed, 13 Jun 2012 00:38:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SefLF-0007yU-68 for qemu-devel@nongnu.org; Wed, 13 Jun 2012 00:38:02 -0400 Received: from mail-pz0-f47.google.com ([209.85.210.47]:56143) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SefLE-0007wI-Vu for qemu-devel@nongnu.org; Wed, 13 Jun 2012 00:38:01 -0400 Received: by mail-pz0-f47.google.com with SMTP id h21so407584dal.34 for ; Tue, 12 Jun 2012 21:38:00 -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=O7WkZrnEZ/wUAPpu72DbHQz2K9vnRAzJytii8U0MaBE=; b=Z1ed0zIQ/hETaKkJVY7Uf8fHO8sRL0Ab53W0Cm5M4kQJMVSudFTM81dzbdnfN716n3 Xl6GykaUXTu8TQ01D1cuWei+cfT8ftHDv1QTbz8mKiMYV8uBDGAD5AQgYVDlKOZD6EdN QPA7k1caL8KT0HqmpnbGmYw2S0P8eM8EMa6ePGINYnu0xKyML0OShCGvrdb0cTFruJQk S8+rbuB3tqC5aK1lsPplVuAw5I9iYjPXKoSyaSIuHFrnxJcRkznSJnHodN3a3hXubN5H wBIFHjIWDcP6O0/pCMlaFQuN6+CmuulK6P4y7jMlVvtYHyIkm0aJ1UrdO2w8naUVq3kC CAbg== Received: by 10.68.200.104 with SMTP id jr8mr47356122pbc.9.1339562279937; Tue, 12 Jun 2012 21:37:59 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id ka5sm4369492pbb.37.2012.06.12.21.37.56 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 12 Jun 2012 21:37:58 -0700 (PDT) From: "Peter A. G. Crosthwaite" To: edgar.iglesias@gmail.com, qemu-devel@nongnu.org Date: Wed, 13 Jun 2012 14:46:44 +1000 Message-Id: <35efbd9399d8842fc38445e521b051531a32288e.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: ALoCoQlhka8Eo5Jkvv5SLouMWp1j5+H+mco8AwvAvkyF9HeOksQdn06JE6fxip5GSWDpYXtI2vVR 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 04/11] xilinx_timer: 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-timer. 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_timer.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/xilinx.h b/hw/xilinx.h index 7b8ad51..9ff4c2b 100644 --- a/hw/xilinx.h +++ b/hw/xilinx.h @@ -20,7 +20,7 @@ xilinx_timer_create(target_phys_addr_t base, qemu_irq irq, int oto, int freq) { DeviceState *dev; - dev = qdev_create(NULL, "xilinx,timer"); + dev = qdev_create(NULL, "xlnx,xps-timer"); qdev_prop_set_uint32(dev, "one-timer-only", oto); qdev_prop_set_uint32(dev, "frequency", freq); qdev_init_nofail(dev); diff --git a/hw/xilinx_timer.c b/hw/xilinx_timer.c index 72f7c0d..0683ce1 100644 --- a/hw/xilinx_timer.c +++ b/hw/xilinx_timer.c @@ -218,7 +218,7 @@ static int xilinx_timer_init(SysBusDevice *dev) ptimer_set_freq(xt->ptimer, t->freq_hz); } - memory_region_init_io(&t->mmio, &timer_ops, t, "xilinx-timer", + memory_region_init_io(&t->mmio, &timer_ops, t, "xlnx,xps-timer", R_MAX * 4 * num_timers(t)); sysbus_init_mmio(dev, &t->mmio); return 0; @@ -240,7 +240,7 @@ static void xilinx_timer_class_init(ObjectClass *klass, void *data) } static TypeInfo xilinx_timer_info = { - .name = "xilinx,timer", + .name = "xlnx,xps-timer", .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(struct timerblock), .class_init = xilinx_timer_class_init,