{"id":2225786,"url":"http://patchwork.ozlabs.org/api/patches/2225786/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20260421-wdt-v1-1-0bd01ec6a7c4@nxp.com/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260421-wdt-v1-1-0bd01ec6a7c4@nxp.com>","list_archive_url":null,"date":"2026-04-21T14:01:27","name":"[v2,1/5] imx: soc: Get watchdog base addresses from device tree","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"fccb48d21fe6463c5c88c48ce7096ff680bb2fc3","submitter":{"id":80695,"url":"http://patchwork.ozlabs.org/api/people/80695/?format=json","name":"Alice Guo (OSS)","email":"alice.guo@oss.nxp.com"},"delegate":{"id":151988,"url":"http://patchwork.ozlabs.org/api/users/151988/?format=json","username":"festevam","first_name":"Fabio","last_name":"Estevam","email":"festevam@gmail.com"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/20260421-wdt-v1-1-0bd01ec6a7c4@nxp.com/mbox/","series":[{"id":500836,"url":"http://patchwork.ozlabs.org/api/series/500836/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=500836","date":"2026-04-21T14:01:26","name":"imx: Switch watchdog addressing from macros to devicetree","version":2,"mbox":"http://patchwork.ozlabs.org/series/500836/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2225786/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2225786/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com\n header.a=rsa-sha256 header.s=selector1-NXP1-onmicrosoft-com\n header.b=wXQxXL8c;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de\n (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de;\n envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org)","phobos.denx.de;\n dmarc=none (p=none dis=none) header.from=oss.nxp.com","phobos.denx.de;\n spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de","phobos.denx.de;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com\n header.b=\"wXQxXL8c\";\n\tdkim-atps=neutral","phobos.denx.de;\n dmarc=none (p=none dis=none) header.from=oss.nxp.com","phobos.denx.de;\n spf=pass smtp.mailfrom=alice.guo@oss.nxp.com","dkim=none (message not signed)\n header.d=none;dmarc=none action=none header.from=oss.nxp.com;"],"Received":["from phobos.denx.de (phobos.denx.de\n [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g0Qpn1fJxz1yCv\n\tfor ; Wed, 22 Apr 2026 01:13:21 +1000 (AEST)","from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id 98B3884329;\n\tTue, 21 Apr 2026 17:12:19 +0200 (CEST)","by phobos.denx.de (Postfix, from userid 109)\n id 3AFAD839D5; Tue, 21 Apr 2026 15:59:24 +0200 (CEST)","from AM0PR02CU008.outbound.protection.outlook.com\n (mail-westeuropeazlp170130006.outbound.protection.outlook.com\n [IPv6:2a01:111:f403:c201::6])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))\n (No client certificate requested)\n by phobos.denx.de (Postfix) with ESMTPS id 36BFA83693\n for ; Tue, 21 Apr 2026 15:59:22 +0200 (CEST)","from PAXPR04MB9644.eurprd04.prod.outlook.com (2603:10a6:102:242::11)\n by GV1PR04MB10426.eurprd04.prod.outlook.com (2603:10a6:150:1cc::21)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9818.33; Tue, 21 Apr\n 2026 13:59:18 +0000","from PAXPR04MB9644.eurprd04.prod.outlook.com\n ([fe80::cf3:c5b0:7a0c:d11b]) by PAXPR04MB9644.eurprd04.prod.outlook.com\n ([fe80::cf3:c5b0:7a0c:d11b%5]) with mapi id 15.20.9818.031; Tue, 21 Apr 2026\n 13:59:18 +0000"],"X-Spam-Checker-Version":"SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de","X-Spam-Level":"","X-Spam-Status":"No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,\n DKIM_VALID,FORGED_SPF_HELO,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,\n T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2","ARC-Seal":"i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none;\n b=K/roeN9ERb8OXFII98lQ+CHvmdfsBTGY5jxqPbgQyiAd6VHU7xS+yWlABBxLXnSomaJXp1Tn+RAplm0Bd2vLqJ8+2YNqBHvvM/Ok5vRowDIMDdtYSSrXE/e9xdG1vnyPZ5t3hQkpjcpEtcQkL+fO3wbUImay4yzk0Z44MQUJR1Nn+zYZiEPdjtUc5obBNrjh9Q4mFPbQTZbpqI0uOQLXt3IvnvbHJbXWarbs91zwzs6l0szrrPOU7wsMBlfxZ0S6RREJvanKUIDqBmlK8DCOmZj4na8nF80u3pn5VhIgCSbK04MduE9vG4G3HyfHibkiZlZ70AYWvuSXbeyoZQHTkw==","ARC-Message-Signature":"i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector10001;\n 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;\n bh=XfAX1eYdMkG2rbm5uhUz9W7NrWkRw+TfscS3wNw1pjk=;\n b=SPZRw+UEHXXA9XgJ4g4G3Wl6DEdEfmV9NKGpEOy2+iqLaHadqEpg5aSEksCEzlyV34YTaTr3uE6guOohq9J81ECd7BAu51bVNS9Eb6/1mGcZ6xlage1NOyvyTP5DVMjX9lRr8P2tO/Np1zidLov8xz9Y7cAg6wGCZFXu/Sxqa0hTnob60dWK6R5Qm+S+EZasWV4oHCjtdzIQ9PJOdW4lImsyST2QN7BY71ztK49NxjGPzN1JUx9csvR3fPSvuzW5ENbZ46emkmIfJECfmxqGDJib5Sdo3tLqKotpzRuC5Pkw9u2mCARjo/6TcZNVszyFI5b1ZQ0GgLrHZp2U+6bvnw==","ARC-Authentication-Results":"i=1; mx.microsoft.com 1; spf=pass\n smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com;\n dkim=pass header.d=oss.nxp.com; arc=none","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com;\n s=selector1-NXP1-onmicrosoft-com;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=XfAX1eYdMkG2rbm5uhUz9W7NrWkRw+TfscS3wNw1pjk=;\n b=wXQxXL8cwAopYRBk9eBV+On0GG4p5Wmf0Ut/uTOXcZ9mDL1p0Tsx+jGw9dq8x5lltN2+KUdlqhCl89bQUda5wCUB/mlLG2chSESDuHsG9FkkqZ69E6pDJi4twJMcyTmDO0n0rACdyJS+L0ROS7lPuKPI2QJvl44i+pQBL4auiE5RXyWjup3VVgSeJqS3a02CcSTtLpu8LRes/AZcpEbSX4iVbg/gGy0VXHswB5+IsO37EzgN1zvok2LA+e5qPdZwMXRBa2UP8NuQ1COO4/fhQ7+3YycMMfhQjOsSeePgJAgnlpfVkepk1W0WOSMVXszCqCCgmBlgahKDakQ71E23AA==","From":"alice.guo@oss.nxp.com","Date":"Tue, 21 Apr 2026 22:01:27 +0800","Subject":"[PATCH v2 1/5] imx: soc: Get watchdog base addresses from device tree","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"7bit","Message-Id":"<20260421-wdt-v1-1-0bd01ec6a7c4@nxp.com>","References":"<20260421-wdt-v1-0-0bd01ec6a7c4@nxp.com>","In-Reply-To":"<20260421-wdt-v1-0-0bd01ec6a7c4@nxp.com>","To":"\"NXP i.MX U-Boot Team\" , u-boot@lists.denx.de,\n Christoph Stoidner , upstream@lists.phytec.de","Cc":"Stefano Babic , Fabio Estevam ,\n Tom Rini , Peng Fan ,\n Ye Li , Simon Glass ,\n Fedor Ross ,\n =?utf-8?q?S=C3=A9bastien_Szymanski?= ,\n\t=?utf-8?q?Jo=C3=A3o_Paulo_Gon=C3=A7alves?= ,\n Primoz Fiser ,\n Frieder Schrempf , =?utf-8?q?J=C3=A9r=C3=A9mi?=\n\t=?utf-8?q?e_Dautheribes_=28Schneider_Electric=29?=\n , Jacky Bai ,\n Stefan Roese ,\n Francesco Dolcini ,\n Mathieu Othacehe , Lukasz Majewski ,\n Ernest Van Hoecke ,\n Emanuele Ghidoli ,\n Max Krummenacher ,\n Wadim Egorov , Sumit Garg ,\n Tim Harvey , Anshul Dalal ,\n Franz Schnyder ,\n Sam Protsenko , Joseph Guo ,\n Ji Luo , Marek Vasut ,\n Alice Guo ","X-Mailer":"b4 0.15.2","X-ClientProxiedBy":"MA5P287CA0088.INDP287.PROD.OUTLOOK.COM\n (2603:1096:a01:1d8::9) To PAXPR04MB9644.eurprd04.prod.outlook.com\n (2603:10a6:102:242::11)","MIME-Version":"1.0","X-MS-Exchange-MessageSentRepresentingType":"1","X-MS-PublicTrafficType":"Email","X-MS-TrafficTypeDiagnostic":"PAXPR04MB9644:EE_|GV1PR04MB10426:EE_","X-MS-Office365-Filtering-Correlation-Id":"0ae7a7cf-bd89-4867-aaa2-08de9fae2e36","X-MS-Exchange-SharedMailbox-RoutingAgent-Processed":"True","X-LD-Processed":"686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr","X-MS-Exchange-SenderADCheck":"1","X-MS-Exchange-AntiSpam-Relay":"0","X-Microsoft-Antispam":"BCL:0;\n ARA:13230040|1800799024|19092799006|366016|7416014|52116014|376014|38350700014|18002099003|22082099003|56012099003;","X-Microsoft-Antispam-Message-Info":"\n Xse6rnek2uc9jFN1DqVZnoXG5K/x5jYGEPFpAyiKmG3Zvp8C8WeFr4EUfH2XqPXDZ+UdPE36TyuvvlitwJ0zSncwCFzOx+fMNOHh04b2OCwNMN2c8omQbT1o7IzG1ozIk4lMPfP5CHvNwDNgYXGK0UeGclMQOEGacqqsdWttoAiiLGSLYoIrPCW0J+qIROiuPWkmdT1f5ThFWjAWu+Mh8JMZY3Hnv/WaYce2TfVSALH3PjE5/tsNoiThdoj7lZn6i2vtVDS3z5ZeGge/cno1l2R3SOunQ9L4Ex7pXf4AZOBW7DrX4tqajaSEogJ73L1CHmQWqugl34Pv3z+/fcwAd3ihfIThXpDJ0hCTUa8KNxMQK0kb+ZDPOYfmfngfyTQZHs9mJx6hqd5FlXqkIurBAjPwrLhxVnOaEGrVTr+E8wGLe8DwfZX10iCBwHo9d2fclyQcbmnjpfEEQHfCmgqz5QNUm8D4aqZVs6W8m2JqX3po5lh3agz5UB232FuMgQBJdZ5/7xMa4kTVm/hnvfG4feWe6QDCattUzpSXksNoabkKpmV0C4Kfg2ChfYqWNaOD8yYtLpVjE4hxE+zvh62TOC+XpYINQbesCKcluj/ejs5/xpjIpnoaxwvYBtyBz3Jqkcp/JChwSq2bZv9Sqe1gp1xOES5yRnkx2XetUD33VkQJVbLPxCHYFo+hLppElod97pVFBvz4q39fm6tpA03UnoxnyNtuuKhUbpgak0IFJluleubFMyN3H4ynzKrJEdgpsDfiY/d10EAeQffjbGZnCju9UJry8Akrg/DTFVwgEEM=","X-Forefront-Antispam-Report":"CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:PAXPR04MB9644.eurprd04.prod.outlook.com; PTR:; CAT:NONE;\n SFS:(13230040)(1800799024)(19092799006)(366016)(7416014)(52116014)(376014)(38350700014)(18002099003)(22082099003)(56012099003);\n DIR:OUT; SFP:1101;","X-MS-Exchange-AntiSpam-MessageData-ChunkCount":"1","X-MS-Exchange-AntiSpam-MessageData-0":"=?utf-8?q?TgFNSlHPM4jQKnRBBY+A/K1561zi?=\n\t=?utf-8?q?NTcvP9jMw28h6iT38inCZN6mGoHPxYq/3i0ssXLyxrj5BAOdnyIAfSn0XbzlIrLyZ?=\n\t=?utf-8?q?casSknYKQXaOuksgxBKnKR7SZKJzm8lgCtc4zdiyth6ep3gl+tYL8SwJZ4cy8h0n1?=\n\t=?utf-8?q?T87eIIcYGoT4Oj7/74eaiwxl5xKGLsI7gL+JyhbO9IYJYJnOUA6gx2pAi39TmyQTZ?=\n\t=?utf-8?q?WB32IXBX/rboNcw3j7oxiIezOZDAkTokO5jbWdfUKvrRqMNHyv+wJ4C6T4ZLmboTE?=\n\t=?utf-8?q?IBCeTN72NJWterwkR0BOMb0cdJJTeguulkD/hbiSHhKntOm27nQYxPK9jPArJsb0y?=\n\t=?utf-8?q?ZYSONFdtESF8lZX+56uwePS+55/tfnIUiVWZ3EcF3SPAmjSsnvD32hgZWhH78/5vU?=\n\t=?utf-8?q?KIO1wXHeCaYqQkKfZWTFOl0WW4+hHXcMBofnTQzQP+bimAhmmfDWWOvZgDVha3Bl0?=\n\t=?utf-8?q?+2WNOvRX6p/jtmFMRiqcszfBYsJqEUqAawj5GQo7X9k2kt+CkNqin75xRdX6zrQva?=\n\t=?utf-8?q?wfh+KPobfBQ374zSxI+xx7Vzh/S1xrRrErNukCFkVaCFm+rn2X5/XkU2fU9YXoBqR?=\n\t=?utf-8?q?wOLmis7cX7ONAP0ze9MSwWPNQwk+M5GLHAYmzrG1HQaD34/yUuBK3qKW07aAfP28U?=\n\t=?utf-8?q?zeZsi8tQfgsCeU9mKVizCdNWWdxcIsycynGdhTM0pSYkvjmoczQI6TuzZO6IW/CZi?=\n\t=?utf-8?q?j3UNdsaw/3puE77UyHe+ANUrM5ED6DVDJ/85o8PZunwEdznOvIFqnMTNF9ybFrcBa?=\n\t=?utf-8?q?YB1vz3ENqTlBTf34IyLBZi2Ur8PGerA+7aU0tdBwKRXImoLLbk2zlIEGRdsRyMAcR?=\n\t=?utf-8?q?zmRx9Z6zvx+ogz4Tn6eCHqXHPRsVqC7oaqa5mUQ1sSaDfMcKZvuYsjAtBv4zC6PPU?=\n\t=?utf-8?q?sSIFoGQlQuAdvAA4bVzwFLkL8Ll9w8GPSszurILW4bmojKXhI/w/0zuU7YeVUM1Co?=\n\t=?utf-8?q?BlwiTmIFrDxdB9dDI0XsUQqwy/4I1i2V8idHYS8JVpeMFFulPwknmqm9+v1HXhMgA?=\n\t=?utf-8?q?HtVGgexd4WeSoIadSQw61dR5aXXaxZ5W1wATUlND2/QY0h7kGraBvkBj3ZLPg5+tB?=\n\t=?utf-8?q?sjU2oz22UZ9hX/ZGPzcOK/wtl3xLxTefd3th0LUBcwLxnnvyC/0UfAUIpE+qN2RF4?=\n\t=?utf-8?q?RuR62cOu5u7bYLdU67kq1zD74VWboaM/MoSYQsYybk43pnpZ0BaiRAOz3de+/OiRx?=\n\t=?utf-8?q?ynhZE6eE4tGebYlqiX7uF8UV8dyVieQ7B1k+QiX8/Rtn2ZHsc+M4u8YrACxmjhE4W?=\n\t=?utf-8?q?RHKE3WgUitkSHj8l4Phwe9rbVY6039QlO3vmLWAnc/C/gstOgwL2JYJSbROamI7WN?=\n\t=?utf-8?q?BmzuUmV4XkNe4t3KqxBWeKHs39rU9jHkJzcRviXUcH4PKNWKUZa7U58RhBwRRpsED?=\n\t=?utf-8?q?0cE9LnxWMqg4fcilH6pHLlqfOTL3hX8pi0J1kEQjxlQXXCMv9NWqPbL7oshrM+4qR?=\n\t=?utf-8?q?Ggktdvhp07qZe+Oe8hVWicKU0E5HzNWD+iDz8oz4EgPBJ6D2ICJHK3lQ77x0YJgwu?=\n\t=?utf-8?q?71vmDVHcOnQBayBd+ElhIVA7G5oo58CzHsCeS4BBUKVLwpTQh0+RlOnlZQBYm4AzI?=\n\t=?utf-8?q?vyOdP3SWWgl1DaCZZu869xSNKMue/lIAG84ngPBSoQiMMXFZ7J7D4DkBZDlaQWg1T?=\n\t=?utf-8?q?/hZUrxg3Tx8S0ZPS1E9Do91ba7xjFv0Q=3D=3D?=","X-OriginatorOrg":"oss.nxp.com","X-MS-Exchange-CrossTenant-Network-Message-Id":"\n 0ae7a7cf-bd89-4867-aaa2-08de9fae2e36","X-MS-Exchange-CrossTenant-AuthSource":"PAXPR04MB9644.eurprd04.prod.outlook.com","X-MS-Exchange-CrossTenant-AuthAs":"Internal","X-MS-Exchange-CrossTenant-OriginalArrivalTime":"21 Apr 2026 13:59:18.3232 (UTC)","X-MS-Exchange-CrossTenant-FromEntityHeader":"Hosted","X-MS-Exchange-CrossTenant-Id":"686ea1d3-bc2b-4c6f-a92c-d99c5c301635","X-MS-Exchange-CrossTenant-MailboxType":"HOSTED","X-MS-Exchange-CrossTenant-UserPrincipalName":"\n 86vgj+VIzycQ1muHFnCCqQfmqpe7ifVdHLdMCoELW+2LsuHhMx18Zq6hnNADF30zbFztUEH6/hqTVa4xQ1iZag==","X-MS-Exchange-Transport-CrossTenantHeadersStamped":"GV1PR04MB10426","X-Mailman-Approved-At":"Tue, 21 Apr 2026 17:12:16 +0200","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.39","Precedence":"list","List-Id":"U-Boot discussion ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","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"},"content":"From: Alice Guo \n\nReplace hardcoded watchdog base addresses with dynamic address lookup\nfrom device tree for i.MX7ULP, i.MX8ULP, i.MX91, i.MX93, i.MX943, i.MX95\nand i.MX952.\n\nMove i.MX7ULP watchdog initialization from s_init() to\narch_cpu_init() because ofnode_* APIs depend on FDT, which is not\navailable during s_init().\n\nSigned-off-by: Alice Guo \n---\n arch/arm/mach-imx/imx8ulp/soc.c | 14 +++++++++++++-\n arch/arm/mach-imx/imx9/scmi/soc.c | 15 ++++++++++++---\n arch/arm/mach-imx/imx9/soc.c | 16 +++++++++++++---\n arch/arm/mach-imx/mx7ulp/soc.c | 24 ++++++++++++++++++------\n 4 files changed, 56 insertions(+), 13 deletions(-)","diff":"diff --git a/arch/arm/mach-imx/imx8ulp/soc.c b/arch/arm/mach-imx/imx8ulp/soc.c\nindex 1ee483065e8..ec85625ea25 100644\n--- a/arch/arm/mach-imx/imx8ulp/soc.c\n+++ b/arch/arm/mach-imx/imx8ulp/soc.c\n@@ -343,7 +343,19 @@ static void disable_wdog(void __iomem *wdog_base)\n \n void init_wdog(void)\n {\n-\tdisable_wdog((void __iomem *)WDG3_RBASE);\n+\tofnode node;\n+\n+\tfor (node = ofnode_by_compatible(ofnode_null(), \"fsl,imx8ulp-wdt\");\n+\t ofnode_valid(node);\n+\t node = ofnode_by_compatible(node, \"fsl,imx8ulp-wdt\")) {\n+\t\tphys_addr_t base;\n+\n+\t\tbase = ofnode_get_addr(node);\n+\t\tif (base == FDT_ADDR_T_NONE)\n+\t\t\tcontinue;\n+\n+\t\tdisable_wdog((void __iomem *)base);\n+\t}\n }\n \n static struct mm_region imx8ulp_arm64_mem_map[] = {\ndiff --git a/arch/arm/mach-imx/imx9/scmi/soc.c b/arch/arm/mach-imx/imx9/scmi/soc.c\nindex fbee435786c..365891d1d1a 100644\n--- a/arch/arm/mach-imx/imx9/scmi/soc.c\n+++ b/arch/arm/mach-imx/imx9/scmi/soc.c\n@@ -786,9 +786,18 @@ static void gpio_reset(ulong gpio_base)\n int arch_cpu_init(void)\n {\n \tif (IS_ENABLED(CONFIG_SPL_BUILD)) {\n-\t\tif (!IS_ENABLED(CONFIG_IMX952)) {\n-\t\t\tdisable_wdog((void __iomem *)WDG3_BASE_ADDR);\n-\t\t\tdisable_wdog((void __iomem *)WDG4_BASE_ADDR);\n+\t\tofnode node;\n+\n+\t\tfor (node = ofnode_by_compatible(ofnode_null(), \"fsl,imx93-wdt\");\n+\t\t ofnode_valid(node);\n+\t\t node = ofnode_by_compatible(node, \"fsl,imx93-wdt\")) {\n+\t\t\tphys_addr_t base;\n+\n+\t\t\tbase = ofnode_get_addr(node);\n+\t\t\tif (base == FDT_ADDR_T_NONE)\n+\t\t\t\tcontinue;\n+\n+\t\t\tdisable_wdog((void __iomem *)base);\n \t\t}\n \n \t\tgpio_reset(GPIO2_BASE_ADDR);\ndiff --git a/arch/arm/mach-imx/imx9/soc.c b/arch/arm/mach-imx/imx9/soc.c\nindex 44b3e0f5310..edd4ce89911 100644\n--- a/arch/arm/mach-imx/imx9/soc.c\n+++ b/arch/arm/mach-imx/imx9/soc.c\n@@ -281,9 +281,19 @@ static void disable_wdog(void __iomem *wdog_base)\n \n void init_wdog(void)\n {\n-\tdisable_wdog((void __iomem *)WDG3_BASE_ADDR);\n-\tdisable_wdog((void __iomem *)WDG4_BASE_ADDR);\n-\tdisable_wdog((void __iomem *)WDG5_BASE_ADDR);\n+\tofnode node;\n+\n+\tfor (node = ofnode_by_compatible(ofnode_null(), \"fsl,imx93-wdt\");\n+\t ofnode_valid(node);\n+\t node = ofnode_by_compatible(node, \"fsl,imx93-wdt\")) {\n+\t\tphys_addr_t base;\n+\n+\t\tbase = ofnode_get_addr(node);\n+\t\tif (base == FDT_ADDR_T_NONE)\n+\t\t\tcontinue;\n+\n+\t\tdisable_wdog((void __iomem *)base);\n+\t}\n }\n \n static struct mm_region imx93_mem_map[] = {\ndiff --git a/arch/arm/mach-imx/mx7ulp/soc.c b/arch/arm/mach-imx/mx7ulp/soc.c\nindex 5306e76223f..d262039ad82 100644\n--- a/arch/arm/mach-imx/mx7ulp/soc.c\n+++ b/arch/arm/mach-imx/mx7ulp/soc.c\n@@ -83,8 +83,12 @@ enum bt_mode get_boot_mode(void)\n \treturn LOW_POWER_BOOT;\n }\n \n+static void init_wdog(void);\n int arch_cpu_init(void)\n {\n+\t/* Disable wdog */\n+\tinit_wdog();\n+\n \tenable_ca7_smp();\n \treturn 0;\n }\n@@ -146,7 +150,7 @@ static void disable_wdog(u32 wdog_base)\n \twhile (!(readl(wdog_base + 0x00) & 0x400));\n }\n \n-void init_wdog(void)\n+static void init_wdog(void)\n {\n \t/*\n \t * ROM will configure WDOG1, disable it or enable it\n@@ -161,8 +165,19 @@ void init_wdog(void)\n \t * In this function, we will disable both WDOG1 and WDOG2,\n \t * and set update bit for both. So that kernel can reconfigure them.\n \t */\n-\tdisable_wdog(WDG1_RBASE);\n-\tdisable_wdog(WDG2_RBASE);\n+\tofnode node;\n+\n+\tfor (node = ofnode_by_compatible(ofnode_null(), \"fsl,imx7ulp-wdt\");\n+\t ofnode_valid(node);\n+\t node = ofnode_by_compatible(node, \"fsl,imx7ulp-wdt\")) {\n+\t\tphys_addr_t base;\n+\n+\t\tbase = ofnode_get_addr(node);\n+\t\tif (base == FDT_ADDR_T_NONE)\n+\t\t\tcontinue;\n+\n+\t\tdisable_wdog((u32)base);\n+\t}\n }\n \n static bool ldo_mode_is_enabled(void)\n@@ -221,9 +236,6 @@ static void init_ldo_mode(void)\n \n void s_init(void)\n {\n-\t/* Disable wdog */\n-\tinit_wdog();\n-\n \t/* clock configuration. */\n \tclock_init();\n \n","prefixes":["v2","1/5"]}