From patchwork Fri Apr 9 06:23:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1464184 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=sFsdBlHq; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FGp9f738Zz9sSC for ; Fri, 9 Apr 2021 16:28:38 +1000 (AEST) Received: from localhost ([::1]:35326 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUkdA-00081a-W5 for incoming@patchwork.ozlabs.org; Fri, 09 Apr 2021 02:28:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47952) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUkZ5-0004V7-ED; Fri, 09 Apr 2021 02:24:23 -0400 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]:46907) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lUkZ3-0001SS-3j; Fri, 09 Apr 2021 02:24:23 -0400 Received: by mail-ej1-x62c.google.com with SMTP id u21so6814776ejo.13; Thu, 08 Apr 2021 23:24:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KM2bACU647mjpsDpzpNgymCuMSg/hlg69APP0D5FAlI=; b=sFsdBlHqI21NWowVevVCbm58EHUNmABa9M6WocYFi0KlG8UcktrHQ6dA24yFL9Kfut AGiwUyj51uwNwKBMADtr2QtgftcEzFSQEeP4rLDEmGs5KhG6aq1JOB1TKc9217SujshR /DrYAK6bYKUk7fp3PUwZ/ipDa7Kf7qjOIzzZAe3v9Ov4tou288F6U08Hnw1ifN7cxjzm H04m9Ed+rzkoxNM/uo0szEazltGW1TG1mU9IXbJv4dveMd0kzwPHy5bVqLCbQLDyiRgk 5NoRdDFn/rXkTqnVtPDrXSp7o1EjpMWsFIOspacJrtKqFk9CLjLxvhizxOYJJqvDjmkF 7jkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=KM2bACU647mjpsDpzpNgymCuMSg/hlg69APP0D5FAlI=; b=kR2qbPq+Ziw8+v6SI4J3W10L4ex9hAPF/iwaPP0fLNLnfCr66Ihmq7LuYWnTxD7ZgZ CZe/OC4HSX5wR5QV5kxk9RUHXtbGht1tDcv/4IYtzGlCirLf0uh9XNqkUGOyuPAJXyT6 GwRtcsz9k8kebZQMt90kcx0bZEGqzEcQORb3Nho1xUWWQFfSKMjml5HjD1b21PjvL69H 5OnkL1KEsfCI6HYtBIjUXIPRdwykgaVvnn4BIm7R5rmYHCfZvbiMSNmJKw82Y64RaeYS iZp4Hs4T9CJq8qpRo2Zw1nSV/MGYzPZ7C9RlFhB7Bf4g+lYCqYQbCvIKrmIVHdl5wnZw xi5A== X-Gm-Message-State: AOAM532IXY9p1lZBrUToq0mb//MRAV6ZB++w2l5chvN6FFVMBFvdyBwr VW3ebQDC6N56OX4ybYmPYP9vceg0079mQw== X-Google-Smtp-Source: ABdhPJwiRa54IKzddTIhrI/nF3QxHryStq4E2A8ggC91kqfZ0uZGo4RAzlzbujk3D5oF0Py4M6iagA== X-Received: by 2002:a17:906:eb88:: with SMTP id mh8mr14958512ejb.74.1617949459153; Thu, 08 Apr 2021 23:24:19 -0700 (PDT) Received: from x1w.redhat.com (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id a9sm846600eda.13.2021.04.08.23.24.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Apr 2021 23:24:18 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [RFC PATCH-for-6.1 3/9] hw/arm: Use new machine_create_constant_clock() helper Date: Fri, 9 Apr 2021 08:23:55 +0200 Message-Id: <20210409062401.2350436-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210409062401.2350436-1-f4bug@amsat.org> References: <20210409062401.2350436-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62c; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-x62c.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Damien Hedde , Peter Maydell , Luc Michel , Eduardo Habkost , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , qemu-arm@nongnu.org, Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Use the newly added machine_create_constant_clock() helper to create the SYSCLKs. Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/mps2-tz.c | 6 ++---- hw/arm/mps2.c | 3 +-- hw/arm/musca.c | 6 ++---- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c index 3fbe3d29f95..86481fbe40d 100644 --- a/hw/arm/mps2-tz.c +++ b/hw/arm/mps2-tz.c @@ -740,10 +740,8 @@ static void mps2tz_common_init(MachineState *machine) } /* These clocks don't need migration because they are fixed-frequency */ - mms->sysclk = clock_new(OBJECT(machine), "SYSCLK"); - clock_set_hz(mms->sysclk, mmc->sysclk_frq); - mms->s32kclk = clock_new(OBJECT(machine), "S32KCLK"); - clock_set_hz(mms->s32kclk, S32KCLK_FRQ); + mms->sysclk = machine_create_constant_clock(machine, "SYSCLK", mmc->sysclk_frq); + mms->s32kclk = machine_create_constant_clock(machine, "S32KCLK", S32KCLK_FRQ); object_initialize_child(OBJECT(machine), TYPE_IOTKIT, &mms->iotkit, mmc->armsse_type); diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c index 81413b7133e..5d9250da615 100644 --- a/hw/arm/mps2.c +++ b/hw/arm/mps2.c @@ -143,8 +143,7 @@ static void mps2_common_init(MachineState *machine) } /* This clock doesn't need migration because it is fixed-frequency */ - mms->sysclk = clock_new(OBJECT(machine), "SYSCLK"); - clock_set_hz(mms->sysclk, SYSCLK_FRQ); + mms->sysclk = machine_create_constant_clock(machine, "SYSCLK", SYSCLK_FRQ); /* The FPGA images have an odd combination of different RAMs, * because in hardware they are different implementations and diff --git a/hw/arm/musca.c b/hw/arm/musca.c index 7a83f7dda7d..e15149f3a27 100644 --- a/hw/arm/musca.c +++ b/hw/arm/musca.c @@ -372,10 +372,8 @@ static void musca_init(MachineState *machine) exit(1); } - mms->sysclk = clock_new(OBJECT(machine), "SYSCLK"); - clock_set_hz(mms->sysclk, SYSCLK_FRQ); - mms->s32kclk = clock_new(OBJECT(machine), "S32KCLK"); - clock_set_hz(mms->s32kclk, S32KCLK_FRQ); + mms->sysclk = machine_create_constant_clock(machine, "SYSCLK", SYSCLK_FRQ); + mms->s32kclk = machine_create_constant_clock(machine, "S32KCLK", S32KCLK_FRQ); object_initialize_child(OBJECT(machine), "sse-200", &mms->sse, TYPE_SSE200);