From patchwork Wed Apr 9 03:15:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 337770 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A8C16140147 for ; Wed, 9 Apr 2014 17:12:13 +1000 (EST) Received: from localhost ([::1]:43991 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WXizK-0004fc-LB for incoming@patchwork.ozlabs.org; Tue, 08 Apr 2014 23:15:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58047) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WXiyt-0004f8-AX for qemu-devel@nongnu.org; Tue, 08 Apr 2014 23:15:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WXiym-0001Bb-Tz for qemu-devel@nongnu.org; Tue, 08 Apr 2014 23:15:19 -0400 Received: from mail-wi0-x22e.google.com ([2a00:1450:400c:c05::22e]:44410) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WXiym-0001B4-My for qemu-devel@nongnu.org; Tue, 08 Apr 2014 23:15:12 -0400 Received: by mail-wi0-f174.google.com with SMTP id d1so8151892wiv.1 for ; Tue, 08 Apr 2014 20:15:11 -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=ew0r0tSS1m9jg5dUBkESM1u7h4ZHWxK+NqhH1JQpFdI=; b=sI1gW3idBnIVxc5P+od+Yye2IuJHaoDTpDkfL28IoPQ5lFohCq/zLKgSVshFdMrHpL BD93FrrIhUx7AbA61hmiYPwKYMYsW1OL0a/yiSW3WG7mX0U7SpeldmYeyTv533Epd1u1 r/wSBO8+8/wfQ/q/+3YxdQmvblZYJIuWEFd+xIRpqtqc6Tm2rhYhhqIrWJia4Y8HSeiw qSK23JhrfLZ4j0hWCEgXplrPv4IhNL3SnLMsHRg9yt+hfbmgPIM6V5nG6u/MhWGCJdjV 7RiI2ErNWac8TEdQjIyP0NohZ3J4SDsyFzd4hAxlFTwHi4s8ngbK1J9VTA1YyHnWzPIp gP5g== X-Received: by 10.194.1.242 with SMTP id 18mr7128444wjp.22.1397013311636; Tue, 08 Apr 2014 20:15:11 -0700 (PDT) Received: from localhost ([203.126.243.116]) by mx.google.com with ESMTPSA id bj5sm1318051wib.3.2014.04.08.20.15.08 for (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Tue, 08 Apr 2014 20:15:10 -0700 (PDT) From: Alistair Francis To: qemu-devel@nongnu.org Date: Wed, 9 Apr 2014 13:15:04 +1000 Message-Id: <318d19a708eed64caa64fbefc52eb1fe52ed85fe.1397013071.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: 2a00:1450:400c:c05::22e Cc: peter.crosthwaite@xilinx.com Subject: [Qemu-devel] [PATCH v1 1/1] xilinx: Change commas to full stops 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 is an extension of my 'zynq_slcr: Change the comma to a underscore' patch. This changes the commas in Zynq peripherals to full stops. This matches other Xilinx peripherals and also makes command line argument parsing possible. Signed-off-by: Alistair Francis --- Thanks to Peter Crosthwaite for pointing out the 'xlnx.*' format hw/arm/xilinx_zynq.c | 6 +++--- hw/misc/zynq_slcr.c | 2 +- hw/usb/hcd-ehci-sysbus.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 9ee21e7..eff31d2 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, "xlnx.zynq-slcr"); qdev_init_nofail(dev); sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xF8000000); @@ -187,8 +187,8 @@ static void zynq_init(QEMUMachineInitArgs *args) zynq_init_spi_flashes(0xE0007000, pic[81-IRQ_OFFSET], false); zynq_init_spi_flashes(0xE000D000, pic[51-IRQ_OFFSET], true); - sysbus_create_simple("xlnx,ps7-usb", 0xE0002000, pic[53-IRQ_OFFSET]); - sysbus_create_simple("xlnx,ps7-usb", 0xE0003000, pic[76-IRQ_OFFSET]); + sysbus_create_simple("xlnx.ps7-usb", 0xE0002000, pic[53-IRQ_OFFSET]); + sysbus_create_simple("xlnx.ps7-usb", 0xE0003000, pic[76-IRQ_OFFSET]); sysbus_create_simple("cadence_uart", 0xE0000000, pic[59-IRQ_OFFSET]); sysbus_create_simple("cadence_uart", 0xE0001000, pic[82-IRQ_OFFSET]); diff --git a/hw/misc/zynq_slcr.c b/hw/misc/zynq_slcr.c index d1cc233..211f04a 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 "xlnx.zynq-slcr" #define ZYNQ_SLCR(obj) OBJECT_CHECK(ZynqSLCRState, (obj), TYPE_ZYNQ_SLCR) typedef struct ZynqSLCRState { diff --git a/hw/usb/hcd-ehci-sysbus.c b/hw/usb/hcd-ehci-sysbus.c index fe6eea5..dfad39d 100644 --- a/hw/usb/hcd-ehci-sysbus.c +++ b/hw/usb/hcd-ehci-sysbus.c @@ -94,7 +94,7 @@ static void ehci_xlnx_class_init(ObjectClass *oc, void *data) } static const TypeInfo ehci_xlnx_type_info = { - .name = "xlnx,ps7-usb", + .name = "xlnx.ps7-usb", .parent = TYPE_SYS_BUS_EHCI, .class_init = ehci_xlnx_class_init, };