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 8E7AEC433F5 for ; Tue, 3 May 2022 11:45:37 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 818A78416F; Tue, 3 May 2022 13:44:57 +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="c7xdMf30"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8510E84140; Tue, 3 May 2022 13:43:41 +0200 (CEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on061a.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::61a]) (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 861A984099 for ; Tue, 3 May 2022 13:43:10 +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=nKAHOrcmz8Zz3HPCBgfaUyg2cE+oRglHy9U0/uGgg7eXGaIFH/OhcPlLZ7MkJMQTlXFQXVMhhX8ONGHphCZsPA5GtQd6bJTu0NmU1xj7fnb0XqX6zPJGoM5tCLxBmdy6c69oULN4wniPlQMdr61GKFoQVRlML35wtbiRSk2ypkaIM8bdyTptPNFzkZbADm3ZCyvT8je826pNIghoMKshrZLK2sU4J3TOP2ywWVM3uxrzpcCec1C7CiZaGryfhub7zH+b56rSZVCZNz5hXXqE2/07smKOPyoPk+efoZOeYnHVhtx3w8REkMJKpGpIpilXTM5m7kxTo9bYdYwpOwvvdQ== 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=5iOaOWRhM85gQHKu8NItkFxQciuXWzZwR1aXzY5yN8k=; b=P4LRTN1E7Vky5/D4ebTxmD/aRKQbJdul+rH9GQtw73wKHLQ1Xsz37bDc35TMz6Z6wlmlihO9H9Zn2/6U+FuneK0XLd6Hr1QuvI5LQEgQvjo/EylGXuIY3SajmzPDFpt4FhWaYlG+Oraf2b+JYpGM/AdAJx7bzlubkqd7fgKrmmLde+924pq3SMwKsE8fI67IhffxQ963qicLKAt1oYRDKqPu8Wt5K9CgvcNOEE+L6xssnhoH3DUahGJWmJHp954R9Rs/rHiU+TJ7pGSm7Pp6DwAsn8iFHunSnWgfz6IfnxveLTpXApnRyNyQ9kjZiJi/v50nZMv71101iL3jy/jvsw== 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=5iOaOWRhM85gQHKu8NItkFxQciuXWzZwR1aXzY5yN8k=; b=c7xdMf305fen/ecMZUkIEK4rLelubas3zwMT7H8lFz2HaLWZyZX/VE2l0A6lNNzpYShwUZmKEoBNgLhfmxjHhOTZjLtdoIfn/EqPKgowqCHfsF6Tg2xgUaJkl/DIHpmSe06Jkdx/CUU50JMa3iaccFC5WQkGDzowa4WaB8XXUdI= 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 DB7PR04MB5050.eurprd04.prod.outlook.com (2603:10a6:10:22::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Tue, 3 May 2022 11:43:08 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::fc66:662f:2a82:1420]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::fc66:662f:2a82:1420%5]) with mapi id 15.20.5206.014; Tue, 3 May 2022 11:43:08 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, Teresa Remmet Cc: u-boot@lists.denx.de, Peng Fan Subject: [PATCH 15/17] imx: phycore_imx8mm/p: clean up board watchdog code Date: Tue, 3 May 2022 20:24:15 +0800 Message-Id: <20220503122417.26953-16-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220503122417.26953-1-peng.fan@oss.nxp.com> References: <20220503122417.26953-1-peng.fan@oss.nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SI2PR02CA0032.apcprd02.prod.outlook.com (2603:1096:4:195::12) 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: c52d251d-b5f1-4862-0343-08da2cfa17b0 X-MS-TrafficTypeDiagnostic: DB7PR04MB5050: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: ajEeKY/4dhpNQbbg8t93Tm6cTNCY/1jsKQJQpPFB3mIZn5P/o6FUSufrvB7fmRUhpEI0OiOdnGXRphrhrbiVewGF6FFCbY5Rxkek179OIlDaNNvr1yn0nbeAQ2iW2LXaUk+7Dq3mSoiW4bPYYHnZ1eds+tDTIPuJZP1ran9CjbICZzitk8gug0DJyBC1D5N+64xuM8nZQcTACrgo6fNMiktf4SBP+LsFdZm/eXthAKMReb/aXQQDFxkxnPcKBVJ7hlZQ2I4ajAQkM+QwpiTGcb4oRjhgbPYMgM2bcJOvLKQthzOefe5de33G/qv32hGt/d0XesrYLugpArs2y+jGPISBwcV093YL93uuJ29yC6jSEfU0+dSnLOtM2kbWvlBjDzLqeZNP8dpfsydi6j71Lk76svL42oUXsPHergR4EbpAOLdgPlpjwIKgVIZ8B++WnAWQ/wys+dIbt8CCDLLFMdP3iZ8CWsd8hILHnxT956NHu1ibvX2I1OvQsC4yZ/z+9B3AAlMxq9C23VkP1PD7eprvJZNSd3UyfQsrlsTo6TPrM6g+JNuznCxIowyMKuHUy7dTWXygi1WjZnFUpSrahjmXZ2ktZ6QM5U3uiebSEA0gBDLlw259Pwe1wSZbY0Lhu7jyvAPKGh9vxI9ZaLZIQv+Lr4CD83KAN8OJ+PN/5csXTCxLSUcDSQKSQ0BK1gnlC2cchfXkZAGaOKKNHhA0aw== 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)(6666004)(2906002)(508600001)(83380400001)(8936002)(6486002)(86362001)(26005)(6512007)(186003)(2616005)(1076003)(38350700002)(6916009)(38100700002)(316002)(66476007)(66556008)(66946007)(8676002)(52116002)(4326008)(6506007)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?lxfU2yKvv1vt97VFSqRJcgrLf9VbIpgGGZK86DvYZfxZwSYLBIKBqYWly7g7?= =?us-ascii?Q?mgg6dZlSIyBy5hksqGKu58Kr2pbpjAkPBp8ODooqu0FR5ojAoyD5FIPARJwG?= =?us-ascii?Q?4ZkUtUxmI0mB21rTRWJq3VdsP03bQfmYEUjzl8QxpDrKFYtgwG4vwBhbGQ7V?= =?us-ascii?Q?ozyqg28jXdInW+HaW/yLsfRBGjHNHyWOapG+4pcZvT5hguIj4Lz2R3Siy67G?= =?us-ascii?Q?WHrIqD/4SaoDlbG0hk3xH8ZxaSNV35ZpiL4aaKWw3sra8PvxlwnkP+iWway7?= =?us-ascii?Q?1UlmQWKRi/r00ZQHsab3SZcDGY5i++4p2aGqNPnfs7bsWGSXP9Fj5HjHCSga?= =?us-ascii?Q?hqDPLF39Yk1112/JPHD7BQkw9YqfMhgSlWJAkqb5saBFIYbkqXav3JOq3vLV?= =?us-ascii?Q?W2GFdpulzCdT9mCUYYMzh8fT9ukPSH+JuMklph8FjGDu9jOTDAJ2ur8zgaIH?= =?us-ascii?Q?IhFDchbOTM5wh0b7upSsc9K4kK7/W9hlEejFnT6TrKqNbvtiFD3kdr9Pc7Uj?= =?us-ascii?Q?uHm6tjPVW39cHDIP0I0XEFWwF/j/Q0suOaW9ve9iNRqYscz9qTJGRGRrmDhr?= =?us-ascii?Q?65zh+rljDJr8GnhkdlRZG8vxWQSSZsut6Pi6VZmnG4KC5ySOicLCaYSYrvn8?= =?us-ascii?Q?GUMbLkDBtAa4rcxvPR+QwrMaldpQP6G4k+0IYk6ZIN0wiXPtTxc8wp89dUfJ?= =?us-ascii?Q?CLY6OQM8HEaJRNQf3bS7TvHd5lcOjOxIWVCLSG4NNN1HB8+3Km2fLuvy3KXt?= =?us-ascii?Q?DGvXTnQA2FOKfb2PTcWmVkMeUu/IL2iwIEg9ktEsXwF8iFv1+8n2UfzrLuOi?= =?us-ascii?Q?T+OgPakuxi3iYfHNhWZdz8giNjpUJmp1aPY+CEL7pqj22gTxjmcsJYG+dV08?= =?us-ascii?Q?FrpGSgHdSWYm6/0pmQQDsDgX1o1uwJEo3aXoELokMihqwkLCgT0tPJll7/q6?= =?us-ascii?Q?HS3BJkWHSDIwhR2Oi+zF9iS6fCn74wlfLVczf6/BVF5jWhHVkzYGWjQBMaFe?= =?us-ascii?Q?XhZ1lAiEVT0SA41IYaMQFKIPoQCUUMMeyldtmKHVbAYTVxmd46S8DaNgnyT9?= =?us-ascii?Q?p0MBAbHPLx3yr5xrE/UkVN+A7AtM9PuYQw1SYuQlxOu0HLtub/zQwR5oNY8k?= =?us-ascii?Q?kYAyGvBJg900UQC1IimgFiCkYLZQlDDGNNPAFuP8+r7jcs+eVo6NzItt4+0C?= =?us-ascii?Q?ieXRprQYeSn0Mx5kxBfBu0OSHWh/plRi8ZZFKZNlu1q7Oi9Kj0/sJkJlvNie?= =?us-ascii?Q?CT75CkYYVVI9faLQzgo+Fjml332N0Ni/jB7v5TvZDxQsrdYejZAGSPRGbo9X?= =?us-ascii?Q?NNkojxvjhYmjFdaEy3mfQzHmKCK77449fYE9yeKZX8UHMlc9pfySTkDua7+O?= =?us-ascii?Q?S5LfQskmTFHFKs7v9Tyn83VFcqfU6t/DHqpO0EsnzfWF46mxiT99dHrroeOV?= =?us-ascii?Q?IFud9qulWmIbq6EArV2MY/b5hE3NoVQ6EJW4gOku18i6fnoxhBdoyX1jj5KK?= =?us-ascii?Q?Z9P2VWZRHiv5Qfb5Wy6Wm8cS0kVN0n9TpiHu0VdCOd3+zd/FxlZA+mT9MQqr?= =?us-ascii?Q?0iWsDkKWqjrvIOulDQsQLeIJxETT9oWngtZS2bKWmYEpY8KC87SoppPBYu5c?= =?us-ascii?Q?TVM9kkoj604lf0XKzQarAyjk3xhEhOW3HUqCiWxl5i9gdzIK6hsmfqwKKhSD?= =?us-ascii?Q?SWmEslqGz4rkJh/lOTy40iWHeE/X10atRP+h3n5wK+xa8MXDacMcfFUcRXsp?= =?us-ascii?Q?izvFBXC55A=3D=3D?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c52d251d-b5f1-4862-0343-08da2cfa17b0 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2022 11:43:07.9547 (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: IKemi5BQY5JsKOV8o0gklk5TadylShVhPTvCUg9KTtfKw1MRMae69dMncMiCX3bqlDN0jG64T8I/9rGvUqcABw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB5050 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 pinctrl_wdog already marked u-boot,dm-spl, so clean up board code. set_wdog_reset function could be handled by imx_watchdog.c driver. Signed-off-by: Peng Fan --- board/phytec/phycore_imx8mm/spl.c | 19 ------------------- board/phytec/phycore_imx8mp/spl.c | 19 ------------------- 2 files changed, 38 deletions(-) diff --git a/board/phytec/phycore_imx8mm/spl.c b/board/phytec/phycore_imx8mm/spl.c index 7f24a3affc8..d87ab6d4497 100644 --- a/board/phytec/phycore_imx8mm/spl.c +++ b/board/phytec/phycore_imx8mm/spl.c @@ -57,23 +57,6 @@ int board_fit_config_name_match(const char *name) return 0; } -#define WDOG_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_ODE) - -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; -} - void board_init_f(ulong dummy) { int ret; @@ -82,8 +65,6 @@ void board_init_f(ulong dummy) init_uart_clk(2); - board_early_init_f(); - /* Clear the BSS. */ memset(__bss_start, 0, __bss_end - __bss_start); diff --git a/board/phytec/phycore_imx8mp/spl.c b/board/phytec/phycore_imx8mp/spl.c index 38a581bef57..faed6fc3b76 100644 --- a/board/phytec/phycore_imx8mp/spl.c +++ b/board/phytec/phycore_imx8mp/spl.c @@ -89,23 +89,6 @@ int board_fit_config_name_match(const char *name) return 0; } -#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; -} - void board_init_f(ulong dummy) { int ret; @@ -114,8 +97,6 @@ void board_init_f(ulong dummy) init_uart_clk(0); - board_early_init_f(); - ret = spl_early_init(); if (ret) { debug("spl_early_init() failed: %d\n", ret); -- 2.36.0