From patchwork Tue May 28 11:13:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 1940415 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.a=rsa-sha256 header.s=selector1 header.b=ItKQZlhf; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VpVKc1LhHz20Q9 for ; Tue, 28 May 2024 21:15:00 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CF323884E7; Tue, 28 May 2024 13:13:50 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.b="ItKQZlhf"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3D6AA884B0; Tue, 28 May 2024 13:13:48 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,SPF_HELO_PASS, T_SCC_BODY_TEXT_LINE,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20600.outbound.protection.outlook.com [IPv6:2a01:111:f403:2613::600]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3587C884BA for ; Tue, 28 May 2024 13:13:43 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=rasmus.villemoes@prevas.dk ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hx+K6/vykJbEs4y63AJoQKPIRqaXI+3KTHV98Vlq7mxExb8BYGsDnXdBwvrRixTYvJN1wAAWAY5DWuCwtxK/H9QWrVE0z9JA9+8qN2pU3pB00w7UrwnXwkmBknCchdTv0USPNTEGIZgp/HxhZbx5r/jcGo7FEI9b5dvO/uXzWueKHFtOmRKqf5MVWu7x5FBSWiYqpJNwTiYlLdOyD/8Ust0x8AdnN9fTABBagkvqAPxpeYEdwT7mvMyE+XzZSwU/N8DSgrE/1QbOe/+Fix9lDA4gDnbSXjt+mXmJD5yUR9g1SxuTh3OSKsyfO6fwOrie67yif2vZ+hEv22fWRf/GvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=e19by//5T7PnJfOKqVhlnzgfNoM2hkXkhcbvYUe6XpU=; b=ksPPcmFIw2mzPfV9MBfEsjvj+buFuRzpjBS0DTQvVsK0DAxgoVG8Gacp65Gn7Q27Q9j+7wBv7fI803GX7Nucroz0WvbqqS1A3wYoPxD+fO/wRu62D0SP1ylCNFpIVg12R28CUqQs8eMi0aNfO0qiqG++21AHklpOFpRIRUqE/Hheba9yjUAg+aJjyigsgOIm9cddaQIKT1MSmFiT0Fr1RWthFkSnGTLzh9X7K4SOyWv0X6Z4e4VtTVKcXlW5t4ss3nlscedZD+QypcXA9anMZsssRFPbtBZ/axRy+VUhpc+sXi+5iW3SvI5L2QbUaKkUBZqyYSS8Y3OVBwyKv7JN2A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=prevas.dk; dmarc=pass action=none header.from=prevas.dk; dkim=pass header.d=prevas.dk; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=prevas.dk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=e19by//5T7PnJfOKqVhlnzgfNoM2hkXkhcbvYUe6XpU=; b=ItKQZlhf4Dgqn6TPhiolLPLERI3tTo1YegIZaBC4le0Zsfr3RZdq8jHy4slEn3vwecGw7MtraJDk/jS7sfbFSRQHwILXD+kbbNexNtQw337Amp4rSr23LBnOKUfExdFqfqaBDH77vgpfTAB/gtRveGgFACxW6xp+8ZUW1G4DZXA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=prevas.dk; Received: from DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:45a::14) by GV2PR10MB7079.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:df::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.36; Tue, 28 May 2024 11:13:36 +0000 Received: from DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM ([fe80::9fcc:5df3:197:6691]) by DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM ([fe80::9fcc:5df3:197:6691%3]) with mapi id 15.20.7611.016; Tue, 28 May 2024 11:13:36 +0000 From: Rasmus Villemoes To: u-boot@lists.denx.de Cc: Stefan Roese , Tom Rini , Rasmus Villemoes , Huan Wang , Angelo Dureghello Subject: [PATCH 1/7] m68k: remove dead code Date: Tue, 28 May 2024 13:13:19 +0200 Message-Id: <20240528111325.2163560-2-rasmus.villemoes@prevas.dk> X-Mailer: git-send-email 2.40.1.1.g1c60b9335d In-Reply-To: <20240528111325.2163560-1-rasmus.villemoes@prevas.dk> References: <20240528111325.2163560-1-rasmus.villemoes@prevas.dk> X-ClientProxiedBy: MM0P280CA0066.SWEP280.PROD.OUTLOOK.COM (2603:10a6:190:8::9) To DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:45a::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9PR10MB7100:EE_|GV2PR10MB7079:EE_ X-MS-Office365-Filtering-Correlation-Id: c100b29b-e32a-4842-c455-08dc7f07380a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|1800799015|366007|52116005|376005|38350700005; X-Microsoft-Antispam-Message-Info: tHpczReldnF2g7efwbVcGGS9czLCh2EhPRdPN3yu+zf0asbog8giWv8v88KeFncvmqvJV0a/iTa1cBAEk34LcDZIAtK3iM/Wc7unBPPz1X3Pg0ycF69OvZalAhrJfF4XZ9PHYBILYha0Fw8hC+pIMJPmoEaIZ1F4bTU5hmg4CLiNEkiW4mLDXJM+Oe+Z8CEtb2i9wTcuQJzYB6OQWAPRUbmqboUnuIzd1XaIgQrAVZ3jjeFyDvUa2EEALVmXaOchA80J99SKyYqLAd9dC3Mpjl2jeBWlTIEZPk30x7ymIj8r1lPPkNW+dpOSRBdLvvof3VtEhIQBq3KMMqyWsnbzsrTiKuAr12bhuDFRquyrkAOwQoXF8OslvfrX4lrAp4+44GJ6BJSU1jd8lVFQqa24jt4lQKYzSsRGTJxFSSAopaunY0BBYScCCWX82WEj4K7s4kFtRr/RPzusJeC+mlPQcLyV4Ztbn2KxUvyJSO1gYWU/Xe/O4yFXGSIetTZLo40AtDJLVWwK2L1y9hcxxEwjT12zccocXgfJAGcRaVVKNEezozDNplFLRxdyL5cLer/69Tdv2i9zljUD0UvUg4rv9bZL4QknaViJSz/hUdlyQ5fMXSkhpPE0HhemK0n0YxxdoNdAyllLEEhYp+XFSwlIwhZRLfvy6gjyzcbCX2lrs1vX91VC9C4gfvysedxLPwXVY+GZ/ET9aLp35pV310KDWeeBJh6U4NT6pTfhnm2V+BAZdg6E5WmAB5zfpRAO03988ZolM1ztGXM52VMdFdsuZpx72icCU3N33QS3Tag6idRbLQ7R4AGMyKtxljk9ZqXRTo2EkEJoXQkmy4h5jyx/UTsumETGSvtIUJGxNDnu4u+px8k/Ejka/vH2418CQ51lGivpdUhjMcvQ9wx8EE61thytl67qxGctqCtOz5/OlsNEzpOz3KfEk9tpSX7BGs/fGPfv3XFpED6LMIvlHmXIVe5cVXdHRhQWs9QdJ3a7qiH4Sl5528lXTIiwS3uGN1Zd12dvOgcfHjpaXCs1wW+PcJDvnL2ouMkx7gxCzMiL9EmA97d4Tdl1o0kqdHJHsg56r1UjZigdWppDnDH9usf5z9/WOyF0KWW5db8prYQ3KNC2C+66mH6PIql9xhmgnVQVh3ZTiHMP7tX5oWHX23gtM7BHILYXoAYMj9PI3Im0DGJYhOScdo2okvl2Woi27C2FOmrk1N9GZ2yd0KUQcOMWlBu40tpiXR3LyuHfftKwnm+aL17xJGjgVC7MWJVNtPBJoeFfQBNW/IAzJoyclU8hakKLlDYlbQTZaD4H5/8ZjOTHgfaHuwGEsqai7uQBDXZw6zQDCcLKOJBOEwscR6VaLQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230031)(1800799015)(366007)(52116005)(376005)(38350700005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 691H3WjY0QYd622MDO+/N/cRgcVtX5uXzMTsD1UcPJaE9xxrfptBWx3GX4S/9toYsmyAQQFW5dRylLmb3Z1/VQLqWmuRxKNKMhBt3FvQTKeKbDGx/TOF92R//HNOjYLkqIRqmqJcGUweoX+cHlSETxJPB2F3+lOjCxacDb2BGQbEnVyqNYQJYJG+Gr5xqRdcqGFzybWMr2ZFBKKY52Xdn81g6U0rHu8RzRJn4/N5BhP97rpvLdt1F4LCEweB3r2XZo04cRKZG3eWb7pqgQqpsW2Bm+KaJssjQqQNdWMBBxIbxc0D2UtWsye1RPtaUaSthOXgbKs3zH8QWZstFDPhT3wmxEIpaR9/UrrcEjAsxA//t4HYS1B4ix5SKQHGdG25UIH11pYCLe1OmDbIOAIP8ODxWYkegOiXNnJxKRS2Pfh2AmhaRUWXq2e9/5J99CEGUYeqQ7MH8kDNd0LEnYE+XUcc1dj+ol/AUf8yQ7ExfpZw94cnlkAoEFwauGAmJqhBkmZXWofaF2DtJBEW98Rw20+74UT8F3Gl/AjoRps6ImJrC2mWoHPDkc/3yHGvZWs+hyPD099N5RQM2cf6rYoN9NugFwnONrXU8QAYsWbYy23qyzobX9v6IKirR2KymQrD2nT2/d2yUrYHgX4h/Sn6YrtQqtsTBsUy4YNAfAwwvc0OHQ+zO2DeUU3zNT8lGwgBr5W7cMFeK/qO8Toec3vlvtBYA6PSTKRNEwRjugzZYB5XyZ6jRdd9v+Kn11d9t5b3mPlvXzJWv/QDwmeHZl7hwIuiwKkN5UyT5TnMOmG1cSVcrgN7xvBc02oo5OUrCOKiEQYu9PSKf1U01myGdXUWvIZNY9S4vM+18rY4hZgT3C5xtK7lHTXIBXtv6SBUcByVDqnKQNdecJcOa5nW0SFWqYTSimc3+lgbEMbAXRoQwVHsj200mlFay/04mKmHmZCwsA24scHXJ3G2OFUK2Zk69q+WuHMphHyOKo3RPBRU9BBieab6AA0/b017T2Qm25QiyoyUwyiQUG9z2uDjjsccMMeqnMtinm2Z7b0sP2dDcgRN3AVCTgy7q9q8S3kHim9gzGAgxpKWKmGQm4iWoAc3IOxGaxlf73pyb5TyIv36w0ax4QTwj4sezJkxGuIOELL2mqUH3mZgVEaIW8R3TssxS6HMynyEWb/vs6bsQj21oKr/iOz59FBTI1pUqOzqsu2ZHpCn4z/3sGJ3gUETJqKG26qL9QXbQQpkeVNJ7XCmX+4C4EF2VeldMN/1ZxnTFC1jvgA3G2yycgfB5RqWHihLKI4QSwYcFyEot6NyfOg+CP16Ffxw7Zi6mkKfAC7EzibR2FSWig4wE95fkA5YCaATAfIA2XUwWUl/YNVYN2WJYfWQ1pEWFwyieor27k/QsKZjBa4e6a5MjB9ox5GWCUYVMECU1vDwVft8yhztrStIb8usSLh/OHHX5XmhVmKqHUUFrto/6vAM04QScFnWG2ZcHa99ep7t6h1WDj7oxvsblCBf+wvKy5OHKLmcJi4VE1iFyhsG94eFO/KJZ3johk74pVgaOMla99vWWIAQz64CnSiK4sC+vfMDJXVLmgb1mtwiZJcqGHSLgWpn2LZSlCO/JA== X-OriginatorOrg: prevas.dk X-MS-Exchange-CrossTenant-Network-Message-Id: c100b29b-e32a-4842-c455-08dc7f07380a X-MS-Exchange-CrossTenant-AuthSource: DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2024 11:13:36.2610 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d350cf71-778d-4780-88f5-071a4cb1ed61 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: wvb0LWd0Yn3PUxrA/GDk5NEADE52Hf+q2iS4S2/Qw/9P+IZb3LpLCyNZD8rhWEoHlZbmzCZUjNhN3eFFm7onUwGqdR8qYuc9r9U0CA4x/hw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR10MB7079 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean There are no calls of "watchdog_reset()" anymore anywhere in the tree since the WATCHDOG_RESET macro got removed in 942d07df0e79 ("watchdog: Remove WATCHDOG_RESET macro"). The only places the identifiers watchdog_disable and watchdog_init are called are in arch/arm/mach-omap2/, so those can obviously not refer to these instances. Hence these functions are not actually used at all and can be removed. As a bonus, this also removes two leftover references to WATCHDOG_RESET. Cc: Huan Wang Cc: Angelo Dureghello Signed-off-by: Rasmus Villemoes --- arch/m68k/cpu/mcf52x2/cpu.c | 108 ------------------------------------ 1 file changed, 108 deletions(-) diff --git a/arch/m68k/cpu/mcf52x2/cpu.c b/arch/m68k/cpu/mcf52x2/cpu.c index 6bfde5e9bd7..d0a0a4500a9 100644 --- a/arch/m68k/cpu/mcf52x2/cpu.c +++ b/arch/m68k/cpu/mcf52x2/cpu.c @@ -108,26 +108,6 @@ int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) return 0; }; -#if defined(CONFIG_WATCHDOG) -void watchdog_reset(void) -{ - mbar_writeShort(MCF_WTM_WSR, 0x5555); - mbar_writeShort(MCF_WTM_WSR, 0xAAAA); -} - -int watchdog_disable(void) -{ - mbar_writeShort(MCF_WTM_WCR, 0); - return (0); -} - -int watchdog_init(void) -{ - mbar_writeShort(MCF_WTM_WCR, MCF_WTM_WCR_EN); - return (0); -} -#endif /* #ifdef CONFIG_WATCHDOG */ - #endif #ifdef CONFIG_M5272 @@ -174,49 +154,6 @@ int print_cpuinfo(void) }; #endif /* CONFIG_DISPLAY_CPUINFO */ -#if defined(CONFIG_WATCHDOG) -/* Called by macro WATCHDOG_RESET */ -void watchdog_reset(void) -{ - wdog_t *wdt = (wdog_t *)(MMAP_WDOG); - - out_be16(&wdt->wdog_wcr, 0); -} - -int watchdog_disable(void) -{ - wdog_t *wdt = (wdog_t *)(MMAP_WDOG); - - /* reset watchdog counter */ - out_be16(&wdt->wdog_wcr, 0); - /* disable watchdog interrupt */ - out_be16(&wdt->wdog_wirr, 0); - /* disable watchdog timer */ - out_be16(&wdt->wdog_wrrr, 0); - - puts("WATCHDOG:disabled\n"); - return (0); -} - -int watchdog_init(void) -{ - wdog_t *wdt = (wdog_t *)(MMAP_WDOG); - - /* disable watchdog interrupt */ - out_be16(&wdt->wdog_wirr, 0); - - /* set timeout and enable watchdog */ - out_be16(&wdt->wdog_wrrr, - (CONFIG_WATCHDOG_TIMEOUT_MSECS * CONFIG_SYS_HZ) / (32768 * 1000) - 1); - - /* reset watchdog counter */ - out_be16(&wdt->wdog_wcr, 0); - - puts("WATCHDOG:enabled\n"); - return (0); -} -#endif /* #ifdef CONFIG_WATCHDOG */ - #endif /* #ifdef CONFIG_M5272 */ #ifdef CONFIG_M5275 @@ -243,51 +180,6 @@ int print_cpuinfo(void) }; #endif /* CONFIG_DISPLAY_CPUINFO */ -#if defined(CONFIG_WATCHDOG) -/* Called by macro WATCHDOG_RESET */ -void watchdog_reset(void) -{ - wdog_t *wdt = (wdog_t *)(MMAP_WDOG); - - out_be16(&wdt->wsr, 0x5555); - out_be16(&wdt->wsr, 0xaaaa); -} - -int watchdog_disable(void) -{ - wdog_t *wdt = (wdog_t *)(MMAP_WDOG); - - /* reset watchdog counter */ - out_be16(&wdt->wsr, 0x5555); - out_be16(&wdt->wsr, 0xaaaa); - - /* disable watchdog timer */ - out_be16(&wdt->wcr, 0); - - puts("WATCHDOG:disabled\n"); - return (0); -} - -int watchdog_init(void) -{ - wdog_t *wdt = (wdog_t *)(MMAP_WDOG); - - /* disable watchdog */ - out_be16(&wdt->wcr, 0); - - /* set timeout and enable watchdog */ - out_be16(&wdt->wmr, - (CONFIG_WATCHDOG_TIMEOUT_MSECS * CONFIG_SYS_HZ) / (32768 * 1000) - 1); - - /* reset watchdog counter */ - out_be16(&wdt->wsr, 0x5555); - out_be16(&wdt->wsr, 0xaaaa); - - puts("WATCHDOG:enabled\n"); - return (0); -} -#endif /* #ifdef CONFIG_WATCHDOG */ - #endif /* #ifdef CONFIG_M5275 */ #ifdef CONFIG_M5282 From patchwork Tue May 28 11:13:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 1940412 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.a=rsa-sha256 header.s=selector1 header.b=AEVboP8W; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VpVJt4NZ8z20Q9 for ; Tue, 28 May 2024 21:14:22 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B6548884A0; Tue, 28 May 2024 13:13:49 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.b="AEVboP8W"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 17E8D884D5; Tue, 28 May 2024 13:13:48 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,SPF_HELO_PASS, T_SCC_BODY_TEXT_LINE,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20600.outbound.protection.outlook.com [IPv6:2a01:111:f403:2613::600]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D6E1B884A6 for ; Tue, 28 May 2024 13:13:42 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=rasmus.villemoes@prevas.dk ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jpAqkWkb64WMvbYlGPAfJdF8etcNd56wI4X2Uyw9RJUt7D0v8YSlABIO5O+ZnOguTQneKGrRQbN6X/JaBIA33H/yOmF7CqyjOda1wBUNhMWp+U+6m1BxetPqSRz8zKe14pdzJctBNBaL7I6uUBVIbD4V6V7qxEKUThicObYMPULWqNK7jK0sxH1c+c86+6INk91COaMLdiMYTULaPWCuie/tuCmCQN29W4Bjf3ErYW9j/nesD6cYUEf2q1+oeK+mMhJCXwFwf0ZJQAtHTymrfUjtsC9RhErs6YIAQXUNgGL/uFxU4JgWfMajOMp1Mgl8qgF+ulODvXC5lBu0+hw70A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Foi/+8AuJPWs3rLCd5h1Qz+m2AnePfQfzOFC0z6h1v4=; b=OJywI2I1ZJT8pCydAu6DUOT2cZtOd39PE1ZKdzmoUWa0sqKOKQ9TurVcLvlMuAuvre3JJd6UQQ4HX6V5alEZ0C0ERcGxDwSqiNXfc4MeVkDXpXKyqmd82hmrFKRtB1CQLj4Fay+VKVhh1WaUIBTePmcZsZK2x4K7qjHaRoEG4oil09zFZI4D/zFFnMT8f9hFGonOk7ZKc7UKT40fEPaY90OnFBTdza4t4WiOB8ZL5vt1X+Bi+c+PUjW3mgJ/K18h5AeYCchiX9+WQFu+TvuaGUHIZ5YzMGPDuUIbwPnj/YiPGtSx/9ef2SZYj1FiMMSRQ/htAGc+xoEW8gjfFtqoUg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=prevas.dk; dmarc=pass action=none header.from=prevas.dk; dkim=pass header.d=prevas.dk; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=prevas.dk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Foi/+8AuJPWs3rLCd5h1Qz+m2AnePfQfzOFC0z6h1v4=; b=AEVboP8WuXiSmzqpAJca9ZG57mxFD8mCTqa1lyzUElMJ/LBOfNnVISpdEMbWwQ9mqeaHAy+NdvL3PrEbPy9wJCynOUs6Rehwlnl7u+9Qd9BsG3HjUCllFFt9Fxb0mIidkLwBPo0yhVkXChy0gnP6tt9sETk1tlbQbDlMJDlWIM8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=prevas.dk; Received: from DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:45a::14) by GV2PR10MB7079.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:df::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.36; Tue, 28 May 2024 11:13:37 +0000 Received: from DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM ([fe80::9fcc:5df3:197:6691]) by DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM ([fe80::9fcc:5df3:197:6691%3]) with mapi id 15.20.7611.016; Tue, 28 May 2024 11:13:37 +0000 From: Rasmus Villemoes To: u-boot@lists.denx.de Cc: Stefan Roese , Tom Rini , Rasmus Villemoes Subject: [PATCH 2/7] wdt-uclass: watchdog_reset cleanup Date: Tue, 28 May 2024 13:13:20 +0200 Message-Id: <20240528111325.2163560-3-rasmus.villemoes@prevas.dk> X-Mailer: git-send-email 2.40.1.1.g1c60b9335d In-Reply-To: <20240528111325.2163560-1-rasmus.villemoes@prevas.dk> References: <20240528111325.2163560-1-rasmus.villemoes@prevas.dk> X-ClientProxiedBy: MM0P280CA0066.SWEP280.PROD.OUTLOOK.COM (2603:10a6:190:8::9) To DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:45a::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9PR10MB7100:EE_|GV2PR10MB7079:EE_ X-MS-Office365-Filtering-Correlation-Id: 694e6549-ae46-48fb-1e9c-08dc7f073866 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|1800799015|366007|52116005|376005|38350700005; X-Microsoft-Antispam-Message-Info: eHaVohIY5WTrG4Xqd3ExCugIvR75ueqf/T7/ntrbCFQMoKTIb+4bN1jDjH/FJYBMyTxRu7OvD/36upaCqKcDC8tu5ImGNA5yUwdTjR4Cu19Bed6+E3Ram+cvTpOj61SXuq2I4Vs186uLE76z5P7hOvPk6NzRZt/uw4eKb8jcLIHLc+TXJZTlar2zCbAAxJiPp9T08jvRFtiN/hNDQ2vqyG4hU7JeZG3Sr/CVW/VOnUSH6ibpzmj5MLJnftjcYjPnGEqLEFtERXN12lRv45wiN9MpMjKJhMLXaY5my7YLzgkasDN5U1YE+pXcPtfp6X81CuBi462t1VAINYJY1eQen7Of8vPNc+ttBwKcUWzizFj5xPBHMBhWWEoBrIrmSwEWw+9vPe+dOEy9fZM+tw2QMqV3rPyP6UK1nu4ZGyfy3SSyad/GO0d0lWbRzUVqy68DnTabbQ/EqUG4NckvXcQaZdfhkP66pqxjl2ZzapWwWOhOE5T8kwv2v78IEP4NIBdyzrhpXs9Xzq/4jH9C0yCIjY4/ReEIMfZIkD9eBAlbCjGqGjGRSyIFUGaSWfgd1jsMmcjOqfX8tfROF5Z2czk13O2G5DmRI6nQ+IOt2MVMqYlw6SKW/DHmEAE6IvF4epvf9P1f1w98q5OpJPvwp/p2HurYc/hAaQENrqSMcrnztIX8Lt+ya1RN8E0pHjbLmbBv4A701o3ma5kwpoWoXzHOzdou9CWEp5oYUxIQVv/qdQ3kwiNIY6uKUgYitNLnwmPHkZq06VBfP/NGgcAL6p74sQxBIXHdmfgnBy32JaPVlIYM3eBrCTKbeE16iyA4BdimMp9sd4+Mg6xqHf3eZHiWuMs1Q5edf7SmbOCz0Ugla1urj/6E+mOOFx0Cxqk6YQwGt8yCB+cu+U7Fsba0CNBaueR6L/gmUTWTwmRADCHHntMSDtLq0RDZu4Azcq9zUymwor/YaaZ+BsQpJzkBNI0kCvM4hFEVmVXAss7Jl/p/SuQkuKZgnQvD4K06n2mGwoRxipKskfCMzJg+pSpSFwqQ2B6xEigZZwvCy9EdVNbbxi/R+JMoVwvdEKjijfexAEuoLIFgVvI1DSIiMnlJNIBAJGOSGYHspnGlh+7LkM20mzpgaCRohv3pdgS5eZOK1xs59mzX167MFrCC91GKgrfC/81WXNg2JOVUikNrtrLF5gfIjrmBg5dd+27xeGiw+6H/YIlzhgqqHGeQYojrwKVW5srC23BRhoaKB1ThhS0BvCXawtxt4jjVPS+z/oyeXStM2ea4AoVqUJkzCjEtspHO99spJqO8ONigwPT2EDk8v9NiBYTSldVcLbcK+TAY167KDAY3scPsHZHIsvczeb9vHw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230031)(1800799015)(366007)(52116005)(376005)(38350700005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Nqn4OMfnllTVYLIl7uHakFJRyLQkkp+1BvhmiNvO6XsPHSreR2xS2tNaiuI9bhoBHXsBwP+sAdHh1U5A1EeSocPd+/37zx8gOlnnO9Mo6LNqPe0tEAYICruLdAkimx10NDt1c8UmqIoPtzfbrKaex8R2RIFwww8Powa1X9ZzcE4wI2CyFzU9N/+BqFxt4r9/MAI7g8QjDdN7kqbLw9mRYuzvUIihmZ1NEiTe5zXBJCA1F8f21G6LLxbCptw+m+dcf/0DzGxxxDLgEQN6RGzlaYpDZFFobagjEj+TowFXb7zlVOxueO53lctiSz+5SPf3fVD2KSIDbG3ktWbNXYlGB8+PnfOSwx+hIXLLtLXLZ7JhXltd2IBOuuhv0AfAwiUlBN+whWdUr6D181ol8rRbDVr9IEhdcwa52Wb4pBylonvg2/NrZxNIPLV4pd4cmdaNx8igM1+v3cvL3RCwfXXabuzWLNGqUylWAClcOgULyb6tHHBl2CpyW8c4txChmv7Gokn50Z3JMA2d/wCnxVv3grCUsCvq25OYCtcWIucOnjI1mJ3a9RQE+x+f6Ewq4GzXEX9LLcYdjx5Mws6dbA11yM6Sa/ugg5bbUbXC8gGLCI7N/fmbOFgYWCgOJ3l/Tm8+skZgKpTDSpKH1TCHKjzaLTGlKdpN1VLbkEfLZf2EE5jItwHdFgCd0MY9Ls3WZkVJDLTf9f+mKIeCotlfO73cIZFyAASgnWx6cf5X/UXSCuelndcHBiEk+xcGF4q4xy1l99rFED4/F7/ZgBnw18HOavW5pvw0TL5teDYXZhUtFTMPczjzhnLXOkaPxP370I901HR3ae/qcj+vz57c9cS1TDoWJvuV3qXOk1cpULAdwjbd4Zq4HXD5wF2QxSnl2dn9abyHKP+PnuP9/x3SvGbry0IzX6jZPf/4IPFO5en8QfP4cq26DxaXkUZ8fFZzRD3q1hIVjKr+l1eSnLuuuUlI/gLgPpuY++tuNnrrvZOXJx1VMPf/St2APWY8UfsVzNk5Ijaag/FzPDRl8uPP6dfeJk00v2YQWqwig4+cfoX57CpvMVhg1vLFZexA2iuiTggltH+NFTPQvwdsEpjDaJnBF12Pe12kVS04cezn/0V2qBP1S/TRii3ap4UhITuxHs86qUQHc2AWksx2Hvy3538epnxcsdBCrsLS/gL+vEnf3Zy0dNn99SxbJcUiIRd2IvZzjOYQEmoO1JkAqbie8GtAMzUKFxjscOLE7ezO1rkyQISgjlDQqzmHkzsH7JOrWER5pGwkRcRaC+mG5VLudB2hPuXwACpk/igsWnvgQZe7i2HBo7H4sSsJX+ndB3qpYcMEbFUEd72uayAnqz8w+NpJ4uRebEkJ7RD7MMdNzSo79jVjcCMFwhf3W3eyrwGiAFZT5fgB6cZtUKf5yx/AfW22qgfnrKO/0FhaOi+B+c4H+2eZcJcd3hKYx/4lGAu/rnlHcPy/e3FZ3u0eAPb9CnQ3KDVm7teHiV+xT0kh3kH+/AGdnLLF2XVpvJFD+E4CYFgAjHhheHiI/qngz3fWk3jMiIWm90xdtntdLhLtlV1AHTtCfz6MlG9toSjeEdFeduWuZH3WL+GBHFbw/umlgkbddQ== X-OriginatorOrg: prevas.dk X-MS-Exchange-CrossTenant-Network-Message-Id: 694e6549-ae46-48fb-1e9c-08dc7f073866 X-MS-Exchange-CrossTenant-AuthSource: DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2024 11:13:36.8856 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d350cf71-778d-4780-88f5-071a4cb1ed61 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: JUi20FxJB3AXe2Rjb3MG5R6BpxwfigGZFcYug+f9xTJYB4XrXWQhro9Qdf40d17hXI4gCgLheSgvcJzOYeMgoaJuufgYRozIHwF67QWAHXc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR10MB7079 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean watchdog_reset() is no longer called from anywhere, so we do not need to define a dummy no-op function. Remove that definition, and update references to say schedule() instead. Signed-off-by: Rasmus Villemoes --- drivers/watchdog/wdt-uclass.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c index 417e8d7eef9..918f31d6b43 100644 --- a/drivers/watchdog/wdt-uclass.c +++ b/drivers/watchdog/wdt-uclass.c @@ -28,7 +28,7 @@ struct wdt_priv { u32 timeout; /* * Time, in milliseconds, between calling the device's ->reset() - * method from watchdog_reset(). + * method from schedule(). */ ulong reset_period; /* @@ -222,21 +222,6 @@ int wdt_expire_now(struct udevice *dev, ulong flags) return ret; } -#if defined(CONFIG_WATCHDOG) -/* - * Called by macro WATCHDOG_RESET. This function be called *very* early, - * so we need to make sure, that the watchdog driver is ready before using - * it in this function. - */ -void watchdog_reset(void) -{ - /* - * Empty function for now. The actual WDT handling is now done in - * the cyclic function instead. - */ -} -#endif - static int wdt_pre_probe(struct udevice *dev) { u32 timeout = WATCHDOG_TIMEOUT_SECS; @@ -263,7 +248,7 @@ static int wdt_pre_probe(struct udevice *dev) priv->autostart = autostart; /* * Pretend this device was last reset "long" ago so the first - * watchdog_reset will actually call its ->reset method. + * schedule() will actually call its ->reset method. */ priv->next_reset = get_timer(0); From patchwork Tue May 28 11:13:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 1940410 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.a=rsa-sha256 header.s=selector1 header.b=Zxwbv1pQ; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VpVJS30qQz20f1 for ; Tue, 28 May 2024 21:14:00 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 00DF088489; Tue, 28 May 2024 13:13:47 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.b="Zxwbv1pQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4199C88486; Tue, 28 May 2024 13:13:46 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,SPF_HELO_PASS, T_SCC_BODY_TEXT_LINE,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20600.outbound.protection.outlook.com [IPv6:2a01:111:f403:2613::600]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 88BA288489 for ; Tue, 28 May 2024 13:13:42 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=rasmus.villemoes@prevas.dk ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nOOsZYA6ayiP7+Cz8cFQlRlNyBPgehIGHttJOUau92588DO2zNL/rUpgfK9HReu/w+LRJsEmhonnD4OWi2CpVwkPEyMFW4ksS/HZWjXixWdSsIQGQRb3VuSUcfc9pH1pkUwm/6xPOVL9t1NogokESvj/tLVcd4zisuKh2LMdvxnUJrlYv4C2cN8YI3AIMLJjkxcIxe2pZrN1r4gZ5jNVnNdnnJf8EAX7wuh69SGkgvLkKFvMmoqMJvBUDoz9YrsxTG/aj8arvnxvjXqX8LArYspefW3Ig6r7TGS5Q71w9361QUcjR/u6GsgOSRH+ogHkZDGl0DWzxcrAlsvFVWn8VQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=C7okZQErW+oQrHBLID5S8qYnIgYar6rGEp/0C9EBxzs=; b=SvpUtLmp5nxKGaSU5WaKF5tXOZ3NXXckIAA2th9gW8ao6TrU60YLS6M4dhQ3+Whc/Z4KgK8q/yjskBTG6lAPTr4y1dhV+rXTGcgNxarjIBoPsELar2zO8rJ0UOSu1Gflw7Kc6fyP6Kt9ixEozhQq3yfIchAVpTqtZmVmeYRdAc0GZ/AX2oBvNk5hqMo0QFLoDwCGk+CmKhE+Ji43nmwKQPROMCRBEfmjFF1IiUuZtYDEmuz6GDJ8GAH2PzNhMaPDbIn0Brt/vfGwyS0Wh5znCioZuB4cXWUfTmQ1qBghsqVCE1HJKlZiSf8gysVFa6XZDJNcBTSk7yk94LjTSEVhgQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=prevas.dk; dmarc=pass action=none header.from=prevas.dk; dkim=pass header.d=prevas.dk; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=prevas.dk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=C7okZQErW+oQrHBLID5S8qYnIgYar6rGEp/0C9EBxzs=; b=Zxwbv1pQgLCBmMCIqp1onGPsh2adS1S74lfC09KAzfNixOoyY4lq+ClKu2WnTTh8KCijJhInyNCD/0k4YEUVGZfzq3DMsbmH7pYO6/n50QgI4/jxfMue1UT6AXPWkmrFPdkmyJgp2O790CFSrzzW9nbbT9/ETnvF0uNGoqgIGZg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=prevas.dk; Received: from DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:45a::14) by GV2PR10MB7079.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:df::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.36; Tue, 28 May 2024 11:13:37 +0000 Received: from DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM ([fe80::9fcc:5df3:197:6691]) by DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM ([fe80::9fcc:5df3:197:6691%3]) with mapi id 15.20.7611.016; Tue, 28 May 2024 11:13:37 +0000 From: Rasmus Villemoes To: u-boot@lists.denx.de Cc: Stefan Roese , Tom Rini , Rasmus Villemoes Subject: [PATCH 3/7] serial: ns16550: fix comment to mention schedule instead of watchdog_reset Date: Tue, 28 May 2024 13:13:21 +0200 Message-Id: <20240528111325.2163560-4-rasmus.villemoes@prevas.dk> X-Mailer: git-send-email 2.40.1.1.g1c60b9335d In-Reply-To: <20240528111325.2163560-1-rasmus.villemoes@prevas.dk> References: <20240528111325.2163560-1-rasmus.villemoes@prevas.dk> X-ClientProxiedBy: MM0P280CA0066.SWEP280.PROD.OUTLOOK.COM (2603:10a6:190:8::9) To DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:45a::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9PR10MB7100:EE_|GV2PR10MB7079:EE_ X-MS-Office365-Filtering-Correlation-Id: 6a1ad6e7-410e-46f5-6b9b-08dc7f0738c5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|1800799015|366007|52116005|376005|38350700005; X-Microsoft-Antispam-Message-Info: abpiZG7LTqTnCobkxOmVpLyd8laEU6V4ycJs64W1SYbwQfZSAwNCQiXjBYcg2sot/IgTeSbMuJZhJH2LadjCXNrqQuwnmaxaRzasDjyDCQAhW+pKpZ38wySUlUK21bpOHYsj+mJuQ98fPLK8yjkE4jlJEpf3i/T8nmb9I+8ZheMXPZ7kqV2NuHYPYC/xDMX3WEHb4yYsv+9S260CpIzRVB53r3faYcUb0qiFBaenz68U6HJZGulIllKIrBVPX8M3o7wckCv7ettVNxOz+ZwB80b33jie/N9JIpjyYGg+dVKYKx6UBKFGrPSzD2Mj8akoauiPMdqut/xoCUXr02xCUKgrBQsUbHSFC3TUeUah/NfvQ4tSjJjOgrsqux0lZCKL9TcFxHBItQmvaX6hRZhz0q1jXrpCrrr6Ahuij3Nk/vSdGiZsZy2CxnS1a3+R4SYVOJJufddBzj6iFTW5ZR0zFK+lqf2AAqoOq6efIwkF2BXs1TKbiLTY693j2xI1EQeJfS+admFSewz0MgyOCch+d9zNJKCPc92TJX5EwPy3Lc7V4928NumgxMFNFVf+Egyvp74Met7TUm0RfI8etkEDXYcYp4kLK/MEbh9TmICyS7CPhfVRwlRWAa6ms4jFjjLg5oKM4Gnn+YGcxG5YHDVL/9AbXJHfA8644lZ9Hf/75EOaqQ/TwOxRS0zF9kf7b6BUwJZjfLzvuaV4598WqgnGXTMIQIVOsb6a4mh5RNhmUPVE31QubOXs2zkNbNLt6qRKSQSn9QTwfRUO8uJZVl1LNuXnE+WVkMFhCAHfpLEcTP8YTKI78ZrIlZGmfPuLFhw6us10rlpnG7xbWeNMFMyFAsw7Yu+m0O9dAQ3XqmwQeQ1rYVcf/POgZsSrkMWe/Urdx1yuo2VNjAcoWjOc6UVzGs2ex6WVk0YV2QVrnffLtdRrpQLUuB+lp2jsi+L/dKuP32dGwBV2eTqIq5mn+Q5d+E9U6n0msAS3z/QPSFfAL2C4lSVkHRcrTp0hoeDoasxWEYJwWdVbnH+jGabnuewDG9kMvOuYW8d6tX1ZJV0v+v3CedcszY6OckYHlX4cgceMbsU9vh/q2+FatO82Rt0feWy3h87zzu2eQDmcI3iUWCIZTg3hULwDyAbC/AbJx6YM5P3wIUHYLnbUgntUIrZoL1vN3PfEB+hSGkkLT+XhpTouKlw6IK8YqXCsPNgdtNgftOL18Ryxezk465eNBsCvTw/StBuIb5VxoeuaVMSVzUoDKFGEE+Y+QgskI0diVKA6gDl/FW6Yprzm43IlL+VVuSmgzYFXtnmp+xzI1D06gw15y7sm8MES1Eed4tWrDHnfE2YMCeGVYD/ZDVSYV6+0KQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230031)(1800799015)(366007)(52116005)(376005)(38350700005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hh7nEx10zDrAhm3i+7y8/+bfDwo5GbOW8Z9R8RzAia49D4Br8tpatDnWEAPW4u1S9QD3W08czFrKNPY5dtKkqXVA3POhrofv40bcim506M8Y0HWeuHTTuJMQb4RCK8HbYGqiLMrzJPfQfC9QxT9F1ZiT2MZdaX+4KnvBpunieD5Xptc1pman24QYUPJsVfm69MugMNT6hGf7lDVYrbWHpDjqrCxtpPSvvXz+Q6XBpUSLTJwCc28F0uK093j4fbBwH3xKUriIhGZZZUVWjXg5DtXkAlWgchBFHMhJGpAuSypyYptM/3322PxAcFMWuM4iATazQmT9T/9MJ8mqHZV04ee1ZNMcIBAiDbsnPigN5Gozmt86xPucWQImz244zl4eOOiJV2WTTNWMjfBWeJuQFOVQ7BTjqHcuJKCS1F+E2A+/eX44Uw+QljF5RjHbYVAGaIk1Ee1El3KxLyYunUiKHf4K1B3oNE9Fiq6dSM3KDfsa1EtiQx66JdL5BkVEL7Mrbz8gxdU2XkWqU0BbgR6R4wxPYf9Fp5N0FXmsa25gWkC/7nf9DfkcP79qK1pceLmwrgvEZma+QF1OvU3uwlnSrmw4Xz54jj7dNyArNGfe4hvhmA5ll51iGRbhT9Od4mBTOz23Oeh88haJfIfnz+9ppPe5bURG7eVfSs+1IJIDYD1ykk0iHLmEf/iYmdRJYIlFrZMMXBmu3nHlYBjlAbuDorX1rDQlOW2I5OY41jXciJ0X8VCO+aeiQNgDBXt5T2P/P4apkHBXDRhZl5vRdM6mVEVVtAWIKim+sZFOhUKWalvadqToBANdIjANwlQCECvmsEgtyqvPfXS2vLhfD0X/jWh04+D08BOSZowSQLcybe4BqVwdJHOrYqrbNZ6W6AF0A3aU/fZzV2usFRRuH9Jm3PR2+jB290m4yCNyPzgzMg14fGmYHTqIxj8BnVOlGjZbcxsjKV9WInQK5xhn4huyvLIvaLCAcFKfrNpw0r3FBTlPedzgzWyteNrJyzQxjgjgleCvNl1jGmdQwCzQSvrcXQPbfVDad78Yp0SMQM5Mljp3f8XyA4bLMqbdvbvv7jyO9ynElLcdGXjVIPSqEQX8383jC8yOpQODnkAaNe7+s+UQ0guQC6zND64cMAQXTWp90DPt/e7DTFfbxQTPbNZjyhUmSu+svVVskBGrGJzgwNfsjBxK11awdZyKBdtDnSvKaWcCmO1h+d1Nvbd0JSiKhDWGjKA9cAGu8O37JLDYlRr8J7YcXw5w8t1gn/9J1IBHLeVCaLJ6fEVd8o1MFmezjb7MW6K19FqTpraNLHMJHefV+ePz7RrgLuPJj4T8GSOO5IQUM/5oejAsYS52UZBsO7BDtjqRoNeD1got+Y73EMtw2d2NfbvE0fU/+bqQ2GkKYzvjBQRlogwCYHACI3qAE5dhZdWGJO5bbvDF9K9DXzgeW3SJo9vTHfrr7mtgueohrgwbVZ0cMLc6Kv4q5FX7okQi8GBIKqtXeVAqSsP7R5j0no+4malCfdzQ1qzoamOjqOA1j3GrALWCUnSr79nIcP35ys0ZiN/lDpXyUEVoICjrZ3LqLAYQ8ZbFKcFqVJN2DWnigrmZRkkOZHPolaaysg== X-OriginatorOrg: prevas.dk X-MS-Exchange-CrossTenant-Network-Message-Id: 6a1ad6e7-410e-46f5-6b9b-08dc7f0738c5 X-MS-Exchange-CrossTenant-AuthSource: DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2024 11:13:37.4803 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d350cf71-778d-4780-88f5-071a4cb1ed61 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: s6gZ56orFDlrR4FlUEluqnZNWWZWcsmR7/zjjlRw6wC+ifhP8gFBnSs5klD6f7uSHOCO9MDaVHFitNpU8QFloTrPVOBugFwhtO6RCCnBunk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR10MB7079 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean watchdog_reset() is no more. Make the comments match the code and today's reality. Signed-off-by: Rasmus Villemoes --- drivers/serial/ns16550.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c index 6deb1d8ddc5..2119eac15f9 100644 --- a/drivers/serial/ns16550.c +++ b/drivers/serial/ns16550.c @@ -291,9 +291,9 @@ void ns16550_putc(struct ns16550 *com_port, char c) serial_out(c, &com_port->thr); /* - * Call watchdog_reset() upon newline. This is done here in putc + * Call schedule() upon newline. This is done here in putc * since the environment code uses a single puts() to print the complete - * environment upon "printenv". So we can't put this watchdog call + * environment upon "printenv". So we can't put this schedule call * in puts(). */ if (c == '\n') @@ -390,9 +390,9 @@ static int ns16550_serial_putc(struct udevice *dev, const char ch) serial_out(ch, &com_port->thr); /* - * Call watchdog_reset() upon newline. This is done here in putc + * Call schedule() upon newline. This is done here in putc * since the environment code uses a single puts() to print the complete - * environment upon "printenv". So we can't put this watchdog call + * environment upon "printenv". So we can't put this schedule call * in puts(). */ if (ch == '\n') From patchwork Tue May 28 11:13:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 1940413 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.a=rsa-sha256 header.s=selector1 header.b=bj8SXqdS; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VpVK64KtZz20Q9 for ; Tue, 28 May 2024 21:14:34 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 137C788422; Tue, 28 May 2024 13:13:50 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.b="bj8SXqdS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 249B3884A6; Tue, 28 May 2024 13:13:48 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,SPF_HELO_PASS, T_SCC_BODY_TEXT_LINE,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20600.outbound.protection.outlook.com [IPv6:2a01:111:f403:2613::600]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 10653884B0 for ; Tue, 28 May 2024 13:13:43 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=rasmus.villemoes@prevas.dk ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HAstItF5oFrWvxSi3zpw8xFSDqRYsAYwBtKv08BPJNwlBmgjBQRBbvvSwon0NOne4tsvJZWwlK9Soye095R3rmw/Zk5VzoT9WiuQvwsNhVjktQFfKeRzG8u7D2fkonn2KaIZPBYgm6iOFXvf7Xviic//bknBhcKBuXrj7WcJ8ywWKLxIMAbORqIAo/pAlNyEHWk/a4ikxsUYRM1d5VSy+R1YZm9VZVOaNwU8YrvX6YAVGxl5MUk045GVPrvz2PXRQhLEQJrShmqH6GsaYyd5iu+q8rgfGTnwNP79I+h/4tRjbCxU+nfUP+NhO8EPtYTpVY4pqYEAPmJVggLw7LV1zQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Sl4Om/d9Pk8FAZqpm8tqeXWMrgXp8SXwwbRrfZRSLaw=; b=XLU8GrhpETz5UYWmTY+jDH42mYyWjvglOBS7bJBX34/wfS/U1cjD7A6K/m66RixGNaBxc3oGlUX6G+tcl7ms/0J6hiqJRSOkKvSnkPul9U1Y2Lvidvzt8cYnUm8nyFZmzJrrpGgMgJI3xKjaTPPnJhCAje3cndJIVLj3DUPUr8V4cLLUUrDYg9vZn5e69evoL96W9JR6D/YEqfDm1r4zZNj6Vfb8+Ljj/7O2R1wO6PRya45zk/SmOE1vOE/RnsWXarL7AMpF3pEPH+JJeqWu2bMUX/rnb5Peu+jYTgXJXp4Wc3Mjkh8Ngme999qZ1PPJ/6pbAf+fK7GRGdpadiLmyw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=prevas.dk; dmarc=pass action=none header.from=prevas.dk; dkim=pass header.d=prevas.dk; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=prevas.dk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Sl4Om/d9Pk8FAZqpm8tqeXWMrgXp8SXwwbRrfZRSLaw=; b=bj8SXqdScZdGxnbJYgMEthlqYSwIren0lS5x3Sw7DB0ax+RKlJw/IMndJgxNRIe799ib/4ELvjgFqQY+ur25BXG438BlGz5PsmcyvIAEb7q96jVyW2hA5PDyXWSLMuTc+9NVVvQDEIM9kwKY+y/46QvKeoVeRwHQx8PqF/pyv/k= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=prevas.dk; Received: from DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:45a::14) by GV2PR10MB7079.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:df::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.36; Tue, 28 May 2024 11:13:38 +0000 Received: from DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM ([fe80::9fcc:5df3:197:6691]) by DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM ([fe80::9fcc:5df3:197:6691%3]) with mapi id 15.20.7611.016; Tue, 28 May 2024 11:13:38 +0000 From: Rasmus Villemoes To: u-boot@lists.denx.de Cc: Stefan Roese , Tom Rini , Rasmus Villemoes , Nobuhiro Iwamatsu Subject: [PATCH 4/7] sh4: move reset_cpu() from watchdog.c to cpu.c Date: Tue, 28 May 2024 13:13:22 +0200 Message-Id: <20240528111325.2163560-5-rasmus.villemoes@prevas.dk> X-Mailer: git-send-email 2.40.1.1.g1c60b9335d In-Reply-To: <20240528111325.2163560-1-rasmus.villemoes@prevas.dk> References: <20240528111325.2163560-1-rasmus.villemoes@prevas.dk> X-ClientProxiedBy: MM0P280CA0066.SWEP280.PROD.OUTLOOK.COM (2603:10a6:190:8::9) To DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:45a::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9PR10MB7100:EE_|GV2PR10MB7079:EE_ X-MS-Office365-Filtering-Correlation-Id: c4dceeb5-244b-43d8-3cce-08dc7f07392f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|1800799015|366007|52116005|376005|38350700005; X-Microsoft-Antispam-Message-Info: 2KMqVOcluKXJ7FC5UsdpahT3NK6EfSa4pFw8tiQcoIR5OJY9b40T8jXSk5nt/DByTYjMO2Ekx+SUN39lHT7uqwybcRLqMN2pMJzjfod7N26MhBocXJxma/Dw75B3p2rXJOy0BALE+MkvXWi/jKOHMb6r/+ZHQ+yFYDrDWSrU8a7pWvY7BTy3/vQyZCBDh/lcKFhcEh8kn6qn73JXOZAC/KPmkt96uUllmzIMK71/64VzIj7FBMQ4AAvh/7FWG5qmImt9QAfpepRBkaQtXsJNzb4Hm42t5v+DlitUvC79W4917grZOZsJKl1+udYV3EpwtfEjXSUh7IJfpq9AZ2wjvH39IfUKwHJj09znWhaqI7KkV1bketpHx8y5Ki+Z/oAWNpsLvI70CKzTbKdrx73WVRc4DS+e/62FppX3rCqn/6rzhfi+MQUdukMk2T6GTB9BsSRRRUnqwSw9b7cGgCSBBxNEkejB9caRZhkoAPlLAIkzQPb8DumyH2vTXIs2+7DB4WeqYUZgTvkSHK6XlHKNECU0mAouH+vY751lgBatAJ39YD8aPcBEE7WU7gaF2hffy36WDwubrft0z1/GHkonfHiMbLmsnnLaMg2sWo4QW90NBVkgausEEC6vuzcYWNAsj69J9Yq+H2JUcjzVAR340LSUg/2Ojg11k7rcVPJskGdnf5XDqY72IWdwYP7+BnLfUDlhjQ0lV8VojETTX4xM7GopEa+yVyHaNMHO0FZvsq/7v1lCZK4Hb0kM25lmH/c8p29yIyG0pkFmp9+Jsf/7Y3+dNSXIRSQJQlPV9fdsTyVpCjYMUZVuotpe6i/Qy1x34qgmePOPacZ9qyakxoavLpgaXQCTzDP3qjFAxD1a4Z21qFxFnFvc7AOX7eJ3Zcr9n4hsf9/k+NJQYTd9c7k+lIx4B1vnfmGpNn2GqPUqWwglMV0yLuqiJqGBbKDwFcnN9PV6cn0ypFGZcu+eBu2AoQeCoc/2+QWMusLW2MzBeu+cgIDpwk4BX5ViJHBSppCt/cMM92oOOVwSveAC4KTmD/IRkS0qwnFsD1rsHBTYxhuptezrP6yNjfoZtHeVddydipu9T0xVat6RvS7nd9+0EpYNePwcVRfo+Ww6feepPpMt1vZ3ESpbuBk2mFwic+tRvvD2rJJk4UoGjBOcqvTRueymjMoYZpVcNsPfUovj2pWpDTZEq5uWMbBFgclNnIApF3CAAi5uMqi77aGetkQjo//qXuMqNx1FNMt5op1S1l0Y349t2P8QUWhWSY5bk8j9oZE4qgV6evmeibS8QjaNniHUk7GY+aiVDIgK8hs8M3vms412hJnk2m3BV0RCvzkPTjpzIa0aUNjBPE9V7FaXcg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230031)(1800799015)(366007)(52116005)(376005)(38350700005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7BJzddsHcCU99/WNuARlFD0GKm8O1HJ/ICnum7RxVyIBoQYzjPBhsHFJnp/mWuNl9FPYTmu3lob8HxapDRhZyEt6T0PlcIk2MtYQ/uRLKW10eIL1y4VPQNuB1z+8kiZSTxmU40bxq87/nqDl8cYtWWvXKWZ7WhVWPVwkRSSdcV/B6JkYVyvjmK9Wy9QqS8cV7GBsbWCVTEWxCOY7LiHjoy3OLpBruAYZ9zzIffZlZbDkDqm5xcNokyjp72y/2vlQqlHEcSA3wIXja8CYYrynOwmJhjHCmiotY1Ex1HCl+mt8t1eBF7Dut4FSH9zZ4fYmzYAOa3YexG4vqZi9Fjbhk1OOGUis9hIS6iEcn9602sbRfh+cIJ510nPWP6A03lQfZp33zHBCygySOL+RfsfEWhopwv6gBd04XZlR4JGgP3pB/cZgBqSpo1rmYU7mvobjesoy3lAVG0J3TJvmNbxuk+FtbnI71WAxzjOob/Mx/Q0yCtHAwHCV5OdeCJlx+YYdQGfMbkUFeuWcRX/xnY3W9uHlL9cLV8BkfiUg9b2a5fsLZ7XW4EbwlHTI53Hkrydqq1WxsiE/DjVLONS0o8xXgrwFDWyKAzDEpbBVmGFP0IJnMYiqL3ukbZ41mqYmS4Z0GSXMkmwoz+r3KrDVf3pS0WQW2S9j2QrGd6nx5Ehq8D4F/5ZPtVjnHBlztuYP+uF1sHZc+kl7jGhoFDGTTX50et2GgpAFaKXuUX8UcXboggIwP36WvZB2+Mf8xK1tDVZvkc3NTcMlpFQX9BMWWErk5yBv9XMI5KDhLjJUspv8aie9vkTefyCcQ8B4Qxf70ctuTJ459lvumg9ODQDRGtEkWhHGEFzTTpa+TEZ+GUiZiK+BEYbYSliMN76liQ7XFWWEhsDfxbnv+ElLRHyaj9p17VMWFZzUYIRIixb2q7T36KKL4gIn1MNHiZ1HMAuZSMYozfX0/7kBFUpRZIapHoqUrgpBE26vuo71/q98scLdkCx4O/GGvAp8nBZgA01rdl7WzdZUOYP0ejY76ZVpn6LgA9+X02vHYabDomGj596ILLK74zaigHiJPhtOTyTpmexdomw3jo/JPv//VGIx8AVjuCd99PfCoKXDX9sOaGWUZ1kOqh6/b2294oxASsylEL6z8tSSGiOWGSLuPPRtk25Tc8+G/wTsjxCIZEXfdWqQz0yaywXuqQKGNpNY+VlsIAK4TksY3DVL6LLxOBFIsMEK4PlwzQTHJKDZJJF4+XK56enJh0aXR6DITniYxlidgmqRlfA4ltMG6ZwPeUo08JWVm/5YUvNrw5ARLyYL4EBQyX+Jt+izyLHqvSrUeB+0/xjvIlgPzFmWyaJguEPgerHWO3hu61ImLdbrW0fp6xdIsQ73zAZ4hv3kfLy4/KZnVA6eFsx1I6J8aq5t9anTQ0UytciJxi3Lq0FNod3CGx/Mtwz1nLVu64wv7SBOJq5BTnzy3GdwrQ0FVxPg0waoRnDlqegH8TTp5kh1SmNDmVuVwjTLV3Yb+uVL7XimhPtjDEOt8vhQajMzBtFWccjMgEaR6fT/V0ZdLP1K7qbnOYjm/s5hJ7CUws/tdoQDXR/6OL+sBhBZxAvdYc3uYejZhBe7fg== X-OriginatorOrg: prevas.dk X-MS-Exchange-CrossTenant-Network-Message-Id: c4dceeb5-244b-43d8-3cce-08dc7f07392f X-MS-Exchange-CrossTenant-AuthSource: DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2024 11:13:38.2214 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d350cf71-778d-4780-88f5-071a4cb1ed61 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 7kC3I8gGM9dnWVdD/63fyY6wT32YeyFZJEixTLNrrxiD+k+BAca8MbySJotteGrBeFkQb8dmYiI1RlNYlhb35w+2QjjRo+oR1F4UGIv14d4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR10MB7079 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean The next patch will remove all the other code from watchdog.c, which would leave just this function in there. It seems just as natural for this function to be defined in cpu.c, allowing us to delete watchdog.c completely. Cc: Nobuhiro Iwamatsu Signed-off-by: Rasmus Villemoes --- arch/sh/cpu/sh4/cpu.c | 10 ++++++++++ arch/sh/cpu/sh4/watchdog.c | 9 --------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/arch/sh/cpu/sh4/cpu.c b/arch/sh/cpu/sh4/cpu.c index 1b2f50dbe6e..6b52737028d 100644 --- a/arch/sh/cpu/sh4/cpu.c +++ b/arch/sh/cpu/sh4/cpu.c @@ -11,6 +11,16 @@ #include #include #include +#include + +void reset_cpu(void) +{ + /* Address error with SR.BL=1 first. */ + trigger_address_error(); + + while (1) + ; +} int checkcpu(void) { diff --git a/arch/sh/cpu/sh4/watchdog.c b/arch/sh/cpu/sh4/watchdog.c index bf403d3c520..a891333392f 100644 --- a/arch/sh/cpu/sh4/watchdog.c +++ b/arch/sh/cpu/sh4/watchdog.c @@ -50,12 +50,3 @@ int watchdog_disable(void) return 0; } #endif - -void reset_cpu(void) -{ - /* Address error with SR.BL=1 first. */ - trigger_address_error(); - - while (1) - ; -} From patchwork Tue May 28 11:13:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 1940416 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.a=rsa-sha256 header.s=selector1 header.b=hNAmiXqS; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VpVKq23Xbz20Pb for ; Tue, 28 May 2024 21:15:11 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3E59288486; Tue, 28 May 2024 13:13:54 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.b="hNAmiXqS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 106A6884BB; Tue, 28 May 2024 13:13:50 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,SPF_HELO_PASS, T_SCC_BODY_TEXT_LINE,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20600.outbound.protection.outlook.com [IPv6:2a01:111:f403:2613::600]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 801DB884BE for ; Tue, 28 May 2024 13:13:43 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=rasmus.villemoes@prevas.dk ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BgV2qjcz3Z9dDoqB9JLexWaEDl22flQtJBkd8Y7c9BYESrmAdLUElwsLFz+pYbhFIP1k0KbwBSi8APuXaFMjZVaOctNWWXHkoMoMW/kJBbrDONIj24B2T12O7lRJGxFpJM9SpcbCbhHttcV5aO7zY2lebo2kfiRxQXz2s4jGJH7F/12TRAGJBRiCd1QkjyX/FE7KGIvTOMHU5R/SUWs2nxpEUO5oaaYfFjDCexeFXNjlarFLgNQfgqdVkDuv0bkfzRWeLUSemkFtYGjyT44RERw9ht8rWotDMvWMaS9W1VX59AZdZ34d7ezj+EZJ/ds2F+Pa4jX9DfyMG161Wg6/nQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=fGs0pY2M52i+3GoMY08PsBmS8cKqRtdL2adWWlDYOfM=; b=DvRXJW9eXz4RqthC+SKB34NwVx6DVQNRmEzCtOXkYXgt3MTnctBzRCdmT+5AyqSWKfq/jcToG3zl4CNYfiSNbZlUbzg+M84Uzuk6grQymBfX39wM7cLYv1MQbHWykN7SJu5CjwJ69zNAkvHLhXr+/XsxeZ5L3+ggummcRnBd7cFr6Oufvvqgoy8RYdx/hftHJn8CX5K6YRa8p1mK4XlKi9SEy0YjZonwwQpuoOF/4rD8Q9lE9XAFlpvcEFgHT8v6hRv8VHUcqb9qBtsKX6+vgpRN421DLnUxGHt7T8YgpDhh5b18Evh7YpHz/20rvAO5n/aHDjvsEhX7Lm5fmPfqXA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=prevas.dk; dmarc=pass action=none header.from=prevas.dk; dkim=pass header.d=prevas.dk; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=prevas.dk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fGs0pY2M52i+3GoMY08PsBmS8cKqRtdL2adWWlDYOfM=; b=hNAmiXqSDNbH699oVZ0XqJEn4+BVlKfrZ47a5/5OggzLNtW1JHkhd8LvpXWZvVm450JykOaxM8iDkZh+J7JaAt4/xPob6BsS9gvnLBGFVWiLrbpa9cjb/3b0dcB/B3Hn01jxKdIIvEod6xcbS0A3WvZaMOgTPYtk8i9ukTwCMS4= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=prevas.dk; Received: from DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:45a::14) by GV2PR10MB7079.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:df::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.36; Tue, 28 May 2024 11:13:39 +0000 Received: from DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM ([fe80::9fcc:5df3:197:6691]) by DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM ([fe80::9fcc:5df3:197:6691%3]) with mapi id 15.20.7611.016; Tue, 28 May 2024 11:13:39 +0000 From: Rasmus Villemoes To: u-boot@lists.denx.de Cc: Stefan Roese , Tom Rini , Rasmus Villemoes , Nobuhiro Iwamatsu Subject: [PATCH 5/7] sh4: remove watchdog.c file Date: Tue, 28 May 2024 13:13:23 +0200 Message-Id: <20240528111325.2163560-6-rasmus.villemoes@prevas.dk> X-Mailer: git-send-email 2.40.1.1.g1c60b9335d In-Reply-To: <20240528111325.2163560-1-rasmus.villemoes@prevas.dk> References: <20240528111325.2163560-1-rasmus.villemoes@prevas.dk> X-ClientProxiedBy: MM0P280CA0066.SWEP280.PROD.OUTLOOK.COM (2603:10a6:190:8::9) To DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:45a::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9PR10MB7100:EE_|GV2PR10MB7079:EE_ X-MS-Office365-Filtering-Correlation-Id: aca004bf-355a-43ca-beb8-08dc7f07399a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|1800799015|366007|52116005|376005|38350700005; X-Microsoft-Antispam-Message-Info: +7O4r5WJigvWHFOX7P89lgrguG56Pdg2RWZuS+/NVsvaphuEsKpKFM8RsNfDbaX5L9bmKNtqLWLrEmZuVSAfkqabey4Mj6rOdqDa+hrcJ/EkmP2b26qGLn76IuGn0nL9xzWv18cD8izYlC0SuO13+2TKnAENxafRW5jUlxVGIsGIcyVdFIbKxmw4VY9sxEPMINXxyc6Xht0iVooDUolVJJviV0Y+Kz+95THkBTQv4vpllRwuRGbKJP307Ifh6SXrSHdd5mEbq3oGKQBqSu/aHrr+AZ8bSkBZkIQX+RkEDEl5MrwggSKYhmCd3J4BiYT9jiOuBC3AoekBj9qd8cnutkKoQHc0RkDwMPigNsG4oxLKt7b0c0TENDqehQoIaaVDP/g7A233itjnUAqD5yiWSLQEHDm68jQOuvlpHvchKXRedPnZu0hMU9uqNLeEJOuc+PlFN38GjjP7srKySL40jETm/Jkhh5w/zuHAyhRxT+6WaOW6nmjTafwobnduFjaI3HXk9BJt3J2guHHwB+B8313dOqDN8Ur+DLkXMDjnr8RjT2gl8lKW+4GfgVyf/zdUGwy6Z6bepZU63b69PZf9LmTcOBOeHBgRDuEjRAe2MKckpKaUF/cItPEvyNfepkQ1tr6R108UGllQKtpa/JtiWD7Rc7pSwh3Okx0VNlZ6tXmPIlfJjzi3CgUeHWoRbG1HVtA4QcTKJbyOiF1dP2Jkh3imO+U9aWKDR8PKA4snMYRn+wkgAKq995kQtBWsx0sGRJI5m1EaTqGnySNmxV5uaFhhaMuDfkH5m8z/lddwXV72bXzIcWjYIuS6Q0zshTokZz3W8H8fAkqtt8KL3ZrvhsIevCHJT57gIncO8GbWYZvmrcLI54ScITWnyndIOG/2WLTDZLtYyEzHDf+361FpYTRT7qKuwx5CffLlJIcJWYNio9K4PrKoc6TH+rd6I0YQU3yOjKR9851h7WmhTf7PfCQtUtLjH3y7K1quu/DIVJVii/QcFZ3y0gwaRVikFeXufEkutVBpgvF2Ocfm/Kvgdtmb8r9cuOcmDewaZdAYEZAQZ3+sZou0CtQ6KRGqlb2IEZSomQQSGZlT8fvHGOkLqiMkCeZ+IrbN0/SiwsI6QpgIMEZ1MMJQkidkaFsowjb3TczUr78+Kir/C4JxdP95iiTcV5ljc11jUvipJAk8SMNrfqeNeACbu75YSsSav6DF0cVkabAet8YrNVM0DXz5yuFZ9a7thz7uyBn1gJkN6U0P0peLUWUG8oxe0t9FrRNoIPT6DBhXtGBPxiri7AKoeBnuEJE5zKmsvlWVFGajML9nhzQCMiqghP0JAVyRbYs14spvzpgo+8W13wdKkjGOBw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230031)(1800799015)(366007)(52116005)(376005)(38350700005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hvRavIxcWDnJmsTJ+nxrjANnUTyUl4d6dij8kvLTFj5JwZc4qWOVg7C6rfTwtbvrF7Rm1d8F7NsHv7xXN/Zn9GKViX3BVfT0AxPStsGTnUjlz5V2HD6AjgmFMxQshHK9NCZj6UFIy9sZXrOmBD1BLXSxqT4+1h6lqLgRzCAzgQ0FBLNoN/ZR8138CcO73mz/eqKNQ5dYlAk52T03mfPaqNAMr6Vvo91k90UvvbxszGef2zvarJY4BNSY4NOF5u6Srx84MY3/LopSRPtiNcpSMYLiqMOyBHDBtj2yhFeBuidxnpoysM+B6K7dBpV6NE0lygfuzSJyEhMtZYTlT3iaCrcCL8+8I+yM6YdZRafh1gZ7LZXTZ+XRJOEPd5+h0uAsgTLnIo+R5MK2DOCfw+8z9G/siqjlDHkBgmP1UU672ImbnXGbt/R3WrKOhNTrBkk3qi/Rl0rFAFJ+8qMlA+3u9PDOK00wzFunmC8nU7cxGzm0ZsydDakNNK5bXrrCNpUu8eAxONZwrF5/froOE/UVsaEJ4d3M4C9cwgtNVdq+5aKa/8G9vEY3UeP7Ok4R1hEE3Mm80PMRVfsgWJAPz+IkxE341tBvFR5nzWQkbqRV9w3UK5tIXKMYNwpBtaXjq2W9arMfHAcVjxIIEzEaTJiMBn3ndqUaxuKMHXqrdZHgK5MSSiKFrtnomY0/Z1bxNngd3+ID92m1aLs3aVQaetMqPD3/DQy5ImBfL2/B59cAaI5OwMZEkCP2Et4iRLgtNwNJ3Y2XBDCGljVXRkZNWg1jXFFwwU7Y8iOZu0kBiKaf/fgHK/HdhK1brQdBLMoQetItwkxwXwcnJSlHZABFaqLR4FdFOVRzc4Fsc8DFbJo3vx7qnhPyNXY0/jfyVkeN2ATtVxkwF8uTh13d2kCSRUobQ9ZvRffEjVAh82b8BZiGhhwCCmj9/snJhb8Iu8bjhmqVAfRwdiYs5jW7YRZp+GhPw80aP/fi0JhMKZSzFMtfYT3MKDts5CGGJ6m5hunqjG9KvRUQZkOdeTag9QklJXUjq+xmcS3V3l6Gm+5iCIcwvy+HQqbY1c++r1ljFgR1i/d3AbrSlWZcp2dIvgsfwbmarVD0I7YjVYmp0T5c89SUH3jqXKuHRnrfNctwBLEtOHXqk+ZJT8qpjq9gKiY6y1xvCinit3Y3IRqHWtX9m3fTVwk8BHTY/+dqkJAvnfQQt43jpfU02khxYNqpxjOh/GNyzcs5mD0rDP+4bnQdGrwuq9a8/TrhHfj4VB2N113MYayW2Gf+4n35QLOzSA+jTX8mqn/824GS9Ln4sQzkJDQ4idcPl7hJxdO/qloqjN/IZCh+V02PSCqOv/aruH5JnLt+TmAkwAJQSU8SqHYMC9cwrgzAr3ntncrxaqDqv+j/c6QZe7MLVazsHtVDyc8UyWiKiAW9KDIyh6BtseRTY/KDIo30RDvYkwYJl8bOsbOCGSwXVH/0+UZlN68piY9AN+urUAIThaJF2oLRDs97Xv+MI+JkYLEMSngu1dlbYWTGbprIF0gA1ZWnQGdyEVdkvTiwJi9YYWxYy/qOcEiiCkY4poOYTFPbGxes5An/Zs3Awp9nspCKayGjKe4lDvJzUnenNg== X-OriginatorOrg: prevas.dk X-MS-Exchange-CrossTenant-Network-Message-Id: aca004bf-355a-43ca-beb8-08dc7f07399a X-MS-Exchange-CrossTenant-AuthSource: DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2024 11:13:38.9433 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d350cf71-778d-4780-88f5-071a4cb1ed61 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: RmROo4AC2mTaVhj0Y/zvSQQmDHBEzEHVUuVAnna71UbIZXUxf/hiZKdHKYwfhhhQjOSvdkHO0fCspvfbix2rnOs6XjsO/ZylcHAIHNPuH+g= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR10MB7079 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean The external functions defined here are not called from anywhere. So they, and consequently the whole file, can be dropped. Cc: Nobuhiro Iwamatsu Signed-off-by: Rasmus Villemoes --- arch/sh/cpu/sh4/Makefile | 2 +- arch/sh/cpu/sh4/watchdog.c | 52 -------------------------------------- 2 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 arch/sh/cpu/sh4/watchdog.c diff --git a/arch/sh/cpu/sh4/Makefile b/arch/sh/cpu/sh4/Makefile index 7403a2c3047..6d7e05ebc29 100644 --- a/arch/sh/cpu/sh4/Makefile +++ b/arch/sh/cpu/sh4/Makefile @@ -6,4 +6,4 @@ # (C) Copyright 2007 # Nobuhiro Iwamatsu -obj-y = cpu.o interrupts.o watchdog.o cache.o +obj-y = cpu.o interrupts.o cache.o diff --git a/arch/sh/cpu/sh4/watchdog.c b/arch/sh/cpu/sh4/watchdog.c deleted file mode 100644 index a891333392f..00000000000 --- a/arch/sh/cpu/sh4/watchdog.c +++ /dev/null @@ -1,52 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -#include -#include -#include -#include -#include - -#define WDT_BASE WTCNT - -#define WDT_WD (1 << 6) -#define WDT_RST_P (0) -#define WDT_RST_M (1 << 5) -#define WDT_ENABLE (1 << 7) - -#if defined(CONFIG_WATCHDOG) -static unsigned char csr_read(void) -{ - return inb(WDT_BASE + 0x04); -} - -static void cnt_write(unsigned char value) -{ - outl((unsigned short)value | 0x5A00, WDT_BASE + 0x00); -} - -static void csr_write(unsigned char value) -{ - outl((unsigned short)value | 0xA500, WDT_BASE + 0x04); -} - -void watchdog_reset(void) -{ - outl(0x55000000, WDT_BASE + 0x08); -} - -int watchdog_init(void) -{ - /* Set overflow time*/ - cnt_write(0); - /* Power on reset */ - csr_write(WDT_WD|WDT_RST_P|WDT_ENABLE); - - return 0; -} - -int watchdog_disable(void) -{ - csr_write(csr_read() & ~WDT_ENABLE); - return 0; -} -#endif From patchwork Tue May 28 11:13:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 1940409 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.a=rsa-sha256 header.s=selector1 header.b=KCihwvAR; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (unknown [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VpVJQ63scz20Q9 for ; Tue, 28 May 2024 21:13:58 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 96676884C6; Tue, 28 May 2024 13:13:45 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.b="KCihwvAR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 53B1E884BF; Tue, 28 May 2024 13:13:44 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,SPF_HELO_PASS, T_SCC_BODY_TEXT_LINE,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20600.outbound.protection.outlook.com [IPv6:2a01:111:f403:2613::600]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 414B788479 for ; Tue, 28 May 2024 13:13:42 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=rasmus.villemoes@prevas.dk ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y4gvFI5NAgLdE+Lcb4GAXuRY7QZmRPyJC93I3IfLBTnnss3kiJV9TGA3DvdJmk4uc3TJ9nn6e2TRahCAM8sev+xg/Bm1lEpGTTmgzTAALQLEj1AowXJTuZUFDLWKDQB2fopdx2gqG1/ym4dc/PwTcRGPti3ua9C4uy0l6wzxbSZAMhvbO6TxZTKoclo60KPtJC3LYeutD29iSJXfsXXwHIC8Ngnqe2SU9FslTmULsD99G2cZVxuRJqLewy2Yxdpu+WVrdIgQoOqc/oQFcOS4nZEG5dmqeFlt9l0yq0i4XsPeoXLwIWqFT/VEiaCGPPk+iE4LwL5v/mzz4tA+LhMOdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=YswU0XEVpwdGQHB1Thy172b9uXX6TyFdteeOBmVgmiY=; b=HenZGB4syxRVxwAcpcDseCYTmp5W29JB+eM902c/QzYMyj6bx40iyAi3mYYQ7QU9D0pX5EHAwKqJflzlwG0SUaPcmrwq1RNroJRAdKBUQPbmCgkwNJagnW73Sxqcxb+ufk2AsnmciuchzPH5Xh1f678emp6aYYpJaAyXZ89jhY0rgZVkTOMOgKtlYCF5UtDJ5m0gyC5E1CJ4r/7TNTfcYlbb7Cl9bM0T5w2VodZ1eKPXPM9jU5tQkJVU0KTMVhWBfE16sPEG2XKWzOAPCWHA1lf3c1866ju1Q0FlTYmdXcnZfmUpydlnemZvV0wcY6JCwrAyxCePYho2K/m/TJjsCg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=prevas.dk; dmarc=pass action=none header.from=prevas.dk; dkim=pass header.d=prevas.dk; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=prevas.dk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YswU0XEVpwdGQHB1Thy172b9uXX6TyFdteeOBmVgmiY=; b=KCihwvARzGbfJ4hJVwW6FByjXIWXVZ7NGnR3mL0/Nd3sj12b+sUJsSyypPOvwcNdZQ7aavMUyUzaaRy0erbMupE+mSdyrRKyIk7mOYPY4shAkml+vT0C5MxpRzAdXpJBPJOrkylkzqP6n5v5drTwp9sS1L1C6DRdDIqCqm9Nt10= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=prevas.dk; Received: from DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:45a::14) by GV2PR10MB7079.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:df::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.36; Tue, 28 May 2024 11:13:39 +0000 Received: from DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM ([fe80::9fcc:5df3:197:6691]) by DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM ([fe80::9fcc:5df3:197:6691%3]) with mapi id 15.20.7611.016; Tue, 28 May 2024 11:13:39 +0000 From: Rasmus Villemoes To: u-boot@lists.denx.de Cc: Stefan Roese , Tom Rini , Rasmus Villemoes , Christophe Leroy Subject: [PATCH 6/7] powerpc: mpc83xx: remove unused watchdog_reset() function Date: Tue, 28 May 2024 13:13:24 +0200 Message-Id: <20240528111325.2163560-7-rasmus.villemoes@prevas.dk> X-Mailer: git-send-email 2.40.1.1.g1c60b9335d In-Reply-To: <20240528111325.2163560-1-rasmus.villemoes@prevas.dk> References: <20240528111325.2163560-1-rasmus.villemoes@prevas.dk> X-ClientProxiedBy: MM0P280CA0066.SWEP280.PROD.OUTLOOK.COM (2603:10a6:190:8::9) To DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:45a::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9PR10MB7100:EE_|GV2PR10MB7079:EE_ X-MS-Office365-Filtering-Correlation-Id: d119f6fb-f7f3-473e-abe5-08dc7f073a0f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|1800799015|366007|52116005|376005|38350700005; X-Microsoft-Antispam-Message-Info: wkbA2Nm/07UiMwxyz4SPpPICY94kNnfaQ2AA3wT/f892IfYTDUk8KRrLsrdCWayYGu6PAk+bzhQ+AWECc7JwhWx63fLahMVdpeDZMRaxtNAgg3xmTcjwisZxwGoFjMUAX+a3sL5q1xZ6t7bXHUjrec3h5qWHPQtPEZFOUag6t3z1jtsNysXCb0WOn2v1F1nJYGD4CMnvilaR725LkVMSk1iDL0ImAiaHsUpLN0/F6C0OdFG5emvSeU4zXnJjj4lylGnOhF1Q8PMPMUa2L5qHjIPwQ5jzM/UbVIaCGgvSg2B8pN00XQWABAu7e6J+0WN3YOKyhHHHOFMk78AdB4xe3u1yx/iR0Eq9z4YGwV8ykkHfeZ8cV9N1ky2/zCUUQKeHoHAdqvg+bRr4jIPMjVSOiuhB7bWY7TkVUe9X1NIaZSlpPqmMNf2yAD48ifbb0bjBGeUCFDqUkP7K0eLNj8qX3ZWd6DgtfovKNo+a9itYpVBrYNRMiDJWi6HEbFQXXMpHrRgFGGf3mffqKTZYnzwwi4AL3FbqUzRTOj6ev9AgYTzLnE78aKVotnSUoAmW/1NW0rNNYbj7pDOsCzUR3THi8v0O+cYndK+1T06Ke60da810C0JWV4AcTv94Qji6fLPQMN+QzFgwi4jK93BY7vVl6AxuPgIqH+MyRhryhwMVa54wJOENWz/QoRSeyrIR8iWqs+cKDS8hMwrx7UaucZ1HR1rzkm6sTgk40KDaogivjTQPWfOLvIyPiWjHTBaOR/uNo5elG0xrDdDzdbhbwA5CEnsFGryZYkVPEgRQXqWTCKkkBND4phGWKCo3Evy4CW81Te/lxXUj0S0giLmV4HSv5hoN7xrnl1qovImTQF9Ne7c304fOMshmYUp7gTpmylPB3+Zjmzbg8z6Aj3K1YBQn+rWCmQEvR6Q2XVADDqlSh7/RlJ36SlsplJsbHKGxGkzqT+WM0/cFOioT/vtGIe6IZZDPnYQlpy1Gg5b7iQbeuGpTNSFqNwY1jjYm7kusuiQcjSVHUxFEcpQPlbnCAvA1/6JxsIOrd5auhilLQ7nnsB/2LzpI++AOJhaBRvisUaX0L57P93JelFOHSzrf/KQO+QXdV7Br3uaL2Ao+6nImjRZ1IBpSd1EUuCsmKRXz1SebYSIFl5Pj+3hJmalXDH7BTyKNID4JMO+DcEWrwnd22Ek4RHZpQ5HoBRCyetI4F/131wt9yS2L/g6X2Q1SBxegYy1gj47Op4AZUT0kw7Q5GdhcF7AC6JxjCWLUPb36ELT5tjUJUteEPJIZtCMiY4zIM7dXKtxGbE0myuG2Yp+sSJFOD53GJuDFc/RDZ8mpeRk7NQTiyOwGtnVTjGqVkujnqA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230031)(1800799015)(366007)(52116005)(376005)(38350700005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ly1GGtF7No87tZgq6g89JzikiqogJApOOrBGDh4nVVNo18pXuYLJmCCASmzLRulIhEWbhEWO3yhwc1EwH/EeyoSiK6/i4Ut4RYGOhu141SKltsLdOIaYMwSGZ6k/uN05BmqJQ+A+LUGlYo0nph9PovNlhqYa9qHCEX87CJvSVulbawi2ga+q/IGZ9UY2xjRfhPAeAhJ00zWSkGZAgQ1crvxo9JQUJdKQGvX1wuETJTpHDUdu1cWcZ/hKpngLMr8bd69MUq3+dcYA49GfxyfY03qsO/t2EZlY78JDwQd2cFr1baeigfKKRI56PEZuc+DsGmmBSap4ttjuWMBct2WErmSncB9PMDnZtDfoRs6GdUhLIOOTyx19H3LVrqVJa9T0RCCgRJA/k4+8iUyaVK2+CSD3k1fKBamVFWLlU7yjcUmss2LcAeYWfeUZy7fX0GgKol+amA8jndaQCqikipprgIkQ7S0e1auoKKfDOpYA6dCIOir98sK+uoqABSRf++puqijd8J0ZW1eFHYbn0Gc8IctkpsyhVchwe6GgXp0/iRU279yzM38W6Vebe1NV+PQiMMGx6Xv58jHPAmoIKT+2LGTrau0Og0fQKpT3ZJJ8EWaOBuBs4L80ynB0duEi5FNs4kNvFYjRQB/Tpg9+akUPHXbWeY9pTwZVP/SiALSPEHqzEI+SDnFBIj5rnyJeNutrnHrkqVj7bDFNUs1MnrHFZpPvkglpmcKUuBURijMLU0sqhYuB7sbHCXyf78Ia1w6DcafpOhhMRS1xEFycvzF+epoaYH9aLdaDBd5CFfq4n8jijQQ60Y33C/N72jRxrYEEMU4QKTlx36sAaYFno9xCIS6bI3tBlewhNWQWsHoVDqnh4/jlNuH8yIee/RJ6X7QNSJCR7c4FivZmh5s/89BJat0OpctHDaVKM+g3gDUViHTPeBR6iOEtuJHTM1VV3ekJo7aEaemXbePXKuXgXB4NJ5w6zAgFE/I70pf0uCEacskvG3dyp4wMQ5pSu5xb+FwwApyX1ShN1E4e8Vlkw0xLXlDzi5qfHykiblFSM0RtntPqlo2AkIdJNu42gUz45eAiqgnZ+wP0Wi7pUVQHbtCFO29Eqy5eyLGZBIxdcom9GR9dO02u8xmPOHlP+5cjlWEiu+uO6j2FEO949gKTHobiv8GB2JAfhwH3HXs4kVfCQPJXV5mhSTKfiUrm+toWKofoka9dQe14s/HzIewhMevl+8Ycrif/7ZJmFGaO4fquEo4Qu7/b/6N5bfC2jw1NgECy4JeC+b078UdZdV+zGYbx7dFyiBQpecIGlllktmwgLiuHxySQg0V0mM3+4/v5pcf/oG9cl8dz6ndQ9uc3Ee4yF+cUcmEeiKCWqRCGjfqvkkEVSjhxlK6N4vZ4F9NexyEUxyobNlowDonYUMdqEjCEIA07lyTEYeFsOmSgM9I3t7Gvh+lS6c3EObauvysDvM4cumy+Zkncwfs5IPyaC4L5XO4ts0kr+/MuDlIOG3rF3snxuK8U2dfrSqbQwzJ8DND0HRTwaDPLerYPs/L8MHpWiJLZuuGJ0CaIrqnshD6a3L5FZc3n3QE/ruCHdsivIGLdbHNKO4TpF7DIbUuXMw74ew== X-OriginatorOrg: prevas.dk X-MS-Exchange-CrossTenant-Network-Message-Id: d119f6fb-f7f3-473e-abe5-08dc7f073a0f X-MS-Exchange-CrossTenant-AuthSource: DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2024 11:13:39.7134 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d350cf71-778d-4780-88f5-071a4cb1ed61 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: dqRdSzl8IV8TGzZwcYK3xdMX5wx4HuUq9Lt0f6WRndh/VyT4+FzPv/gp6LsCFDFPJx3622Oqc9tt5t5RYoP7CuEcz5NHPAB051kWc2C8yBk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR10MB7079 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean There is no longer any code in tree that calls a watchdog_reset() function. The macro WATCHDOG_RESET, which used to emit a call to watchdog_reset(), got removed two years ago. Cc: Christophe Leroy Signed-off-by: Rasmus Villemoes --- arch/powerpc/cpu/mpc83xx/cpu.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c index f6ffe295b8e..4ae26013272 100644 --- a/arch/powerpc/cpu/mpc83xx/cpu.c +++ b/arch/powerpc/cpu/mpc83xx/cpu.c @@ -165,21 +165,6 @@ unsigned long get_tbclk(void) } #endif -#if defined(CONFIG_WATCHDOG) && !defined(CONFIG_WDT) -void watchdog_reset (void) -{ - int re_enable = disable_interrupts(); - - /* Reset the 83xx watchdog */ - volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR; - immr->wdt.swsrr = 0x556c; - immr->wdt.swsrr = 0xaa39; - - if (re_enable) - enable_interrupts(); -} -#endif - /* * Initializes on-chip MMC controllers. * to override, implement board_mmc_init() From patchwork Tue May 28 11:13:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 1940411 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.a=rsa-sha256 header.s=selector1 header.b=bQOt84Mw; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VpVJg1BDZz20Q9 for ; Tue, 28 May 2024 21:14:11 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 57C2C884A4; Tue, 28 May 2024 13:13:47 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.b="bQOt84Mw"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 477E888489; Tue, 28 May 2024 13:13:46 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,SPF_HELO_PASS, T_SCC_BODY_TEXT_LINE,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20600.outbound.protection.outlook.com [IPv6:2a01:111:f403:2613::600]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B10C588494 for ; Tue, 28 May 2024 13:13:42 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=rasmus.villemoes@prevas.dk ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WqZ+SsBd115tXLde5Du08BkmQHh+a3dl7cbfVUwegfN89+9JvzZLLWeBz1TgCf9D/vIsrfmICSDZdWAa22EiQGITBrdntix+uLi5MOD4dcJwv9aa0wzsR8Z2Mm064nO0IDoa9YdxKVAgaXzY7sOgX3zshk9oNRxpperNJ+aTCMvPvDhxE5LPN9fK5+SdMDC6/Z7hREO883hMmelCJjaW1cgsRv7oRdZK/RFMYI9zy+ORu3lmPJrCwAdgWZZ9Ps2LHKkkBCPNid+fNG0R1kET728t9ocvB2rg1Ek5DhQ7cOFQay0aH7meAOIpNJ5VMeuusrFbkW5BWk1pvX6gv6vgew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=zHQYM2am0ZyyFlNmoF0H4MN1ppsWtGYovEGojZR19Ko=; b=diJLxc18C2sIr+AN+RnyDU8jv3OBBXFrjHymPM7pUkdiInMdMDSPvFTkBTokNKVdVMKL1b+i53pL4mA0Q7VdMcqsNcQC0FpdZikWDqQTnBfOweJ0fFv0SwvyqV6B+2cgvE0sHVxTsKAjYpAXc52vmptenIHQODoPAcrV7iQe02hFOpZzvkFXD+/iDNXOj85xpH2tECh31gXE8UA/LpG4JvM74L+PLAOlnMvQVpev7fZD1XQwo5hGuijrL9DY6l7fCCv9nGMVAaCizRDyWuZKyfatGAVNm+9kCLCWy3sv5ni4loC3h6vqM9hsv9WIQ0FDkJMHeaEvV1zMvxQwv7ROgA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=prevas.dk; dmarc=pass action=none header.from=prevas.dk; dkim=pass header.d=prevas.dk; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=prevas.dk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zHQYM2am0ZyyFlNmoF0H4MN1ppsWtGYovEGojZR19Ko=; b=bQOt84MwZUTQ0HnSuvBOTkubygR40Mds0oD5GrZRjP2wyNLg2pLNxn/KxxHiMfX+wZW0lCgT3wnu9+DC1s9A0h8RXNOSa3o9qYCrAyLM0yi2QAQXqOnOA3JgCHI9ZNJ4ufGc7pNTKb9Xbu2XnX7DXumIRjlRZMPLzEonD8WgVFY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=prevas.dk; Received: from DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:45a::14) by GV2PR10MB7079.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:df::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.36; Tue, 28 May 2024 11:13:40 +0000 Received: from DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM ([fe80::9fcc:5df3:197:6691]) by DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM ([fe80::9fcc:5df3:197:6691%3]) with mapi id 15.20.7611.016; Tue, 28 May 2024 11:13:40 +0000 From: Rasmus Villemoes To: u-boot@lists.denx.de Cc: Stefan Roese , Tom Rini , Rasmus Villemoes , Christophe Leroy Subject: [PATCH 7/7] powerpc: mpc85xx: remove dead watchdog-related code Date: Tue, 28 May 2024 13:13:25 +0200 Message-Id: <20240528111325.2163560-8-rasmus.villemoes@prevas.dk> X-Mailer: git-send-email 2.40.1.1.g1c60b9335d In-Reply-To: <20240528111325.2163560-1-rasmus.villemoes@prevas.dk> References: <20240528111325.2163560-1-rasmus.villemoes@prevas.dk> X-ClientProxiedBy: MM0P280CA0066.SWEP280.PROD.OUTLOOK.COM (2603:10a6:190:8::9) To DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:45a::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9PR10MB7100:EE_|GV2PR10MB7079:EE_ X-MS-Office365-Filtering-Correlation-Id: 72c32dfd-def0-453b-6472-08dc7f073a7e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|1800799015|366007|52116005|376005|38350700005; X-Microsoft-Antispam-Message-Info: Dcb2QVjtEYrGL/REpGyBy6HVzPh0OTE1DhQOywsrOs0n94VxL7U3g6StiDUvAh6VnTkrz93txjFPVUDP1IExFv2yjDZFj2Y+iNIZSqLcHXCXeeWpJQlph1kQcPZUjAijtHUwVR9xq+2cgX6ZvIMQv+hssFE38gPCQraR7u9Foc4avkc8HYrRO5fOWXXY/o3Lx+6c9MtdugAtq40rYJEisEcZDnA77hQ3UOAbhjKdtxqknEE9genz2fJW7FA4v+S6EGebmdID0Az1R3xE9GQbxjdtpdFU5Ge8u2RR/sgDLcgwGNRfUJ+r85aNRmoeJ5oHU7obNBJfD8rY4yXRw2U8AuzCiGBK7iUDlMA42ysB4Y4iNLOq+3UPhFmUngn0DhIRZjspDxYtzsHPNcNMKGdKMNxc9W+88f+kFN9G2kCFm5E7qG08EruwrkpSlBza99mlj8H2a09tM9b5NZvT7fLSmtzyh9qR8Uq67Y8/AkQ38snSW40gXlpL97LLqvAQUYERHXbX+rbGcA2jJBB3CfS/sbE97CZ34RWiBIbF0ape5Nhkjs7iJbYwM0KAouykBh+PpnpLhkmFRO3EQ1mdmm6YAZBZkcOYX/K9GdTwyoNIqm1AbJ/AJ6lYjGc9UuTWRzWYLIb8uPGE40ZgZ2RtmdFRB7XE+YDUzTV4NURbmzeSijTcaqLytJaR/h1aSryIDHK4q5FeOg0qyFoOIBhFk8Blk+N90TRr0Brv1al7BjWypXG78Ehtlvtdo60dYHC+si1Oo6SIgDrTdZ/+f6z+vZq8QyMyauMf7zYkiZKP2mud33LsTIDk9pd8X76ohE38kM0m1z5XzzOWfwaD+747JiyG6moeuxSh0XiTckLOjksZzT9cBncBZSuCi3HcgRddm7dUUrS9qSsFPogEeFd7AVQozfV7Ass+GTenzVLIl/ZiRYrPcmyGHTC7asbF9phSYbZC7fV6EmiMpD0MU+cv8BgrCIqEKfrSR0n2XI/FtFffC9ef2XknadMfQVR4DJdmw3qFWqfmoe4BN+d4hJ17+5Ii1T/8LFwb+L4rSNygsZe+HKz1xkt5pftaSbFiaPvyK/ycvyw+v4zn+Ug/PVSIn3ixfYWKh+zb9IJ7p5nSyMCBdmPwwBYlrx9ZC+Iq5jCCFvkKrmIrKAoA3Jh3W68rRkKdg/voHZSdI+hdLMNzlrTsT3HHWGIHOT9BbhJAfGEKuoDP/fJcmai1Q8HjpucXTbtpTdmefYrsKk8OpKLo8g+PQQ9o46jFyS7z1/X+BV8U8s7w7+VvbKe2TsDPEmkddjduNwYCiMfTAJ1vflHngWu4NyacY/xGhY3v9G73anYNUyV9tDzMM88j/AFIeZHYEq5O4Q== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230031)(1800799015)(366007)(52116005)(376005)(38350700005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4qmlSpY/LeV9GIY6QnHLowDXrWw931EOzvFPOu9loH57VMr0jE0Xq4+G8dnXmp0MRhVyEMiC2CtuySf/JQTizoRG9/kQPhazOeWlR+1rCQyGJ/cPDMUPMu6YrCLO8YuIEsawOpV4ON2cCoM5Ba6qnlFhAYeo1z/j5jrJTW3P1JK8HV0G09XikNlgotZzUNBZphQ6v9CtTCriVs1YrcNRj9wrad+is3KawL+lLyApd7wOK+m7OAs9iXXYD57gA3B5VOezHd9icls2fAbFTpY5X3Ped1imQikt1aSdgyVejA9PpW6X7ya+wHiNJhEIO353P5ETNzb8BblcgOpcaomBTQ49Qdm9oLb1Kk5q9x274epVW8lW5bTmFtua6Lze8Tk1/6PdfZAQueNQN2HkmXG50+cj5UnoD1tbcyT0LTeoPT5r4Gll4SxpEIjMtSl82UWbCd4bJSkRpoUUyOgXxBCR0WigbKC/sIZrone7CsdZxBfMUaRD9A/eZjJhc+csY6JDgfmzQJYuU5ubB3ADV4VEkH3dWzuX4SYTwQvZWrrBtJJ2YNVb5C0cK/cmErlsjd81IBDoKM/BbJ6laMhV140YNlREF2fudyci2F2zNg1MIOfdUrjLBotNMUxayGcJn5evA0eo4rmovy66Pxec/SGncLOgKWWWKU4ESdX8KRMzNucV4TDC0up5hbLReBpHDV/y0nhfz6NXOjqd6uyYHm1WQfkBVZ4Sppzp3/f4MatrUFNnT/lqaUbTsTY2juYTUO3NTCVLSHqHn75/LO8qPbBAFWRT3iPUHgwolzb/+SnvUjIcFCmObus0/unzaQ5dXFbCJEcf2P5fo5fbHW/ouOegIGcXAinu/b3n9vJPzbJERYMp+qqbVQ0N6eLhVV2nbB9ElCTnQl4D4/v4hRdPB9wcFu8kEpvI+6l3VM7q7GZDWB8vIRmRmjQ0MRRgc4bF/HbyWqHUKh/rOO1jWHHEPEsm1jnw15GHov1eU20K1fTE2xM+JUdiGyfp+pFP3+4u261NdMn+kQMpQaR2DG4e0gY9chBbFeue1hLkaUYRF+050V7zhAyti+CanW+Jhu2ovbYkU+pp4Bixtw+mqdpZhIeCWeiMXbMZAd1tZwme2Jmwf0Lzrba3mXlou+ArQj/b636QwW5tiWqx8ue5mpg9oflbnq+ywBdPZkOoDtnVNy/S0Z8XrhBadD28GUC5UnXtXgBLzf55rsBsowZL0ieCFUiBt8j+RR3GgHrec/Ry2lEmq5IgtHchS0+lhkHD4ncTlH9SFxyDm5jruFSJfjqQ+Ik+l+iZb/xpOPNd0Yy1eA6iZ6z+XQgNiWE/UkvlzttJ3+r2au/dI1tt3CG5Qw3Nn/NztC2wHMKjK3pHIgTEqc8QjqfHvvpO6rIf7kQd2Bnqpv/0t+3NFRGg9e1yDVDXxsAfF/xbvHLxhcZShHNPHZV+KaKiYLlG0TznYhugA7tJ3WmU++ColGBphTUkLfoQn7oNzGPdQkUbUA3o36/NNFu9+tJIWrrsstGWyfKL+dJgaUMgEuEwTB0voBEEb+JGfybYpxzbUSYXvpBpNhskCYr44IfhHVS5W0rD9uFeVA6G1vqsOwZKrcmxu7BVLjSOM6cDSg== X-OriginatorOrg: prevas.dk X-MS-Exchange-CrossTenant-Network-Message-Id: 72c32dfd-def0-453b-6472-08dc7f073a7e X-MS-Exchange-CrossTenant-AuthSource: DB9PR10MB7100.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2024 11:13:40.3737 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d350cf71-778d-4780-88f5-071a4cb1ed61 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 3BFCnp0Li+fDGruEQiLK9iHo52qfe4EmUZ9uGH4jDwR/3pzY3SBZ/Z4oCm4WTuednlgluelJsnnVB9/VKHkZfFAQADwR9ewSd8pOIP66awg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR10MB7079 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Nothing in-tree calls watchdog_reset() anymore (that stopped two years ago with the removal of the WATCHDOG_RESET macro). So that function is dead code. That was the only caller of reset_85xx_watchdog(), so that can obviously also be removed. Finally, init_85xx_watchdog() is/was also not called from anywhere, so that can go away as well, which nicely also removes a bit of arch-specific code from the generic watchdog.h header. Cc: Christophe Leroy Signed-off-by: Rasmus Villemoes --- arch/powerpc/cpu/mpc85xx/cpu.c | 31 ------------------------------- include/watchdog.h | 3 --- 2 files changed, 34 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c index e8a3e82765f..f3ac0ab0da4 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu.c +++ b/arch/powerpc/cpu/mpc85xx/cpu.c @@ -350,37 +350,6 @@ __weak unsigned long get_tbclk(void) } -#ifndef CONFIG_WDT -#if defined(CONFIG_WATCHDOG) -#define WATCHDOG_MASK (TCR_WP(63) | TCR_WRC(3) | TCR_WIE) -void -init_85xx_watchdog(void) -{ - mtspr(SPRN_TCR, (mfspr(SPRN_TCR) & ~WATCHDOG_MASK) | - TCR_WP(CFG_WATCHDOG_PRESC) | TCR_WRC(CFG_WATCHDOG_RC)); -} - -void -reset_85xx_watchdog(void) -{ - /* - * Clear TSR(WIS) bit by writing 1 - */ - mtspr(SPRN_TSR, TSR_WIS); -} - -void -watchdog_reset(void) -{ - int re_enable = disable_interrupts(); - - reset_85xx_watchdog(); - if (re_enable) - enable_interrupts(); -} -#endif /* CONFIG_WATCHDOG */ -#endif - /* * Initializes on-chip MMC controllers. * to override, implement board_mmc_init() diff --git a/include/watchdog.h b/include/watchdog.h index ac5f11e376f..d1956fafca1 100644 --- a/include/watchdog.h +++ b/include/watchdog.h @@ -40,7 +40,4 @@ int init_func_watchdog_reset(void); void hw_watchdog_init(void); #endif -#if defined(CONFIG_MPC85xx) - void init_85xx_watchdog(void); -#endif #endif /* _WATCHDOG_H_ */