From patchwork Mon Sep 17 08:40:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Hedde X-Patchwork-Id: 970447 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=greensocs.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=greensocs.com header.i=@greensocs.com header.b="Uud/IXgI"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=greensocs.com header.i=@greensocs.com header.b="mUg+1kvY"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=greensocs.com header.i=@greensocs.com header.b="mUg+1kvY"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42DKQQ2d9pz9sCS for ; Mon, 17 Sep 2018 18:43:10 +1000 (AEST) Received: from localhost ([::1]:34429 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g1p7b-00073j-Ix for incoming@patchwork.ozlabs.org; Mon, 17 Sep 2018 04:43:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46494) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g1p5x-0006Ae-Qr for qemu-devel@nongnu.org; Mon, 17 Sep 2018 04:41:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g1p5w-0005cq-HR for qemu-devel@nongnu.org; Mon, 17 Sep 2018 04:41:25 -0400 Received: from greensocs.com ([193.104.36.180]:51751) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g1p5q-0005VU-5n; Mon, 17 Sep 2018 04:41:18 -0400 Received: from localhost (localhost [127.0.0.1]) by greensocs.com (Postfix) with ESMTP id 8D66C443483; Mon, 17 Sep 2018 10:41:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1537173673; bh=7kikJd0QMdJjrMyU5WU3TTF88G9I8FGb90lyoljdLqM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Uud/IXgIkljL9IVkxdfeciMiISfPRT+jInFgewiwmpZrFamkyKSXwDHgHGd1Nl234 B7e/vgTz+8Rfk9ZS8sB/RUUfLH9vQQMUt+w/z3RDv5lZSpGdBFUrEmRtMGycHMx8Ca QL5mJ0CptgvZhMrfjnE5q47wUQN9obxpP1SxMoPU= X-Virus-Scanned: amavisd-new at greensocs.com Authentication-Results: gs-01.greensocs.com (amavisd-new); dkim=pass (1024-bit key) header.d=greensocs.com header.b=mUg+1kvY; dkim=pass (1024-bit key) header.d=greensocs.com header.b=mUg+1kvY Received: from greensocs.com ([127.0.0.1]) by localhost (gs-01.greensocs.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OgNuRVhh_OMi; Mon, 17 Sep 2018 10:41:12 +0200 (CEST) Received: by greensocs.com (Postfix, from userid 998) id AA75E400FD7; Mon, 17 Sep 2018 10:41:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1537173672; bh=7kikJd0QMdJjrMyU5WU3TTF88G9I8FGb90lyoljdLqM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=mUg+1kvYYtcBnyAjGV4lUmuEN5ULK53WUB//fPLhkAqPG7wapZWbB4zhg30hC2QYN GbYUx+ntyYiPHvw0WmSzM0SLCuhhOKFbjp9dc2M+7uMQPBIH3D4v8a36vmyFRrC1cE GkIAOpxdc6XANCvaCO9s4/AZ/Okx9MpN08RlAu/I= Received: from kouign-amann.hive.antfield.fr (antfield.tima.u-ga.fr [147.171.129.253]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: damien.hedde@greensocs.com) by greensocs.com (Postfix) with ESMTPSA id 2A8EB2386FB; Mon, 17 Sep 2018 10:41:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1537173672; bh=7kikJd0QMdJjrMyU5WU3TTF88G9I8FGb90lyoljdLqM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=mUg+1kvYYtcBnyAjGV4lUmuEN5ULK53WUB//fPLhkAqPG7wapZWbB4zhg30hC2QYN GbYUx+ntyYiPHvw0WmSzM0SLCuhhOKFbjp9dc2M+7uMQPBIH3D4v8a36vmyFRrC1cE GkIAOpxdc6XANCvaCO9s4/AZ/Okx9MpN08RlAu/I= From: damien.hedde@greensocs.com To: qemu-devel@nongnu.org Date: Mon, 17 Sep 2018 10:40:16 +0200 Message-Id: <20180917084016.12750-11-damien.hedde@greensocs.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180917084016.12750-1-damien.hedde@greensocs.com> References: <20180917084016.12750-1-damien.hedde@greensocs.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 193.104.36.180 Subject: [Qemu-devel] [PATCH v4 10/10] hw/arm/xilinx_zynq: connect uart clocks to slcr X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: edgar.iglesias@xilinx.com, peter.maydell@linaro.org, alistair@alistair23.me, mark.burton@greensocs.com, saipava@xilinx.com, qemu-arm@nongnu.org, Damien Hedde , pbonzini@redhat.com, luc.michel@greensocs.com, fred.konrad@greensocs.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Damien Hedde Add the connection between the slcr's output clocks and the uarts inputs. Signed-off-by: Damien Hedde --- hw/arm/xilinx_zynq.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index f1496d2927..efad21a5a9 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -166,7 +166,7 @@ static void zynq_init(MachineState *machine) MemoryRegion *address_space_mem = get_system_memory(); MemoryRegion *ext_ram = g_new(MemoryRegion, 1); MemoryRegion *ocm_ram = g_new(MemoryRegion, 1); - DeviceState *dev; + DeviceState *dev, *slcr; SysBusDevice *busdev; qemu_irq pic[64]; int n; @@ -212,9 +212,10 @@ static void zynq_init(MachineState *machine) 1, 0x0066, 0x0022, 0x0000, 0x0000, 0x0555, 0x2aa, 0); - dev = qdev_create(NULL, "xilinx,zynq_slcr"); - qdev_init_nofail(dev); - sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xF8000000); + /* Create slcr, keep a pointer to connect clocks */ + slcr = qdev_create(NULL, "xilinx,zynq_slcr"); + qdev_init_nofail(slcr); + sysbus_mmio_map(SYS_BUS_DEVICE(slcr), 0, 0xF8000000); dev = qdev_create(NULL, TYPE_A9MPCORE_PRIV); qdev_prop_set_uint32(dev, "num-cpu", 1); @@ -235,8 +236,12 @@ static void zynq_init(MachineState *machine) sysbus_create_simple("xlnx,ps7-usb", 0xE0002000, pic[53-IRQ_OFFSET]); sysbus_create_simple("xlnx,ps7-usb", 0xE0003000, pic[76-IRQ_OFFSET]); - cadence_uart_create(0xE0000000, pic[59 - IRQ_OFFSET], serial_hd(0)); - cadence_uart_create(0xE0001000, pic[82 - IRQ_OFFSET], serial_hd(1)); + dev = cadence_uart_create(0xE0000000, pic[59 - IRQ_OFFSET], serial_hd(0)); + qdev_clock_connect(dev, "busclk", slcr, "uart0_amba_clk", &error_abort); + qdev_clock_connect(dev, "refclk", slcr, "uart0_ref_clk", &error_abort); + dev = cadence_uart_create(0xE0001000, pic[82 - IRQ_OFFSET], serial_hd(1)); + qdev_clock_connect(dev, "busclk", slcr, "uart1_amba_clk", &error_abort); + qdev_clock_connect(dev, "refclk", slcr, "uart1_ref_clk", &error_abort); sysbus_create_varargs("cadence_ttc", 0xF8001000, pic[42-IRQ_OFFSET], pic[43-IRQ_OFFSET], pic[44-IRQ_OFFSET], NULL);