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 1D17DC433F5 for ; Thu, 5 May 2022 10:25:21 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BC89D83F4C; Thu, 5 May 2022 12:25:17 +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="Jc6wSWgQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2686683F2E; Thu, 5 May 2022 12:25:15 +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 4DEA483F73 for ; Thu, 5 May 2022 12:25:07 +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=n0bHXPjsN9a1Rs5esgsiMXhqvrCDEA/zsM3piBzDoznLo/I4gDjPUAjSOtjWabHlhWyZjRnwhgF/hAg+8htIbUzuBnaeHsPOzOW8SpV7dNwOqjfPR+TkQAuqVFa4pdO86v+ztO+N4XvSymLUW543K1O5YpZBvbj7tShhC2X3Epj+s1Nz4okrjkNU4+kihN9Uoet5AmxmdW0xX8p7vQK402M3I2NSt9kZrWy+ZLZNyKmd9vcCl+CuDBNa4jdRX2v1a8Eze72wskL4BINjRqaG8XaG5qH5oEBZ8GCGdgwHRuR/9bF9nYIF4VnQNCo0SDwJCMx9euKYNW0dwCXQrMh9Og== 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=RJgM68dF8gtOd5wvJ5Rb/sf7rFxD6NtHyBlZ4H8Szqc=; b=MPt6TytAdJgvhpnpUpCTFrZwcIDdJrmgO/hirQ4NM5azxf1kzsoY01oaqKJKnugKhaf8idYVPlhe4TVJ35e8dKs4z+7rhjdaX8iKrvffLmJUPjiqHToO2dkoHfk816ssktxQSbXHKigho5TeWo1dYNgJUxzpLjzOllDwN1be2YTAWh/7ZKmjkD00GZMDXpxxhl3KIdZ85Zh4JwSNq6V3YZV5wj0ANWookx/fzoafkRzfcNsYgRzcl4Pyw3lgwe5CyQx6LOv7JQTmfjP0dzUS2lTHEoMYPhQan1UT1blKdFPIV6yiWRmK255crbdPuacxeL0ZwaN3do31zZUeRDQ6Vg== 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=RJgM68dF8gtOd5wvJ5Rb/sf7rFxD6NtHyBlZ4H8Szqc=; b=Jc6wSWgQpCzbpuiZH1FxnopIgtJDU3ZTwaPjW3owDFn2A40SRXkErpV93SJkPMWwKmANJZpPTBbSQVKDedEDBXsRpUIkP6naddXLHRGLd1H0BWxFnNq3jphgoHnc/0g1xD7VZHkvot3Hkz7zaVutlX+eZMkWutuRbKnT6pQh0Xk= 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:05 +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:05 +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 03/16] imx: imx8mp_evk: enable pinctrl_wdog in SPL Date: Thu, 5 May 2022 19:05:59 +0800 Message-Id: <20220505110613.31314-4-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: d1435820-b59e-4ebe-1bdc-08da2e818571 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: /SfpEpPp4hRIyxnVqk+7iy6DDm63z2Xp1l6SmFCr8dtR1yFuPaoTG1eHftiOMSM/29KaJL8egqlvTAHiHAsZs2ehwriR/F09Vklga3kJBcBoRQETMdXpRZg20IJIWKQD3Up45gDoEwgzj43KsIrHAUCIYXq8fSCGVtw3qWNS+mFeSK7QnY+YKDz+n96L7hJ9HSiw5rtWp9KUbsnHP+oZIBu51jslNDwWezxGguydNKHfHSbtLfw+QqnKrjmdzSooRcf3d67IiRwqnsN8elrmLLWB1g+um+j4FLJ1Ijg1Y9mf+jeTILIbxRPU12Q3NF97dKrGo1GnroZu3BOsXAxIwA7fx8TDMiJqhdWzHjsx5K8LPIdam4PQP06R3b2qm3HDY9YJ1ih1y5nGH6Po9xFhXP06qNGmObSZb+GtrR3n42vF1VDgzwH+BxZBL6vfp2+FuwltTLHNaw08YPqIhC7LhU1/ZhDsl9UBCZHaIu4aCoJW2adlCP3Rmu1gnkQXoV5ZcLLAlw8U2j2Dw3HNz5AAmvMh2NpnPT7wlRL1ZbCYl7pAK0F+Ij1AcKWRnAasmo8XyKKcZNnKVbmLi9yeotyb6nokk/buiquD8r2HUdW+FdyubCixodEqJc2fs6v7fCFyyYNDbPiA/Ow5o54bI4HNxMOtia2DbuI00tYVJaBf/r+T1ku5p4kPB0sSGBoQT9Qad3CHyybfhj6dYXHRg0YLOA== 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?6pkxR0VqVdwcWekuprVEJiU65QTKqyxRKugoH0xbWZMUPk2fbT6LVx8W/JlK?= =?us-ascii?Q?xj/aRVraCmidjjsin94Omdo6mkq8ULcjDpTMu8bLx1SB1FQllsnjixufBY75?= =?us-ascii?Q?LOy3Fjiue3oveYTeM08bImX6Ts87KMNIqHdvJHcgWVzykCoFq3RYtxYuDXug?= =?us-ascii?Q?jdUvD3w42OvMXS+xtHAdMk/yBVvnUid44/W5J+AU8lIzl6Pjb7pbFOxzVbKs?= =?us-ascii?Q?T0ME2P4zADcbWAAFtYD9N3Erl4gPnPtY9CXKoLerejBDSNb1tYt1GWNZGqsG?= =?us-ascii?Q?/AzBOZoUZjpVrsRJkv6i7s1G9FFfCrVMt6wk8lEKLO/rkfha1TLHIqGLGSTf?= =?us-ascii?Q?58WMD+sg4HsUPr2zJcdAqpPSCGKol+kn+f71XLJOERzqdhc6xDtuVORlgbZX?= =?us-ascii?Q?mqBH8HCHA9Nu6Ni+UwaqjEsLo32nvGdA0NRZ/waWFey9zP/mk9WvR379btYB?= =?us-ascii?Q?N0ayls0c1StiZyqdlhlwyuSCM9+RW+0rfwsczHAEa2QS9cSonAfUMiG5O/UA?= =?us-ascii?Q?/eN0gprl72HEUWtGmI+Wdg40TNYp++HmLkcxc/e08ZBetbLqamdugUza/hrO?= =?us-ascii?Q?Ye9WwBrCcFRC2SKPCqf//wGC04buKlz3fA2rW/siJRXrWd6u+F5BTXG211g9?= =?us-ascii?Q?5sFtHIWmtlWvsSUaCwLtiBRr4L9q63bnQn1gKraYzFUnSNNcK3t/CRJxZN9i?= =?us-ascii?Q?fqHytu1laaPAokWvaLnByCbzXFGXkrcNtMRH4Lya9fw7HCRpcvW/ddSNehqK?= =?us-ascii?Q?OSWAWQdB9zfAA4J6YCN45DxKNti49ZijIQ5+kLNNCZoT02l45lgtoKhSjclB?= =?us-ascii?Q?E6uMkph360OiC8AcCu4Gutm7/GMHRUtLQCEFBMfXRcSJd/1Kfe98pRydHyWo?= =?us-ascii?Q?sz6anUFh+5EPPk0r4l7PNEgNIJo4y8bTojsedtIBXGlLWDOSBpD7ZDlWg/CC?= =?us-ascii?Q?zaJRsJrE4h1legks2rau36VsleNtskm91E6niPSUzYeB7Qjl3fpBB+h/2JMW?= =?us-ascii?Q?r3JXX+9oFBGdncuR3hh5Ti+ORTfef9W8h8Hp1nPLA7+SN8tFEYzwwcgnLbyn?= =?us-ascii?Q?iiS+NfRuwhxNmcfMluOwKMms2o7RG7qbTSZO+O6fdwxbpsQeWCukgSdwyiKT?= =?us-ascii?Q?fkdHjL6iShzcQS33lEcJrnNkSSLvo5TpiZ3aTruEr7gefW2aGHN/cxoJSIWS?= =?us-ascii?Q?6RZ34VqzszQUDoJp051AO98cSIQPA7JdxmgtyokL6AMWzVbrCu/CySnQw1tq?= =?us-ascii?Q?VGesg5wy0Zvy7nXKSdqKCTNjsnZgEbP+FHAe2eoyjfwaOVlheYQQR5NqKk+h?= =?us-ascii?Q?tUGfflj7LsLggrvLDZ6Cy31OQugP8buvscU3E8nI9d7vWPP/jyhc3GErUFYQ?= =?us-ascii?Q?u0HzwccWnrzkQsBZ0ExWJ7HhZCytYa3aDUpFEU0f6QIYbx2t82+OFzRNsGhD?= =?us-ascii?Q?Ta7NEE9OjdCojpQOpPfPBftdu2XOhmfeQBxHqb2OMAL789k7CaIwKK61rA6f?= =?us-ascii?Q?JlnjB9X2C3YQsdlaJPZc4YZkzaDKOamw5vbcQ++yvQWDFsR+NiDl2fnO48E4?= =?us-ascii?Q?lOyt7W4YeUawdgHIS0Y+/zAnGhNl4fqP5kO2EVQ0MF8+ujO82FVaRuFe3NH8?= =?us-ascii?Q?8iogT4qKtxtfdae0ATRZWqOSp19TEnmzAb6UVJYOYWCRDm1XuSHJPIN2iJHL?= =?us-ascii?Q?vRht4pYXElGYLGK9fPmKpqriygVnoqzJ6W7O8/akEJBqO++2OgTO5kCC2Tti?= =?us-ascii?Q?sbzvUJtDTw=3D=3D?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: d1435820-b59e-4ebe-1bdc-08da2e818571 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:05.2974 (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: fOMejUpOAA1BAzHSBQbMGDNf/iUFv3kMhOlstvPbF5/5xNlDcWWIaDJ5mTtJITSqQ0jHUEG0/pEYy3O6X21K/w== 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/imx8mp-evk-u-boot.dtsi | 4 ++++ board/freescale/imx8mp_evk/imx8mp_evk.c | 17 ----------------- board/freescale/imx8mp_evk/spl.c | 2 -- configs/imx8mp_evk_defconfig | 1 - 4 files changed, 4 insertions(+), 20 deletions(-) diff --git a/arch/arm/dts/imx8mp-evk-u-boot.dtsi b/arch/arm/dts/imx8mp-evk-u-boot.dtsi index 7aa908304aa..f43eb6238d0 100644 --- a/arch/arm/dts/imx8mp-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-evk-u-boot.dtsi @@ -43,6 +43,10 @@ u-boot,dm-spl; }; +&pinctrl_wdog { + u-boot,dm-spl; +}; + &gpio1 { u-boot,dm-spl; }; diff --git a/board/freescale/imx8mp_evk/imx8mp_evk.c b/board/freescale/imx8mp_evk/imx8mp_evk.c index fb6c61c39e7..8971a827df3 100644 --- a/board/freescale/imx8mp_evk/imx8mp_evk.c +++ b/board/freescale/imx8mp_evk/imx8mp_evk.c @@ -20,23 +20,6 @@ DECLARE_GLOBAL_DATA_PTR; -#define WDOG_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE) - -static iomux_v3_cfg_t const wdog_pads[] = { - MX8MP_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 void setup_fec(void) { struct iomuxc_gpr_base_regs *gpr = diff --git a/board/freescale/imx8mp_evk/spl.c b/board/freescale/imx8mp_evk/spl.c index 503a752ae98..a2732148f24 100644 --- a/board/freescale/imx8mp_evk/spl.c +++ b/board/freescale/imx8mp_evk/spl.c @@ -134,8 +134,6 @@ void board_init_f(ulong dummy) init_uart_clk(1); - board_early_init_f(); - ret = spl_early_init(); if (ret) { debug("spl_init() failed: %d\n", ret); diff --git a/configs/imx8mp_evk_defconfig b/configs/imx8mp_evk_defconfig index 081f7e08f8e..c3ffed85998 100644 --- a/configs/imx8mp_evk_defconfig +++ b/configs/imx8mp_evk_defconfig @@ -27,7 +27,6 @@ CONFIG_SPL_LOAD_FIT=y # CONFIG_USE_SPL_FIT_GENERATOR is not set CONFIG_OF_SYSTEM_SETUP=y CONFIG_DEFAULT_FDT_FILE="imx8mp-evk.dtb" -CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_LATE_INIT=y CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_BOOTROM_SUPPORT=y -- 2.36.0