From patchwork Wed Mar 26 03:05:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 333771 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B3D101400A1 for ; Wed, 26 Mar 2014 14:06:30 +1100 (EST) Received: from localhost ([::1]:45323 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSeAe-0007Ef-2a for incoming@patchwork.ozlabs.org; Tue, 25 Mar 2014 23:06:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34293) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSeAJ-0007EV-J0 for qemu-devel@nongnu.org; Tue, 25 Mar 2014 23:06:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WSeAD-0000hG-PA for qemu-devel@nongnu.org; Tue, 25 Mar 2014 23:06:07 -0400 Received: from mail-qg0-x22e.google.com ([2607:f8b0:400d:c04::22e]:59044) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WSeAD-0000hA-KM for qemu-devel@nongnu.org; Tue, 25 Mar 2014 23:06:01 -0400 Received: by mail-qg0-f46.google.com with SMTP id e89so131497qgf.33 for ; Tue, 25 Mar 2014 20:06:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=BuVIzmafyqPX8lU/sqWEwSs8uVbFj+IgigfYHopWexI=; b=NoNYUQKRor2S7MlSKMC/ACzedf97ZEGJksNeNG1889wGIbWXfMZ9LFaEI0pFE9ovx+ ouD1BAIpD1c7Jr4jL1RTR+wc827K0E6syk3fpjEsKotxo5d0X19hpVwdHg4qSSwUh3BA g3GZsFrsZbGBqgq7SbkGtnM4IfwqE/Y/AA/YnOcXjq1+RrpQq6Q0Btr/oJNfX7KA+6TM iNu24rz0AT+p40VHVoUjHmijzdB3WBFQY0I+T50zU+0a1r7ymlUUckqrulpbq6EYT7Id yfNGtwz4XGU2WTKMlcLBwL4Qb2In6g4UI37/qbdOU2ueAnUC7r5gbh40nxJ4nfkQGrTK QF4A== X-Received: by 10.224.14.77 with SMTP id f13mr87049542qaa.31.1395803161217; Tue, 25 Mar 2014 20:06:01 -0700 (PDT) Received: from localhost ([203.126.243.116]) by mx.google.com with ESMTPSA id o4sm36229230qat.32.2014.03.25.20.05.59 for (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Tue, 25 Mar 2014 20:06:00 -0700 (PDT) From: Alistair Francis To: qemu-devel@nongnu.org Date: Wed, 26 Mar 2014 13:05:55 +1000 Message-Id: <462e8a61547e6833c71ec45adcb45e88561eed66.1395800307.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 1.9.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c04::22e Cc: edgar.iglesias@xilinx.com, peter.crosthwaite@xilinx.com Subject: [Qemu-devel] [PATCH v1 1/1] zynq_slcr: Change the comma to a underscore 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 This patch changes the comma in the "xilinx,zynq_slcr" to an underscore. This matches every other xilinx* peripheral and also makes parsing the device via the command line possible. Signed-off-by: Alistair Francis --- hw/arm/xilinx_zynq.c | 2 +- hw/misc/zynq_slcr.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 9ee21e7..f717645 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -167,7 +167,7 @@ static void zynq_init(QEMUMachineInitArgs *args) 1, 0x0066, 0x0022, 0x0000, 0x0000, 0x0555, 0x2aa, 0); - dev = qdev_create(NULL, "xilinx,zynq_slcr"); + dev = qdev_create(NULL, "xilinx_zynq_slcr"); qdev_init_nofail(dev); sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xF8000000); diff --git a/hw/misc/zynq_slcr.c b/hw/misc/zynq_slcr.c index d1cc233..8aba715 100644 --- a/hw/misc/zynq_slcr.c +++ b/hw/misc/zynq_slcr.c @@ -116,7 +116,7 @@ typedef enum { RESET_MAX } ResetValues; -#define TYPE_ZYNQ_SLCR "xilinx,zynq_slcr" +#define TYPE_ZYNQ_SLCR "xilinx_zynq_slcr" #define ZYNQ_SLCR(obj) OBJECT_CHECK(ZynqSLCRState, (obj), TYPE_ZYNQ_SLCR) typedef struct ZynqSLCRState {