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 364F0C433FE for ; Fri, 15 Apr 2022 03:54:50 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0CBBE839BD; Fri, 15 Apr 2022 05:54:40 +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="Je9BLxDd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 37DA483B4E; Fri, 15 Apr 2022 05:54:36 +0200 (CEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on0611.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::611]) (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 B9D6D8390C for ; Fri, 15 Apr 2022 05:54: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=d3H1exmY4ld7cw/OHSRj19yt2NWpihjSryVVyRemrdxjfi+hlwmO3YYxR2NkQX1kiLjxfZidTup4NvA7VmQhWjPwhjj14Yu+BFBosi2Fi5WRzw0ZDt5/9uxm4O+XiHd23/7Q8aYXn6g73egfE5u+RyOa+zYMSBTFS+yyNgkkU5Wnx3XG3s60EAPsF0ozd75nM1fPHqpA04bNZ2KELR62ymQj+4JwzbmaAqhaZkp19TE3FMSRGPM43u2FZwgBJpzkdnpjpNxwEYGUWlEGHUenlpMlWN3er0pgbDiMDeoNqpuWD9Sn+/ABmFRStWGoBsYrdZPXssrjFKpfM295AWJa6A== 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=rhvMu9zAuRQb6hS+bR8r+9gWhxDFEc92s+l6fqJpjQ0=; b=ZGMExI4YchsSowDydxi8hme/lJUNpvZTQrrqid24DjPW5rCB/GSKBxyi56+xk48+k2RV+mmpYdB9FpDDBXS8YrMXs7+TmoPQitjlaKCxDHJcDSGini27hfRQmOg4i2CjanNe1xkkBRY3NjzALSHKtQ4CDuDezuqFh4ozn3YhEjnPVDDd+610hGq4qv/IixnUmzMOsTbmU5GNNYAX3WNUQyJD61F+VS5nhJAoyg88QvTa2yIm0jF9E+AnUWb3VVB4MgeWF4mQps44nL45jHbYUMepSguqgYApVEvjdgm/0stOqGWoTm4fTlyIEn5PyzUvrtOd73ufuqneh++wAYxtug== 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=rhvMu9zAuRQb6hS+bR8r+9gWhxDFEc92s+l6fqJpjQ0=; b=Je9BLxDdhQ/5nk6cvj11eM3BXvEiMU/MpLUyuVq33kmswmYFBuTclC74xLtg+PAb/5TEgbY9dY2T4PlXhseAPSZ42l0VVYZcVz6/0vFF6E6ClODw2hq5YkpKZsa6Hx0MDulsZ1tsiZ1UYf0htqHIXKU59fzpW6jkn6Zgxl2F+vE= 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 AM6PR04MB4504.eurprd04.prod.outlook.com (2603:10a6:20b:19::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.29; Fri, 15 Apr 2022 03:54:32 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::389f:e6eb:a7a2:61b6]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::389f:e6eb:a7a2:61b6%8]) with mapi id 15.20.5144.029; Fri, 15 Apr 2022 03:54:32 +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 V4 3/4] imx: imx8mn_evk: enable CONFIG_DM_SERIAL Date: Fri, 15 Apr 2022 12:35:35 +0800 Message-Id: <20220415043538.27868-4-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220415043538.27868-1-peng.fan@oss.nxp.com> References: <20220415043538.27868-1-peng.fan@oss.nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SI2P153CA0018.APCP153.PROD.OUTLOOK.COM (2603:1096:4:140::9) 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: 8190d347-7cb2-4d93-b830-08da1e93a5ed X-MS-TrafficTypeDiagnostic: AM6PR04MB4504: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: hktCWwJIYSOnLzbmgDVdZ+wSZj/l7Rjg6JVidfSMxviAgyJuj4f02SUGGPtK5EiLwvveOyp67sEPPDfmuwqIWml7XaAaImeIBFwSja3HGBNUbkreEpOS2Rl+VDlacmsjGtZzA4RX36uw4i+7k+JQCQamg/AxOYvRa7L68GJG+tT1itlXXSFXAX+VM1zHvK5fFKEHJiPZoNo4Q8n+NvFR9DCAuWHvcfjykokBrY2F4NeolL09O9lWyJQe0WGDE8CBem+WVQph5+GAl6YLJ82Ww/4jiAaC4Pmr+Uf/y07oqRY2JYEq8YIfd1pBNgMmbwIVx3tyOKsxx718CwPFku+gTbsPhAdnu/Nj/Dz1p94JCjfEA0Dz4WjZy/UnWIQe/UZ0rcwDUXMk+wrEmBasyxvL1zYNIEJCBosFtLBOLco4PElM9lOhPqZ3nOdyQabCgDDOOGvLreXXZbyMd7piDI7ZLDVZGlgKJ+f6rQ4gGJX483A+ZS2u0WLYQr+UxE8ZKknirqYVOpPfjGvroGEDeaCpnhKyzMCYvUP+WDDFB9OgbWmZL+8GqFKbY9gX8dWoXt63NjcYg10sB8/qQ/Qv5sskTIbf1WBj2VCkVEUCnL3Co1tXgQ5zXNvcq+09NGI/FLUg4NInHYkrP2cqg6Tgty0SdDq3fVE9ymkuUkTtK3tKs/ab/bTkQnOtHftJGdluiH767Q78DwvgFidH5UTmlW+12A== 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)(5660300002)(6512007)(26005)(186003)(86362001)(8676002)(66556008)(316002)(83380400001)(66476007)(4326008)(66946007)(110136005)(8936002)(1076003)(2616005)(508600001)(38100700002)(38350700002)(6506007)(52116002)(2906002)(6486002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?+u/rYUn8ram72gvRYUjwc3TfqyCBG3dlRK284eXYurwly7l0oZdma5VnmLWd?= =?us-ascii?Q?61z0zDu1YTLTYL640wZZkhy4CosloH8rcKfIsVdp60RLwt7XvTjZ+ZZ17+2q?= =?us-ascii?Q?oW3FRj8Xai49JlgIiG2+tvqXBkXwacxPc1Kh06iLW3G0lhoYOaUnxa+WN8U7?= =?us-ascii?Q?NcBsSwvtNnSJG0K/+7/DCYaBckTV0bte146svg+NtFXaVJ1F4xRy1NSM2JCo?= =?us-ascii?Q?Pv02KEcYfopXnB4J466naUhkeYhap6bNYOsvyfKuredmHRaEKM2cZZaA5luy?= =?us-ascii?Q?3E6kSXGCAyBkm2ArgM7HdTmCqBx/Mee6ElO89eCOtMPPnOZsLdSBVg01EbqH?= =?us-ascii?Q?F7W/Rtf9EhXPMj1SvdpkWpbio0nHBNnG9dWVkL6dc1q1hL3jQPsmqg0ufkSV?= =?us-ascii?Q?qRHqBJXmCiWd4l6vFM0ZJnLp9MwDTyLDs57+0kxBW7g2vSqAWcv/WFnwt4Ni?= =?us-ascii?Q?Je67eMG/r8K9ar4d80kMDiBsV41XpjivW0NgSHAk0EtB6jkleYOtNjE5WQG0?= =?us-ascii?Q?jkkY4F1egxO46XQL8upni/zATOHe6Y3Z+c+rlgs9ry7aii047L6oYUIi3G8z?= =?us-ascii?Q?ZlSU2pK/HfcXcG6Dtk0DiI2ZKtkmwoq6Uq4dnPXDwTMSUB2Y+52+IAADetY1?= =?us-ascii?Q?yiunZzWkQg0ZTXPvtUuh4lGOKuKBfO23HJfMnZf9/xKp8nD/pvcDlIqaetVj?= =?us-ascii?Q?bX6YGbGY7WO3/PV4KNYFGm41+cjRnJK+VdtPY2yal+GBuv22CygCM3fjNiGh?= =?us-ascii?Q?4kXapE4e5CwgmVZxwdRKHGoqPwZSXoGdEW8q0uTy4+cu/40wE6ex+ltSjwiY?= =?us-ascii?Q?sWTqwfai27aNI5LoLhXXVjgGArIQTRc+Lpm6FwTGZPeMLySLj30a82nHZByb?= =?us-ascii?Q?Fn9EJqHKh7zCB692votPkgUsDBkSjeHMamg3EJp7/c4rxhfiEF2Sav6qB3+s?= =?us-ascii?Q?RV+Z9I65ecfd814Sla2+7sLI4pCbTa+uCLX9Smseaw/czFlN2OzSJMaJ6PzY?= =?us-ascii?Q?/3ekaKB/fx23avlL+ZcyMDdOqXRyfPa95sC16QhfdPkhTFd/TgYmboFZ/KWG?= =?us-ascii?Q?wIEXIimAJAcNfAI6sFsW8LyADWertiePPpzDupi0xKhf2h2GV3ciyVw9Op7r?= =?us-ascii?Q?x6YmTiL7U8AxdLDko+SIX0ZiMAhhnRAkykAz/YnH/NCI+kylFkc+WSkblREV?= =?us-ascii?Q?Dxh/uYDzGfITjItaTKSQa+MB3Kar5VEGLdsK4Cl52UHUVOzYYK18DOkzhphk?= =?us-ascii?Q?VGzNEDxFrXJ9WrgHNOhropA4Pwiy0DaQFtHdbDmxXJrcvzSBDhIE1XGCxu7c?= =?us-ascii?Q?5gR/Lmvl+ReVDbK0/HokQF9WY1XDS5n7oF8955R/ed5SQbMNn3ZM4lt+9geD?= =?us-ascii?Q?BJ2qQ8MG2+LeBFg9I153A6e+fZW9u6opwkADsmeAUHr16QrZoGQGYdOWVvs6?= =?us-ascii?Q?Zu44xdn0KaA7O+Cj3GKxuah8g35VVV+FEwhuXyoUfl6F5/p5/y0374X2wLZt?= =?us-ascii?Q?CpaBqJnmIHbAW4GtQnaglN5AD1oyRfEzj/9n5WgnX8Hh1u9+ynGRZzDMndni?= =?us-ascii?Q?eQ0xmSuiixCLwsT4Nu31R9+fe6uzWQN1h/M7GoGvsJeQMO7n+BBWXSe8h34W?= =?us-ascii?Q?1fusRcgA/3Zj4mfq5UXYaR1Y1hcV+1Es5l28ArKbxQ7fDocr3XhwuMJzNqVf?= =?us-ascii?Q?61oouT5Lqpp2iGRAjw7oc3QJXCdUkuN6XBk6pOflPPwLNBG66k0K7QmBy3o1?= =?us-ascii?Q?EjgEzAGK0w=3D=3D?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8190d347-7cb2-4d93-b830-08da1e93a5ed X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2022 03:54:32.1066 (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: Z9Yt3YMtS3D0mA6x+2KBnzbbNEack1EsXLQcaH6tu3/5KeqVmBaYgIld7maqbY/O3hBjITduHah5K8yCLyT2aQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4504 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 Enable CONFIG_DM_SERIAL. uart2 and its pinmux was already marked with u-boot,dm-spl. move the preloader_console_init() call after spl_init() to avoid board hang Signed-off-by: Peng Fan --- board/freescale/imx8mn_evk/spl.c | 12 ++---------- configs/imx8mn_ddr4_evk_defconfig | 1 + configs/imx8mn_evk_defconfig | 1 - 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/board/freescale/imx8mn_evk/spl.c b/board/freescale/imx8mn_evk/spl.c index dfa81a0d652..63f335be3b0 100644 --- a/board/freescale/imx8mn_evk/spl.c +++ b/board/freescale/imx8mn_evk/spl.c @@ -115,14 +115,8 @@ int board_fit_config_name_match(const char *name) } #endif -#define UART_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_FSEL1) #define WDOG_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE) -static iomux_v3_cfg_t const uart_pads[] = { - IMX8MN_PAD_UART2_RXD__UART2_DCE_RX | MUX_PAD_CTRL(UART_PAD_CTRL), - IMX8MN_PAD_UART2_TXD__UART2_DCE_TX | MUX_PAD_CTRL(UART_PAD_CTRL), -}; - static iomux_v3_cfg_t const wdog_pads[] = { IMX8MN_PAD_GPIO1_IO02__WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), }; @@ -135,8 +129,6 @@ int board_early_init_f(void) set_wdog_reset(wdog); - imx_iomux_v3_setup_multiple_pads(uart_pads, ARRAY_SIZE(uart_pads)); - return 0; } @@ -152,8 +144,6 @@ void board_init_f(ulong dummy) timer_init(); - preloader_console_init(); - /* Clear the BSS. */ memset(__bss_start, 0, __bss_end - __bss_start); @@ -163,6 +153,8 @@ void board_init_f(ulong dummy) hang(); } + preloader_console_init(); + enable_tzc380(); /* DDR initialization */ diff --git a/configs/imx8mn_ddr4_evk_defconfig b/configs/imx8mn_ddr4_evk_defconfig index 917cdb5aa9d..474d9cfa4d2 100644 --- a/configs/imx8mn_ddr4_evk_defconfig +++ b/configs/imx8mn_ddr4_evk_defconfig @@ -76,6 +76,7 @@ CONFIG_PINCTRL_IMX8M=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y +CONFIG_DM_SERIAL=y CONFIG_MXC_UART=y CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y diff --git a/configs/imx8mn_evk_defconfig b/configs/imx8mn_evk_defconfig index b2981d1e369..5bc175154ba 100644 --- a/configs/imx8mn_evk_defconfig +++ b/configs/imx8mn_evk_defconfig @@ -84,7 +84,6 @@ CONFIG_SPL_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_DM_SERIAL=y -# CONFIG_SPL_DM_SERIAL is not set CONFIG_MXC_UART=y CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y -- 2.35.1