From patchwork Fri Jan 29 11:00:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 373329 Delivered-To: patch@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp2109357jam; Fri, 29 Jan 2021 03:33:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJxtIXDotK3hU43xYnRs9B2KOrH/6iTgXi+lzhYZSBwffbqZ6Z+X5MUu0zedO3OqtzqVwg4U X-Received: by 2002:a25:2452:: with SMTP id k79mr5268405ybk.315.1611920026742; Fri, 29 Jan 2021 03:33:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611920026; cv=none; d=google.com; s=arc-20160816; b=ttfdCaPol7DCl/6lJ79HAgDF+NE3B1H98UJVkB9ZnCxgx3t5H1CyrFEygJ3x7qluY9 S6ytfsfo3Gx93uOXClBEbadYWaWwtJt8IJT6ryww00GC8xa8zaWNwsrt95nIB9sVLgnU J4HX8NeRHWzcgkriYuQxBHATpgP/myYArBPI2uMj3R3+K7xJsyvu08M3s2sFWN4VvewB j4wRP++8TuIDEFSI830XKqvZt/aJrrhL2TYZbB7eaAueEFGHmW/jc/Ft7/8rbMBHsxot jUMA6GlgY6sFgE2avYRuG1GfyBrML98Tsx95RTjJldcoUob+PNRe0QvQeJFwaFG0YvGo /Otg== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=ZoznrQk5rWNMNVC35EjX7ZEcNiC7xyz+q93KkX/Abcg=; b=x0q11xpkCY858XaSh19cTR/ja+DclEqh3utUzqoX14cjdvXO4O4m/+QB6mol+DU51P UbpUSGkK61Q1sfb7nLjrpYgZo7nPfqx+pLwn0BKODCVzqrGvUBbiZOjX6Vh24/02V2T0 mFGGzPJ6uoSVWA+yUOjiu1cv7wEBThyEiuUhYFCKysFqvZtvnCLdknPanG/SnBW0CdFa JJB/s/SVmjlvyZSJnzleCj98TLwjkT59Vy8Szr7VIav59+w3ds1QVewtrp3v+qwhsl8k Jkw3f/+AyipBaFYOyNIuOKLKYpXc2ZvjWaUy87JXk0y5hipYVTLTBdMvB342kG4ViJYy NYFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Sggzt45A; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y13si8398047ybb.100.2021.01.29.03.33.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jan 2021 03:33:46 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Sggzt45A; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:54918 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l5S26-00079g-4Z for patch@linaro.org; Fri, 29 Jan 2021 06:33:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60154) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l5RWR-0005Bm-Pe for qemu-devel@nongnu.org; Fri, 29 Jan 2021 06:01:03 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:34989) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l5RWL-0007Ba-Jf for qemu-devel@nongnu.org; Fri, 29 Jan 2021 06:01:03 -0500 Received: by mail-wr1-x432.google.com with SMTP id l12so8406851wry.2 for ; Fri, 29 Jan 2021 03:00:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ZoznrQk5rWNMNVC35EjX7ZEcNiC7xyz+q93KkX/Abcg=; b=Sggzt45AuDaAW9REnwrfat1tSzN7jlNwL2U89Qn3h085ghiRtCOqjNFNOZn0+XbJDF cZJSJQ/msJ+Ky+AQ0kY8QjNXn6AlSWvQ/kHyBMJy3R/H2mG/CfryJYgZ2qNucd44EHFx ZlWkmOOKaG0VD0FImYC2VheLlEnkW47POpK0x9SL3QNA7CwpFqeAWsC1BXN3iJ925Jwq XLV7boKKfqOaZMjpID2px18TXO+YAMPebpUXLldma3VwyFCLKYhR2Tadxv8jKdjWVXeJ ZJrMSO7AMKU/6EZPOoTpwxWbvrlAjUdApDTiEqIeUctV6kFVRSvcD86pT4GDp7Qo9RPg K0TA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZoznrQk5rWNMNVC35EjX7ZEcNiC7xyz+q93KkX/Abcg=; b=IhvA/Pe2MuBMtNXEShSq27MvstgwrGKYEwI86WRV8cYDPwlM3QU8zSSfPf7qqm1eZN 7I4ymgUO2ruKDOX9OO1DCea2pGb8HHnP5IXJsmX23NvxNIjaFig73ZSBs0W7C1xMCd6J jxAG9VBdVLPW9qGW7Wzu5ENDnX0tNapC4yNc6m26HKHSEePU84hl3O9/VRbsdqkPkDDv y38lWEoljN2at/iQSCDW/lCh9tqNhkyPdMPy+XajyvYBuQ/F9yDBJtRrIZtuDnmc6M1r uW/EA+okN7lWl/1To8Nx4faajjHeqGbnMPtzJpsFHWzguoh4qKHX6MOo9bajjTea7nOH 151g== X-Gm-Message-State: AOAM532Bfrhf/78v3VREoYXXWroOxRm7d1sF4bWUokbFbvxQeUFg3Tge iXLl8cZqvU18gNX2nZ9yoJMAAF0BGV8a5A== X-Received: by 2002:a5d:524a:: with SMTP id k10mr3909390wrc.394.1611918056287; Fri, 29 Jan 2021 03:00:56 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id w20sm9268761wmm.12.2021.01.29.03.00.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jan 2021 03:00:55 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 46/46] hw/arm/stellaris: Remove board-creation reset of STELLARIS_SYS Date: Fri, 29 Jan 2021 11:00:12 +0000 Message-Id: <20210129110012.8660-47-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210129110012.8660-1-peter.maydell@linaro.org> References: <20210129110012.8660-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Now that the watchdog device uses its Clock input rather than being passed the value of system_clock_scale at creation time, we can remove the hack where we reset the STELLARIS_SYS at board creation time to force it to set system_clock_scale. Instead it will be reset at the usual point in startup and will inform the watchdog of the clock frequency at that point. Signed-off-by: Peter Maydell Reviewed-by: Luc Michel Tested-by: Philippe Mathieu-Daudé Reviewed-by: Philippe Mathieu-Daudé Message-id: 20210128114145.20536-26-peter.maydell@linaro.org Message-id: 20210121190622.22000-26-peter.maydell@linaro.org Reviewed-by: Philippe Mathieu-Daudé --- hw/arm/stellaris.c | 10 ---------- 1 file changed, 10 deletions(-) -- 2.20.1 diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index 5acb043a07e..ad72c0959f1 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -780,16 +780,6 @@ static DeviceState *stellaris_sys_init(uint32_t base, qemu_irq irq, sysbus_mmio_map(sbd, 0, base); sysbus_connect_irq(sbd, 0, irq); - /* - * Normally we should not be resetting devices like this during - * board creation. For the moment we need to do so, because - * system_clock_scale will only get set when the STELLARIS_SYS - * device is reset, and we need its initial value to pass to - * the watchdog device. This hack can be removed once the - * watchdog has been converted to use a Clock input instead. - */ - device_cold_reset(dev); - return dev; }