From patchwork Thu Jun 28 04:32:00 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: 167786 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 47A13B6FFD for ; Thu, 28 Jun 2012 14:32:17 +1000 (EST) Received: from localhost ([::1]:36716 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sk6Or-0002Te-Mv for incoming@patchwork.ozlabs.org; Thu, 28 Jun 2012 00:32:13 -0400 Received: from eggs.gnu.org ([208.118.235.92]:32980) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sk6Oj-0002TY-LK for qemu-devel@nongnu.org; Thu, 28 Jun 2012 00:32:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sk6Oh-000276-RA for qemu-devel@nongnu.org; Thu, 28 Jun 2012 00:32:05 -0400 Received: from mail-pz0-f45.google.com ([209.85.210.45]:50737) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sk6Oh-00026V-Hk for qemu-devel@nongnu.org; Thu, 28 Jun 2012 00:32:03 -0400 Received: by dadn2 with SMTP id n2so2505106dad.4 for ; Wed, 27 Jun 2012 21:32: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:x-gm-message-state; bh=DSYR+zPuFY/lU2QYRlcUI6gjsHzK0atOl+ypnp+Xwvo=; b=mkSyloRY8a0y5lweGYYvXhr6CPOp0QHl4xdQPw+y6ah7wro4w6bYUHBTe+OHudyfcK cFi79Z45Dxv6Qu6BvdH64qwvxFsaR916q1RPQOOkcJ1xSrsZS38AUNnLoY30qIe+iZKD eL1ob4zUYxEm64LHhEkGlJcCXLqa492gzZLFme4B30rTnAp5WCCciaQT9TCXrMHI5BJL 0iONNh0fviL740YolehwYKtxozNRZjG6MWy6L2jHf/3Ehuuv+7l2wp2owkCzL9zkKHC8 q0EhkBWjVNtPhBvwh/5NYMmrn6Kg/cxq1PIi24pfZRZYNYtTjCPPZJBVv+ZM1wP9feEr W+qQ== Received: by 10.68.224.225 with SMTP id rf1mr2947824pbc.55.1340857920265; Wed, 27 Jun 2012 21:32:00 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id qd10sm853537pbb.38.2012.06.27.21.31.56 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 27 Jun 2012 21:31:59 -0700 (PDT) From: "Peter A. G. Crosthwaite" To: qemu-devel@nongnu.org, edgar.iglesias@gmail.com Date: Thu, 28 Jun 2012 14:32:00 +1000 Message-Id: <1340857920-23763-1-git-send-email-peter.crosthwaite@petalogix.com> X-Mailer: git-send-email 1.7.3.2 X-Gm-Message-State: ALoCoQkLtsq2ciZZPYp05n1AGIbRZmOGJNP/E9QdbFhTp1DZe9PNr35OK80dYYBpKVsH5zdMZorn X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.210.45 Cc: peter.crosthwaite@petalogix.com, john.williams@petalogix.com Subject: [Qemu-devel] [PATCH v1] xilinx_timer: Removed comma in 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 Fixes an error in a61e4b07a30c062260d2d01771773f14820d1eb7 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 7df21eb..c4d9d19 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, "xlnx,xps-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 b562bd0..053ba02 100644 --- a/hw/xilinx_timer.c +++ b/hw/xilinx_timer.c @@ -217,7 +217,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, "xlnx,xps-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; @@ -239,7 +239,7 @@ static void xilinx_timer_class_init(ObjectClass *klass, void *data) } static TypeInfo xilinx_timer_info = { - .name = "xlnx,xps-timer", + .name = "xlnx.xps-timer", .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(struct timerblock), .class_init = xilinx_timer_class_init,