From patchwork Thu May 5 11:06:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1626886 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=N+GHf36F; dkim-atps=neutral Authentication-Results: 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=) 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 RSA-PSS (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Kv8yB4qphz9sCq for ; Thu, 5 May 2022 20:26:58 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D044884088; Thu, 5 May 2022 12:25:58 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com 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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="N+GHf36F"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6FF7F83FF2; Thu, 5 May 2022 12:25:30 +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.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE,T_SPF_PERMERROR autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on20628.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe1a::628]) (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 66E4083FF2 for ; Thu, 5 May 2022 12:25:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GF289AuCKM1AF8giQpNNkYB63I4I40gypvzJ2LmoKlycJIiQsoNsFYMGXqbr8NOK5CPMlSZjAR52PeCmzF6VnsvldaXvAyiLY6ltfIAhJrcCLyGmrtdSnvg1KCt5noBuji2wm3dHehiwXBmoJb+ICeiT5gDq7Hpg3XsMgkFQy810PRXfxs8ljfCsXbdD/dqOTRMjnyWrtNh7u+YpsbEkhsQlTLlbpOlm/kqO4L5XFv2aGT62QuqJh3FatcYqLcQu0KDm3wBi2HgOTpccm88tO/qUKMuOWF821e7KN0qIOXxOGklRUCezFFRtyxbwu0gd/tJUTWES9cKWUQ641JiS5g== 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=il4LyziO9RCMa1yKqMN3HcRZ3m3aWUkaTyqX0FB1zis=; b=gUSX6KCAJI30tqoCbJ8ZTiucLn3BV4AdHf4aaJcbN2tTvQbneMxRt0Vof5UY1Og3JKqmK96SJG01zoA75bITGakpvzsW9llZJqN2dJ4MQE5RaNoreoViM4ynLl4ebFFpCR5Auza5hMIIAywUDlx5RackfflnrJdde6RdfZOxw1kt1gLtjMQ6hp4o9BwJ+Yb+jcGmU5DlAohL6RZM9YrZmznc4qqrz9NetZITphwauzip3z6sLWrwQpT9wTZEyzdWt3RTuQaGEVkZPwYdIokQOG25ZG6okmo9jh2ZrU4IB3hxNwaIJIoU4b+83B5u5fiNm/iJ6vGe8cEsYkCyZsZdvA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=il4LyziO9RCMa1yKqMN3HcRZ3m3aWUkaTyqX0FB1zis=; b=N+GHf36F1JS1JVddClLJMZtHyMNcZ/gFK1GxGlZsYUQ6r5HGyLmpvX38WjXWXtmbPVWCtAmW5Lg0uN8cpSckWSvecSyJsOXJBHiNOumLmi2UqtlEO/oxfzdRigStgQvyPdQ33su8YbRfFWJyQF9jHWsd5I+wCZaxzViz8hmWeg0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by VI1PR04MB4797.eurprd04.prod.outlook.com (2603:10a6:803:5d::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.27; Thu, 5 May 2022 10:25:20 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::fc66:662f:2a82:1420]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::fc66:662f:2a82:1420%6]) with mapi id 15.20.5206.027; Thu, 5 May 2022 10:25:20 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, "NXP i.MX U-Boot Team" , Tim Harvey Cc: u-boot@lists.denx.de, Peng Fan Subject: [PATCH V2 08/16] imx: imx8mm/n/p-venice: enable pinctrl_wdog in SPL Date: Thu, 5 May 2022 19:06:04 +0800 Message-Id: <20220505110613.31314-9-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220505110613.31314-1-peng.fan@oss.nxp.com> References: <20220505110613.31314-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SG2PR04CA0192.apcprd04.prod.outlook.com (2603:1096:4:14::30) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 340e25ea-ac8b-434c-86c1-08da2e818e48 X-MS-TrafficTypeDiagnostic: VI1PR04MB4797:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0Q/IR2A5nL0XdqUZNiDY/mfPILizl6ZzyGcolyHQ4egKjmS5kEGNanCzZTNY4oW/ypjZ8F4f4LTfGTt7DxDOD5IO4gkg/TTaSqRBzOAWUfxOBCyQr+ujkyqRNNA04sIady133S+EX0RxG32qoWOA7euAMPkYoYsv6CL0uq3tuVMdFPpcQhCt2OvqxsegfNVrvw9bhSGcYJZCoh0WcKbbmjtpuVRPSl8dV22+3nV0R1MvBmfxGYGUUPOELBer5do5FuRh9cwJIhWxI/7lYINw9zicZpgaEJHKVjWcmaoB5ANx3tLHQd4rLmHWm9vvHKaFWiLWFvYtAfKfe6VtZqSKzwFc/oXhjyJTdmfvP+TGfwXOzTVWYfvUdSbdUG5Zaxed5WRFyWdZetJA+MM5nBilfm4TGQLpTWijW+nBEcs3P9wIMsCJNp2NFInVK/xj9XCp/S2nHUIEt996Si2he3oV67iDuu0Tuq8qJgru5htTU5fDiUr7Wc+vGRzIrehecigodHsAHIQ4QHWlp2VIx6NbmzmHLG+aIxk8G7zjszNfnytLBbJIvMqlsDROpcAs06Lb/Qc8shUWk7UdmKmQCw9JX0fMvsjXyDuOS1VscnYOA9b6DZPLzpRqIIhFQA3DGYk/AMAf6ufwHIgxMFPRvUhBeqC0z3QIQbjqspMQpjKyCx4gRcW+Epsldy/WuRUdgMtHPo7/fNHFq3RnwNktMIrnwBJGL16qdDmu3s8soW1Qvyo= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(66476007)(8676002)(316002)(508600001)(66556008)(66946007)(6512007)(4326008)(110136005)(38350700002)(8936002)(5660300002)(6486002)(2906002)(38100700002)(86362001)(52116002)(26005)(6506007)(6666004)(186003)(1076003)(2616005)(83380400001)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: l00AiIaFhi1V4eoPxPi66BNhB1Hws9MwQHJxQT6PXaB5pCNLFPjUNElqjJes9qgCtMU5LcOhy4jamIB+mgdzBI8vaWE89tHelGdcKAuCW0Dl/wHngQp/3O+fFSiQYmytPeMUjzwBTC7tgYf/S92PIJu2jLirUzIIqp3BH8IQhdxubtI6UjcUMGvsz3GfrIWSY60kCM+aFV+0mENN6mwmIfx7lCaKH0naKMKlaaoOZR5GkBrEJye7PCxEabGsM1r/lVXBAeA60QNJfHRaxrYGR0C/G6mg0pcXuQRM3z5OqdLJvtqX6ThyX4Jw4B8b2t6dfeUap+0DZbfqWFiaFw8Nx+v4BD71bE03EjA51t65aj68NCMVKxBxYK5zNr1AMaCeUz+SH3Cz2oBJIz7KNP8GBwHxAPSXlRFdZ3jHKAFkmuFXlFIV9CXB67rdOe9w4yZK6sfaT+ZYt5hiqWB9m9b0tDvhyjBe/iYgBd7FRThhwjTHcTgfCoQ2XSnmtDmRZsdcLbGWVSolyFUamLZ8LJbbHJDFMhFRmzbNjhcnGFn/p/RT9AuVwjkvrsXPR9LJ0gDF2FY7XrFA5wBbY8Dhfzr7v/MTQHje84EJVyHjWIWmS7TdYjbyeOkqJ5sj86OIFnKa+SnkjMIfJg56QTDW/Uwa6e86YkzmDqPBDU+EtA8kUKtCn18PWO3yUG0YNU954Z2JVAgcVlpzqPbnotWGbszywyIW9GuXJOexqBPlXe1+ZTUfMx2OXBoeYgBwXWPl3hftwKFfaUerjLNNfG/yNWyArD1bkVRX02iW0Vl+2RcPfp2oa35CU42LZja7XXylj7O47JWP5BgMpzQN4r9ysoSDhnehMqvm19m6gNpB3a6yf+HRvDqqgGEaxZ+DOlcKcxaHbXRTqpm/RBr0d6qjK6Ka1i+c9jLiGD6voa5X7Vvb+/Q9XAUPjlHWSeYssiX43ca8Xy3nSfM6M4kwAKkxEeW9n5FuCxB3xy9LrLbMDRmUbtH5f/hcbCiWwf6qPcgfzsxxF9rFK3FnWOPE45YrhhtcMju1VLPGmAiY66mLrY6KrzYnaN4HHBu4oDfECY1BRJjbHHz8U5nfbxQAcB0tDAnK1Vh0qfxMCEVJlRfWlm91rpnZfktbjAITsATCTv5J2KRXfoxJuvtrmLqUgPrO+Unm0SBx6zXSgWFOU+POS//GsXWMSu3OidwI+aBUjchqCNu6rDb9r9XzlcicPvH78QLJIxC/2/UxHv6opJCV74hvuwFZdBZtD/IAtncD8I72WYZvUBW2Kez+aVKkecxB8mIjDz9bVaUKJ0nXjFN7gmHaYBO3EJ5xdcBK6IIOMi+LyYAt1osBuTMoegrXRAaC8Za/SvbQ4125vhlHwBjWpUtYyqHuZlLwpXDRULhaYBX18SWKRml44YdrwVHAqDtF67ub6zHDItqwocYe8LAgjJgOKEfktcyrwLp0FmfXjnFhOYfcEF5dMMJZ7jF9vdR7Si1d6upQtTnWiRfb8L+ZjGHis+xyqeNf+ej1Lfaypoe+TNNTm0XFhWoqQlaOSJ4q4tDCKBoytpePcYb4xfPUCnb2dwcajrXeF/CUWtV5t1Dl7xQTbZgQJUVsu4OFlE9iDQIyJwpz3DSlDo+pgQV2Xa6TJf+Z6274AQcmLuC/jfXghTXOrjpBTZcWXxkVkoB3OF/eBK0gEfVrvoBQCpd+1HTPCALL34fZztdi81YSrnNRselaTxqbLMkBoo1J8WuYQtH+mQ== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 340e25ea-ac8b-434c-86c1-08da2e818e48 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2022 10:25:20.0841 (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: VVzpitYYhir91ruX2mS7WE2TPZNLBs9tUulhVVpwC7GZGI1Mddx2bRD7ctLY/fgsYcfdsrPeqhQEpsmmSHM/xw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4797 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.5 at phobos.denx.de X-Virus-Status: Clean From: Peng Fan Mark pinctrl_wdog as u-boot,dm-spl to clean up board code, The set_wdog_reset() function is not necessary as this is handled by the imx_watchdog.c driver due to the 'fsl,ext-reset-output' property being set. Signed-off-by: Peng Fan --- arch/arm/dts/imx8mm-venice-u-boot.dtsi | 4 ++++ arch/arm/dts/imx8mn-venice-u-boot.dtsi | 4 ++++ arch/arm/dts/imx8mp-venice-u-boot.dtsi | 4 ++++ board/gateworks/venice/spl.c | 30 -------------------------- 4 files changed, 12 insertions(+), 30 deletions(-) diff --git a/arch/arm/dts/imx8mm-venice-u-boot.dtsi b/arch/arm/dts/imx8mm-venice-u-boot.dtsi index c61c6de935f..68978a0413e 100644 --- a/arch/arm/dts/imx8mm-venice-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-venice-u-boot.dtsi @@ -72,3 +72,7 @@ &wdog1 { u-boot,dm-spl; }; + +&pinctrl_wdog { + u-boot,dm-spl; +}; diff --git a/arch/arm/dts/imx8mn-venice-u-boot.dtsi b/arch/arm/dts/imx8mn-venice-u-boot.dtsi index 4f23da35676..35819553879 100644 --- a/arch/arm/dts/imx8mn-venice-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-venice-u-boot.dtsi @@ -110,6 +110,10 @@ u-boot,dm-spl; }; +&pinctrl_wdog { + u-boot,dm-spl; +}; + &binman { u-boot-spl-ddr { align = <4>; diff --git a/arch/arm/dts/imx8mp-venice-u-boot.dtsi b/arch/arm/dts/imx8mp-venice-u-boot.dtsi index 37f3edc9817..96b9fa89cf4 100644 --- a/arch/arm/dts/imx8mp-venice-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-venice-u-boot.dtsi @@ -72,3 +72,7 @@ &wdog1 { u-boot,dm-spl; }; + +&pinctrl_wdog { + u-boot,dm-spl; +}; diff --git a/board/gateworks/venice/spl.c b/board/gateworks/venice/spl.c index af196e5b87c..4c0feb4381c 100644 --- a/board/gateworks/venice/spl.c +++ b/board/gateworks/venice/spl.c @@ -87,34 +87,6 @@ static void spl_dram_init(int size) ddr_init(dram_timing); } -#define WDOG_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE) - -#ifdef CONFIG_IMX8MM -static iomux_v3_cfg_t const wdog_pads[] = { - IMX8MM_PAD_GPIO1_IO02_WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), -}; -#elif CONFIG_IMX8MN -static const iomux_v3_cfg_t wdog_pads[] = { - IMX8MN_PAD_GPIO1_IO02__WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), -}; -#elif CONFIG_IMX8MP -static const iomux_v3_cfg_t wdog_pads[] = { - MX8MP_PAD_GPIO1_IO02__WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), -}; - -#endif - -int board_early_init_f(void) -{ - struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR; - - imx_iomux_v3_setup_multiple_pads(wdog_pads, ARRAY_SIZE(wdog_pads)); - - set_wdog_reset(wdog); - - return 0; -} - /* * Model specific PMIC adjustments necessary prior to DRAM init * @@ -254,8 +226,6 @@ void board_init_f(ulong dummy) init_uart_clk(1); - board_early_init_f(); - timer_init(); /* Clear the BSS. */