From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1E316C433EF for ; Thu, 5 May 2022 10:25:58 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 35E2884093; Thu, 5 May 2022 12:25:37 +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="BXseGfqb"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5CA6983F14; Thu, 5 May 2022 12:25:16 +0200 (CEST) Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2060e.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe1a::60e]) (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 EC6DC83F4C for ; Thu, 5 May 2022 12:25:06 +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=TN+pgnnuyyvOfLQeBj3r12wt3ZjgXdKUCvIIuXeCwXC9yZuDw06CmEzFnkfNtnOH93vGKbJb9M0WVOQadMMfZrrGUM/qCjHG/IbzIZl3AH5SyI/o1rIY45B4cyfEgZRGbUJlFQ29iVVeT3jO8Z82p3Y/YjOzC9tS9iqgIs+wk6dIFFxx6zsFO+U0NrG8G/gnvf3qDP2NbY6jlXejbajal3o9sVUKR5B7mEobBfa4cepM+1AqjWZDGDSWSa0+q/cRJ6MTx7tZnFNXkY9KW1N2OIkh2WlIaqq+z90p2ulkjve3l6Qo7uyS42yHxhU+RyZufQoUDW0C3nJQQ+te6znC8w== 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=myc9V1WVOU6FWlIFDaqbHEkRQfGqzpyFo+hyeSQlVGE=; b=Y7qbiCbe/8iYEY/8VdPRw/tyhpN1jsmAZpxlV4Rp7RgqT1Hmzj5PB6GGBugABQTLSP1nVw3Plq3WURxk3yVdFwR1Y6tlBb6AShGZtxMAjLU8vMeHNYBQ3WaPec1oYG1PgIdqFeDbQonKbP+4QwmtGx/IgUHNm4BG6VNK7ocXvSh70F2lHjA0Um8BKPjESTZMtwsMl5tFXE3NW6UcFJYwR4RqVtWCSEisBrScKbTQhVMRAPUCTMXSX33//b+9q1Z106qY2RgtiGeMDfy78FjclC3+ka9E5rFT8eIKDz5RFoO+5FK1fnT7STfYz0/JcE3Qj6oc7pOXonp3jFJGwzFUnA== 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=myc9V1WVOU6FWlIFDaqbHEkRQfGqzpyFo+hyeSQlVGE=; b=BXseGfqbVKnGx2557h7TofmlRpe0Orft86aUQ2ToaocSjMXO6jawD8uFwNC8jNk2ks3cuh93kJPZICNH0zGJeYkpVTZhJemUg7NTooIM0F4DDU2NVY0LtD77h09tvvobr5wbqLAUb1LhYzbvWaePm7R3ZVeY8qotmNKBxhrj7Ts= 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:02 +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:02 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, "NXP i.MX U-Boot Team" , Peng Fan Cc: u-boot@lists.denx.de Subject: [PATCH V2 02/16] imx: imx8mm_evk: enable pinctrl_wdog in SPL Date: Thu, 5 May 2022 19:05:58 +0800 Message-Id: <20220505110613.31314-3-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> Content-Transfer-Encoding: 8bit Content-Type: text/plain 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: e737f0f1-6f97-4217-7c6b-08da2e8183db X-MS-TrafficTypeDiagnostic: VI1PR04MB4797:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True 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: u9wmYUgoNtxMCqPjGnSvUu5K2kmmOodjxwt4lw1gbxYYt4/4YLOrCoFzH2Z3U4X4k7bUU0CfduUADkpbA6MxaHmNhOuvfnIun6aCMSEjshN02DhoC6uqaI1pRetZ4hW0QG39tMbp9HX2JzjfASxieDOr1dh4M/fGTSKYq5mRY4oyRO+1vZRoFETUkzLeCf6XxPtNmG2U6cctQ3vQ+8b64+rACEZUA2LIPu255CR6CuDyOilStzeK7FevxzrmJrVBMCznNbWQrYPMIUIbOpBJpOd1LPYY8bT8fcAekd5h43HH8VlNnYoTBcXwx1ZlOkmYW4e0/ki4v0CiUJOO53vLIOGQkkN2FIN/dIqmrp8s5gbG/XvkoOlo+wYG7XI/cjPI2c4yQw9T3V6Nq4gPmIUpbNDHa9PZZVyiILb2+Rx4ZRSxEAmZFC+97hfHb45DGv96EAg4PWwTFSp6fmm5cN7eqirfkgHTvEgg0vDIJfvQHIYaV+7iq4QpKlILFk0GId1dpatqsYn/uJ7rqvwxI3j2b6RhNQ8HJ8WznRSK+rxJM62ex8Eel/YklR02ZWKCbg/XnOulazleIIqa30XriA240sxEDEy/ruGiJ3jnf/MbkJ5+q1kXf9QgJG37SBj/tCDjqFrhVHg0aWK2WTVe0oB/6MhtRhE/fzXPhAiPWTi6Waf+HzbVztGoDv0PxVrBdEfCgxfCxV3AcPNmBIHAO6CD/A== 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); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Rxlil2IeQNtufWFsj6//OUKXMQsv+qhyEK0NnlwCIqcJmWq3pn8jXoXFFeyH?= =?us-ascii?Q?itbfOIJnz58aEiH6u3s+AubZrkwSZG+6Ajujd8m3FbNElkxWKylCpnT+2S2U?= =?us-ascii?Q?tmw38hSJFlvuikyh/Rcf2yz0FapQ7kF0CPMoB2Au1za1QBqX5qQVX1q0XJ2T?= =?us-ascii?Q?PkZ7yWJAh98pLXR/2yACaqr7I5/q/ZzLI06fC4H8sR0oMZYLrQr6hQV6h7a7?= =?us-ascii?Q?Wr/bEmsSuzW2gqKpBw0750iVeiyQvK+hvyW9DiP+sIw6/y40RNCGVsok8Xer?= =?us-ascii?Q?hLbW8fPtKyBGkq2XMqMg3CaJpOugrA0p1I6wo9aOeagBYeiZEjPdFciA/Erc?= =?us-ascii?Q?mGXLHunokeVi1dzUUr99f0aOjV+dcGSqKESBwXqrT3XED8x/mFdwJ8wh2wvX?= =?us-ascii?Q?JCbqGmZM5D+LGH/YtnFsOTpik88FKPL8sO3q2BBXn9p1xbUXQj2HXTAM7KWV?= =?us-ascii?Q?v+nV7fv9Lelu1/PspHjS4j3Y1nWYYopNMc5Mm2s2HwVhKW36xsSAyZqqrtel?= =?us-ascii?Q?2SU87EAYW0aUqY/QNtruQ4cGQEQcJdVHXZmAFc3v52Q6jXv/KkqhtFj37+Ud?= =?us-ascii?Q?pFy+/Qtvd8bYb5ab/+BYCRnTtEkQNDRKFRya9of343DFucoIDfcz4X9sfVey?= =?us-ascii?Q?bVj6hwSJPrXbdcVfasKtWQTyhP1HYHZ8mA1FV/AXVPV5vtgE3h0AbrUkIUVn?= =?us-ascii?Q?ZScEkTYf3ypVO7pxvdFwKIs5fDJ5K+bTed1qh3MlsNvFwLQzvwYTbKbcXta4?= =?us-ascii?Q?JO8UObzPn853DwQknwMlJufRvB05SpO5xKO2V6obRrjLabykBG5bWm4desmy?= =?us-ascii?Q?1wmbxF/vZofacfPQK0UK6gZssL59LQhOM9wNk+ZnuyINihs71Wivdte7gCYe?= =?us-ascii?Q?yd67D46FicFSA+tBLVqoerBW5rpCmmF2NLMybpKq9035pbm3bNDcWlesWmCl?= =?us-ascii?Q?0WPX/cFIbTTh6nyG/5pBc7sFcJNMPgAEZcsvK8BI2YWzukjKUQd14eecDye9?= =?us-ascii?Q?kpBGwpsa2pOehnnhVmeeLvWeEu2sEOFyd4ASvbKoPPQ48LnvRIzgLeZ5XDIM?= =?us-ascii?Q?c4yXkCNRylIf/bQb91qAzX39bAmrET4VtMCROhDpH5ci07GNMSCd4AZEk3gm?= =?us-ascii?Q?Ma1EC2daVejkWMkpdU5FW6iynIRe3d1AuM0RmostoL99MZqDCF3Cptj/Lu5h?= =?us-ascii?Q?wFBXudMyxGhwYeYarhRZCABqEUZoY0JK2vFGFC4lhC/7ySQQOnghwvUeM5QY?= =?us-ascii?Q?igRxXbo8PfoUo0R0ukFWAW4v3lepl0tEgqxNhudcZxGoPRSJvUEjjNW8wBml?= =?us-ascii?Q?RN+F+M00F4S7W7O7kXdHFOPYgZD7Hbvo7l0Mu3v83qtDy6wBgaNXztEBjobo?= =?us-ascii?Q?5WDZiZcKSBuUdsP4un3tIjLeD7MKHd8Wd95q5Jo/OnQlF8QUsYjgBbj46ogC?= =?us-ascii?Q?IYP2OF89OeiueaHlfNlx7XMij+Erk6yG1f0NHM5/LHR+mo+CL4snzSbW0sGz?= =?us-ascii?Q?YN7NXpcIqsbbmT7aQn+EI96Gy5cvC0bqsXbWrZ35MrIr54Go76SAqGdpBv7M?= =?us-ascii?Q?SdXcG2RxocpYp0ULsxc7gOPfCDoWVkbo76dWmr1tEieWQkZcmZfUIJ19hlRk?= =?us-ascii?Q?dAel2qu4NR1A4moRJCj8Y8IaNCAm4chkU87PjDqIeQxVP2AFF2hnlrN/5QLu?= =?us-ascii?Q?svVQDJw4t2xqrSO8T2pg+0DmLBa1WCM9MS+pg1+2BrX5vievo6dL276WhBZR?= =?us-ascii?Q?KT7bm2QUSw=3D=3D?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e737f0f1-6f97-4217-7c6b-08da2e8183db 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:02.6391 (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: d8i2bx1bFR3gebvvwqd9sZtPhS5oljSRcczVfymojSgUaGI27bEf41MRUScmL72yBJAZRGg/1BKEkILwitjUlg== 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-evk-u-boot.dtsi | 4 ++++ board/freescale/imx8mm_evk/spl.c | 19 ------------------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/arch/arm/dts/imx8mm-evk-u-boot.dtsi b/arch/arm/dts/imx8mm-evk-u-boot.dtsi index 8861542ec58..e9fbf7b8021 100644 --- a/arch/arm/dts/imx8mm-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-evk-u-boot.dtsi @@ -121,6 +121,10 @@ u-boot,dm-spl; }; +&pinctrl_wdog { + u-boot,dm-spl; +}; + &fec1 { phy-reset-gpios = <&gpio4 22 GPIO_ACTIVE_LOW>; }; diff --git a/board/freescale/imx8mm_evk/spl.c b/board/freescale/imx8mm_evk/spl.c index 7eeec6c485a..ae2fb73fc51 100644 --- a/board/freescale/imx8mm_evk/spl.c +++ b/board/freescale/imx8mm_evk/spl.c @@ -72,23 +72,6 @@ int board_fit_config_name_match(const char *name) } #endif -#define WDOG_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE) - -static iomux_v3_cfg_t const wdog_pads[] = { - IMX8MM_PAD_GPIO1_IO02_WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), -}; - -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; -} - static int power_init_board(void) { struct udevice *dev; @@ -135,8 +118,6 @@ void board_init_f(ulong dummy) init_uart_clk(1); - board_early_init_f(); - timer_init(); /* Clear the BSS. */ -- 2.36.0