From patchwork Mon Jul 17 12:44:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 107917 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp4468316qge; Mon, 17 Jul 2017 05:47:08 -0700 (PDT) X-Received: by 10.233.223.68 with SMTP id t65mr9215194qkf.122.1500295628933; Mon, 17 Jul 2017 05:47:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500295628; cv=none; d=google.com; s=arc-20160816; b=p+BQLHYZhRPVsD2Sl3d7WK3R5bGvrKxdI/V5u88wGJSZTaed1/Q2K1KivN1YFScpLq ZIPYor6TY5UrhlO2zFpL8NpbbuSQwhQPsISBz6cipi9w2r7uSxhxOrRX9hueLIbOxBd0 fErvTAYsIqNqbA842c1dYRW/nFqEyyLYNkO81Q7ZiTp/94cCiuPtOpBGlPoiXHrBQ6oy t6gWiVyNZAXAU9Rhs8DPYFv7RK7/fY+u5njBIeOHCrF1mI9KMvuIkeif7cAM0AEnvUuy E1wT/fG3P/vQ7pxdiksVioPPmBFDwphFakkaBFHFIHVWmq8wYSAdX2/+svkbXpa3dSbq 8bIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=QeN/CEdqQ2YbVZODZr5gJWyv8Fu0c+uATU0Yu8ql638=; b=j9XatZF163RRypFdOkMCsda1lZbocTg3j6zopBua+8DCgvtEmIBgXcVlwVMEceAUIp jc3ruQTTIiTxHIglCteLdlcB4XBSyYrFcvYJVJgA8PpCtAaH2pLmgJ06+lOH8lfsmIPk NzXy+GNMtI1bEagwtujYbbABBjDNn7B7LLunY6o8OmfRl1MT3lbJ4qjfyskytSbGQ1y5 yEcIxTT835s1guw4HhTpzJSr9GJni/6qE+6diRypWGgiCmJ5aUe3O7evx6Sk8s57cxwx Oe7KqI3mDMmbHTEFN1NVC+vZgz1SH8ENnBuWZKf+c5EEGb2SjNZ0rrnY21DgXeFGHTFG VwqQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id p3si15076946qkd.63.2017.07.17.05.47.08 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 17 Jul 2017 05:47:08 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50170 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dX5QY-0000fk-CM for patch@linaro.org; Mon, 17 Jul 2017 08:47:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59057) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dX5Oc-0007qy-GY for qemu-devel@nongnu.org; Mon, 17 Jul 2017 08:45:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dX5Ob-0002Dt-OU for qemu-devel@nongnu.org; Mon, 17 Jul 2017 08:45:06 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:37639) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dX5Ob-00029H-Hs for qemu-devel@nongnu.org; Mon, 17 Jul 2017 08:45:05 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84_2) (envelope-from ) id 1dX5OY-0003WF-38 for qemu-devel@nongnu.org; Mon, 17 Jul 2017 13:45:02 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 17 Jul 2017 13:44:50 +0100 Message-Id: <1500295494-8991-15-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1500295494-8991-1-git-send-email-peter.maydell@linaro.org> References: <1500295494-8991-1-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 14/18] hw/arm/mps2: Add timers 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Add the CMSDK APB timers to the MPS2 board. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Message-id: 1500029487-14822-6-git-send-email-peter.maydell@linaro.org --- hw/arm/mps2.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.7.4 diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c index 9c8fa77..4121816 100644 --- a/hw/arm/mps2.c +++ b/hw/arm/mps2.c @@ -33,6 +33,7 @@ #include "sysemu/sysemu.h" #include "hw/misc/unimp.h" #include "hw/char/cmsdk-apb-uart.h" +#include "hw/timer/cmsdk-apb-timer.h" typedef enum MPS2FPGAType { FPGA_AN385, @@ -293,6 +294,9 @@ static void mps2_common_init(MachineState *machine) g_assert_not_reached(); } + cmsdk_apb_timer_create(0x40000000, qdev_get_gpio_in(armv7m, 8), SYSCLK_FRQ); + cmsdk_apb_timer_create(0x40001000, qdev_get_gpio_in(armv7m, 9), SYSCLK_FRQ); + system_clock_scale = NANOSECONDS_PER_SECOND / SYSCLK_FRQ; armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename,