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 0D88EC433F5 for ; Thu, 5 May 2022 10:27:39 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 982A384156; Thu, 5 May 2022 12:26:18 +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="Vw9OjhuG"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2EE478409D; Thu, 5 May 2022 12:25:41 +0200 (CEST) Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on20629.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe1a::629]) (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 91A6D84088 for ; Thu, 5 May 2022 12:25:33 +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=IYedcfYeCNcV/pjD0YKcucbO5EupA0eT5rbocKgv7tFCSZzcFxOO+AR60lJzSmQa9XqLkZHWX5QV9i4fzgiPx2+uXS2QhvFkETUtVN1ufVpGriFA3aGOsBcE2RcG3m9ztQ8NqSdw2TAc2ZLTADDsoXA4DzdviOBm9n9iMRpSUVXThT1/yZ/03iAL1aPenU3j5Du+rVdFEnYkontcwpl6dOoZZrPpP0dQ6MVRoBZ5/jFx1VtwH4bmmTueHIe+DtFS5U9OgWv/fF90OYSysuZX3NkCEPuI2c/Gn8oXQ6i22hT3dogE+aqfjwRUs4+fc/GEnnf+aSOki4rfz2puP6rrTA== 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=LbO9qgJECGw3k3ExGCHHbd5gzFoNnNyORVMuVGzJS6o=; b=jhRp2hSc8S/3O8H/FedRZR1DoQHQsBIDB+loZRE4yDy7O7lb77TNbde7Pelw3iyy/IJavwz+7dpRVMCWJ0EIxNOt5HUXTY7QNxKe7RTLghA5swfsf67pUwT3qQvqrLUrDcuNWOreKAwbz1hH01wpnUshxVJdtXabTicUX/s6nm1PbAVCArULv+5KTjjicU9uDrAokx/+dnRHK9r/V3GiqAmnyuZ9EAW5R2xQz7KQJYs3T7YJIyfRs2eQwP2+Hwf+BHAa43/b62DkrvhpeIFXaqY/VcG+jdlm8hhtvxSpWCM+4xoh1BJWhgEtjVCgPhrHTCY9MgjHhG6eCvDDWdrJEA== 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=LbO9qgJECGw3k3ExGCHHbd5gzFoNnNyORVMuVGzJS6o=; b=Vw9OjhuG0M2SpIFL0a+vf2QJAkLP1vjfhurp/OJ7leeY5Lb7VdbMK+FOQNxw2DgxhbHLbkKIjz+ugZAbbaLsNnj/BUuzJTQtWlLa2fwwTjdoB7uv8Hja2GyBvxGsiEAKjEOj6bCjwO+dcSNw7jf9vEb6Xfc3wE61gr6AE0IcemA= 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:31 +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:31 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, "NXP i.MX U-Boot Team" , "Ying-Chun Liu (PaulLiu)" Cc: u-boot@lists.denx.de, Peng Fan Subject: [PATCH V2 12/16] imx: imx8mp_rsb7320a1: enable wdog driver model in SPL Date: Thu, 5 May 2022 19:06:08 +0800 Message-Id: <20220505110613.31314-13-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: 892a57c2-5663-4bf4-a4bc-08da2e8194e2 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: GTqfMvpMQSb8v1FmOw93dnrbO8fOuhqxu2MHoUTF70HFXRYpbNfNboGmg3SE8pZpDXj03SCCqQMvTvMy0f6J/BWskYvNPFSzHqZGJF2KEOODh2MI5D8gn/g3cfSaOHx8nR5FIbfAIagEBVz7WcOAJj6d9O6Q5uoJTLNARgbyknnY1zVCPdb1dFJT0qACt4M7zA4kxQllOy65FhkgNsfaKL3KsQpZAG+61SZO1aUeDWztpa8cUcs4IH7ecXWwRNsj3bBbV+aXNksAQIdbUk60h6k04aNDc7cNcAablF0hRCM8GnEA06fjjjMJpaA5T14/2UWsXy8OK+CgnUAfw7IQstRvh3sls84G0i7lyjaI21DFNPokcZC8lIOJApg3fYC1Nm2pFSWg19f1CGmyFyRV2uBI1e61kiNKm45+kb/5ImCSIaexU73BF6x+b5NoqoqykffnWl8RR9ubGn9L+C3NFevr0EVXDJoX8t7HyWh7IBC/QlruKxNK9PVSY+TyDPgTYA7YLw7Y4qasZdlu7vT8zootA+GVM7kOwyqGqNhiIy9rp2fzy4BtzTXV8k0PUzO+Bf5d7TuwWGtfPZ9AsOShALOJJXnDbS1Kd7ZdHi8QogWOF/Ro5sZJq4skcGAEnMM37HzDPoNNCIT0cuKb4njv6V8kJlzkK1ptK7dtnHCIRg3tbwlMiqkUyjWxO4eG+0yqAOex7W0V1KvKSWlo8yjeDQ== 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?raprLBqWfcgaWchdpMJ5GJSOrcrh3pIEaHa42pcC7n4WbYSg4w9FLWDk3+x7?= =?us-ascii?Q?KQ/f2BBqKRbrCZ1z/Y0mQZx9QM0jIk9hpsc8ETokPAorGlg7K/iPpdfFq8Qx?= =?us-ascii?Q?5CmfO1Rlu//iDV9cLzJ0/UmF9u2f9crDix878kHj3b8X9jGhMCDL5K7eYilX?= =?us-ascii?Q?DqcNaJXF2c+TOIcr3vcmQ9yzgYFwVFI0lBf/IiqalaG1y4vEeNlH0cx9ZInd?= =?us-ascii?Q?X6W4F5/R5d3VjUIPJx7fPUHBpDVMyms+A6K5JbQaBfwDybYKQn5w+dHnH3G0?= =?us-ascii?Q?9XkfOk0L6MuL9Z/sA2I8r/CaMZv7dd+SrgLpHzz6Oj2m+LFRi+Ulr6p5Pr34?= =?us-ascii?Q?Ng8hxIbpEqj49RWV0lQ53xLVZPdXlZmooih7gLUQSFwQrwDpTTF6LnSDb0M9?= =?us-ascii?Q?6UtXgK6OTh/xpFLdbwEQ7cVIId/oBqgi1uWCkYtNBVDnUQHLm99ucAefg/LC?= =?us-ascii?Q?a6I3bRREO6C858MHbN87ZW/htQByl53f3rOcO7ZiJc+wy4XVk+LEusmpAlj9?= =?us-ascii?Q?ztsI+dmrp8QaNpGEtJ1gWV0YshxhH2Tpu7k5b6hkSScIurAaAx/r2NFwbIFV?= =?us-ascii?Q?ADgWaksq8ki4jvVZFeb9QuKBnAmFW6FoI4SrpDsQ6ww8oST3dpzCIDuK+1Xq?= =?us-ascii?Q?p7/RLyZUjxG5jPp+zR30Xmr6WWS0T2V899GPqQ5a9RBpsRfpqPmGIl8An1sm?= =?us-ascii?Q?bCWaUappw+e8YrhjestodKYcnMhzhzfS0Ny3Vi6C3rHpMhjpBG84j/EFMq6b?= =?us-ascii?Q?tHlw34KWxDOMc6MnfoTH5aqdlcyskntgtTX//mz8QTyzdUifNPJ+K0Da1ht/?= =?us-ascii?Q?ETnQkZ9YLwQlkIO6U7i2of7Pk0u8VFYS4VxXvzoJZeTNEW91+Vw3iso6ddXL?= =?us-ascii?Q?RHpTlLsxzCGq4gu9/dmVipijEqg0jBfzrBcBQIp+Z/xHiJGYps4vfXeNbhx4?= =?us-ascii?Q?xknE3F8cE21xSFSGE/cZPySNA9TVzwvkgfljAd9CMozoqQLTiFvUATdzvh+P?= =?us-ascii?Q?otFstIAbx40US5ElZYc8G5NuwFa2G5WKJ3jKxQjseGRGqI2JHEhoWsEiFigp?= =?us-ascii?Q?+hc+AIn+pQoDgF81GbICNTNLPHAbVH9r5Y76ld7NQi7Y+Px9NI749F+E6pOE?= =?us-ascii?Q?5xTyQYsKfy2phFh6xw+LtKj2Naz6AUP1kDpVZbRn56csJkv8CMheWzZaf63J?= =?us-ascii?Q?SYFlxQQyq3/ifTWwloj2myOjGMnHeB9DzYbKOdpHrY1f65Aogf5RxQTF9FPd?= =?us-ascii?Q?LgJbilq+nIGx5b7wsz6bzH+Vvs7Ux6gUsCcN+n8xRG2I8zVRZfdkbfc1H6/z?= =?us-ascii?Q?zcPQ+ywGV+wkVxCriNqv80fm4j2mXEXzWE9VoDtp13xeEpKf5rkN/05wSZVp?= =?us-ascii?Q?Lanqea/aJJsgR2ozVOnPPp5xqQ0ZA+gn7A8N8z1xO2SUuN6N5H5Ks4Jt5x8p?= =?us-ascii?Q?FvFGNYVYzJ8AO86HvsbcvTcJUA9Wj+32RLw89SEl+x5xnwbOodp0mWU+5WXi?= =?us-ascii?Q?8TSl3JnLrUAfuoIgrPgKS4FolHjjQ3w06PBH3zPHHSn8XC977YvgXPo2rq8W?= =?us-ascii?Q?+XNimr1wr8Deo+b2bAj3PDbtZhtUuApl4bUeHBAAjZuncG0kGBNqfDeP+DSg?= =?us-ascii?Q?xD1ieXSqCXLJEAXM8HxzmTmyByeKye66eN5ZMxKA1wqeVqw9Qo16ou3uCt4N?= =?us-ascii?Q?ai0Gz9ddZeWXlvL/ZH0aS2iyGR/iAzJabe6fU4mHbZ3fAauSb/QxROUbJcWJ?= =?us-ascii?Q?KB6DYsggeQ=3D=3D?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 892a57c2-5663-4bf4-a4bc-08da2e8194e2 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:31.1761 (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: 0QeY4DDgD+Z9XGB286e3jdQ0RqgQoGt4+Sly90/oMCxH8KSnwbwzPc1nO+wcFDo+sNJYxcKK+EKviSblBZx1gg== 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 wdog1/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-rsb3720-a1-u-boot.dtsi | 8 ++++++++ board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c | 12 ------------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi b/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi index 2848b24f655..4419967ee42 100644 --- a/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi @@ -89,6 +89,14 @@ u-boot,dm-spl; }; +&wdog1 { + u-boot,dm-spl; +}; + +&pinctrl_wdog { + u-boot,dm-spl; +}; + &pinctrl_i2c1 { u-boot,dm-spl; }; diff --git a/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c b/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c index f129ebd429b..0a1b2c94161 100644 --- a/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c +++ b/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c @@ -28,12 +28,6 @@ DECLARE_GLOBAL_DATA_PTR; -#define WDOG_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE) - -static const iomux_v3_cfg_t wdog_pads[] = { - MX8MP_PAD_GPIO1_IO02__WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), -}; - #ifdef CONFIG_NAND_MXS static void setup_gpmi_nand(void) { @@ -69,12 +63,6 @@ u8 num_image_type_guids = ARRAY_SIZE(fw_images); 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); - init_uart_clk(2); return 0; -- 2.36.0