From patchwork Mon May 23 12:40:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1634536 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=NV+Hcw/N; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L6G911FS2z9sG0 for ; Mon, 23 May 2022 21:59:49 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 65A65840B6; Mon, 23 May 2022 13:59:11 +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="NV+Hcw/N"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 958AC84207; Mon, 23 May 2022 13:58:34 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on060d.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::60d]) (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 A8D2484184 for ; Mon, 23 May 2022 13:58:26 +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=ICjIU151NbewHwaYI0gR1b87SdQfqqtcTWx4gg4lFGz4+OOwEeeJuo55mgD0HR1Xlbr+QcpF5V9AcKqhnwLd4OhvH/y38O1VO/gYtP9TbDmUTirsmjJf4o1O2HW4QqRjU1zNdT9u2IDlhnHdCiUh2Pgw2006SNlIOcg1FP9xPRxjafFHbSd74CJEWXAGahZHOIG33XQ76/QY6PeICqCUd3q0GBhkNa4yij9w0UH31/PqB2xyN6clcuvCCmSMNPmu7VJmzyYAEIanMvajF2nvJ/betSTyBgFvqZbYHu7hM5sK0xms/1J/FUVEhJouPqWS/Hse0C7g5a13I38iLnDGuQ== 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=p3HBF4OTec1pai9Axs8z12yWvxTiKfUWGy5ca1wCCXg=; b=n2wLIgnk4o76WVDlWoUy1rHe/IZxcszWWFvgc4YSN2NUnZRpCmM+8Q4+msaBc0cOBV6bCODOX/aVwbo+8TZIEY65f4hzuyB8p2DO1Jv5u2M6mlnsB9hHKZzlrZeZUk16eQsN9uQHWkDs8+KEWatt79K7hE3zurdNFQ/JHLQ3Wts8/zDPPchvMPT1XnS9GQYwUttaakcI5ZiX2mmCGpQyvv1V/FnmwL63lN8q/fw39mnUCCqsk6deQDo+8Tu81yQN3ucwBKkkbi6YRZ041W476KjvZoXxqnAPkqj3J6aEbvycLMPQZEQcS6GAlQbigH0ZOvT4/Sp/VsmxUog/B7Xx0g== 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=p3HBF4OTec1pai9Axs8z12yWvxTiKfUWGy5ca1wCCXg=; b=NV+Hcw/Ny3kpCoQPLcNB+7yHKZ/sN8+jo9JCzLaeaklaC5MyjsNAYGKlWuvQ9e5Ejf0YNaHHRFK93q78Oa3P2UWMEkJFZtJrqc+uJGjSmW2yhixa/VpHg4oHcYxClHW7yI05keFKynADj3qQQsPy5elpHTP5ceZ4333P3tqwwMI= 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 AM8PR04MB7972.eurprd04.prod.outlook.com (2603:10a6:20b:236::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.22; Mon, 23 May 2022 11:58:24 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5%7]) with mapi id 15.20.5273.020; Mon, 23 May 2022 11:58:24 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, Jagan Teki , Matteo Lisi Cc: u-boot@lists.denx.de, Peng Fan , Fabio Estevam Subject: [PATCH 05/22] imx: imx8mm_icore: Enable SPL_DM_SERIAL Date: Mon, 23 May 2022 20:40:17 +0800 Message-Id: <20220523124034.12813-6-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220523124034.12813-1-peng.fan@oss.nxp.com> References: <20220523124034.12813-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR01CA0010.apcprd01.prod.exchangelabs.com (2603:1096:4:191::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: f8c0ba07-38c7-4c93-0b01-08da3cb38a18 X-MS-TrafficTypeDiagnostic: AM8PR04MB7972: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: CCD6YdsmRkfY2o8nFEy/Bles1WGdGp3ulGnymdV65aVh0YihjrJh+Bp4s/MgYBCm9vosHMMVH8gJkA0WtnR0SINL7cbfkmQNoqlfRumwo6k5kh1sGtIYMqj0HU81XESUSIvbk/D8qVKz+L/wnlYGQ4hMa/FlgVjBKOUHjMMejv57yv1L2DuVUuwm5bthXYqj0w0MgSH4FKwzEsC7uhmJgqePnOewcNGQmRqE6u2oJMHqtb5arKeoJtZ2RPFa3ubETfcA8Mu1g2iZnkdWsCiHAAGfjnH00fQ1h+TT3BlxFiWoYx5ca5/uWxKXfhJyE6A4TgLOuuK+/8hXMKCpieSW4CGxtjnHh9uchuXJTJ+TAYunWwA80yd6NSOlGUdh7VL/paymvkeS2M+Ol7kZjs04qAga5hY46H1gjcooBDYxCvFc62KzPaxdw1aNGCk+2/Q3Ym5Ardr9rmN4kpqU8QHmmZXVX95vhTPmYB5qNwTzsYxhbl69dSa8tVcdMfeKjqIWCmA9CLOUCV+9GuasX9zNvyI1NEkPAoGm7NKvrm2v+yt39l46ipU7hCNAzz1VTgp2O0jD+MGWGYYRHxUQ0dIpV5148Pdg/eyhAMphmC8mPUr+P6S7YyRDkjfi9um2zUkukzBWjjwPEOxBQsw7cRBtERvaNYlVZSxpvSt6F068+HeYuNYuBLHq4laO87JV4z07uXMSEy99P2Uo3b8EalDTlg== 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)(1076003)(508600001)(2906002)(186003)(2616005)(38350700002)(6666004)(86362001)(6486002)(83380400001)(54906003)(8676002)(4326008)(66946007)(66476007)(66556008)(26005)(6512007)(5660300002)(52116002)(8936002)(316002)(6506007)(110136005)(38100700002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: af7k3fqYP/g8xT8AyZPGYKcQc6keSlse0gaTG+GC7kBJ0YGuy179jnBPCCTSddo1ATGt+dxLSnmtzrPAjUuQii+PLOBBgn4AjWFLwkqZuYUUg5bW0uY25r3cu2N4T92lq07YINNpuXW/SBT6v23KQ01i7S2tueRkESkPv6sfGt9I69t+WZbDkWty62nrsZjdB3nMpcn3DQhT0GVv6Qo4C8BydcX9O4Hnb0Rx1hgV/wR54jfb8h2cDgSISzYkMYTYAWxHaD5l6oaAz6+qGF4VTGu320GGYXOFiVYewI0MVO8cs4nEXQwWrEVMOO4PoVFoOzBRHOGTtpPpwMw7mxtnl/moOzT6mnN8pK4hwUwrgKQYDoe1yz7tdzsG41VapzftT9Z7MXDE6kuKigO6m07DLAXIARvq6AXVCO4qA+H1YiVn4Boiq/YQtaHuVKmTZqv3mMoXZcB5o5TgJZEPUjEuKYP2GjYRDzUOJdBKdLmVpMpfyHcajb62i5k2D0MSo+WFI0WL5yiXXcKJqf6t/tDDPpI+FLZGkRQFDd8M+uxWuz9v22GvsAEmgNgYbDHHGWtR+yk9adyFMjb0c7NKkrb4+DGwdNk6Bm60ZLjO68gpnVedSu/dzKTi0eU3CPpjsnxjnuMNc/B1J8qDUOFI0j7k1a4AnEloc5FRTAgTTe/TKMoA3KnUHvxLVfafNiqruvpTIhdGFSezbkGcf+qfx2vvwNyG87axqUsO/FTrZbrlH11GPFbDuWkzVBd1oWlIoVhpPYgnRU77JDwIRHVIL4PYB5sfPovQ1cs2JXhyN6pw4ctF5cuUadMUoRmxb7IkSKv9CFv17QVMySSvWxK0Etax8b3/wMwbGRj9Ql7CjOG7A1KDy5ZfzJDk9ENSP5shRY6xcGEtHOvBvkSH+MoN3Fc5ygRc1ePQA+0skxMtDfHbUlFSaeByX87gqGSEzctRqkQpkN7hoEX1skTV6/ElcUeKBBS0P18mEbJ7GSOI7w6od/StwTmZrPSGnPQn5pL0lb6Eur1WsUPlagIlxO+TX6fwpdxdnRsNNXXDeyMNzxvFmoJLEAjnf7jbPzejK2tlCDNnJ7YPcBM4xpsqOb77zgFp0GVf2+V/+b/n+TDNoZwlYzBJkkxow67zLdJaI7EgWij73+bgjH4ZSA8o38xbYoXl1suYeiaj2DZ/gcJgYiTqh/hxqNb4e2dCs2RBbxFnGujuiw1BFV5Ed7/IbefsaMcku5IOXx/sTnWWniUh07J2eE3kD1x9h9KHYiwM5AEiFiB6/lY3xOMo+iq71m3pjVRgsmwTHiPTTg0s0sHIq3wL9/FLdfU7CaC7Cub+CrPYZ6oh4jeSfWqALF387J9mnaSaO8w9kWooSbFDFB6s+QAXE61TonM5leusHqhCgCJnDtAkUBy2cEszqzXSNbTMcheqSljHeIiYwzz1a9UX3Z7ZA0OzJVkm19ubc9hZGtUKVrw4YppAX8MnlyyYdElOT3TcGGNizU4h0BRXtUyGl1IlIArk52wJLPB0uTZhbHMTo9VEeQgYPNLPiYlzJj81UVxjX0o5NYzqmPZA40BxybY608dfPAp9KQ9BgGsrcyuGh2FD0gHqGHOWhqaKLXinO9VHmdY4e7fGMovP8Sdgm1gUTyl1txKOnOXfV2xHkpW/tKspCMGcq/3JnhrBOLwUC1oa7AhqYMLLigNOf12giLPRiZyCUSjVR+dKN6GQUEVX54Bjg5TKSRQoJG61/J8VGS7mKA== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f8c0ba07-38c7-4c93-0b01-08da3cb38a18 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 11:58:24.1708 (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: 2SkWag6ZUOuw4UKEe7t/EGj+jhLvuIwRtUZP8DYm+uDpPkm/8+60NOJgjJB44lcW7FKJOG7cO+oxPt9HEtEpdw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7972 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_SPL_DM_SERIAL. uart2 and its pinmux was already marked with u-boot,dm-spl. Move preloader_console_init after spl_early_init to make sure driver model work. Signed-off-by: Peng Fan Reviewed-by: Fabio Estevam --- board/engicam/imx8mm/spl.c | 14 +++----------- configs/imx8mm-icore-mx8mm-ctouch2_defconfig | 1 - configs/imx8mm-icore-mx8mm-edimm2.2_defconfig | 1 - include/configs/imx8mm_icore_mx8mm.h | 3 --- 4 files changed, 3 insertions(+), 16 deletions(-) diff --git a/board/engicam/imx8mm/spl.c b/board/engicam/imx8mm/spl.c index f9be769ec59..f75f2dc634c 100644 --- a/board/engicam/imx8mm/spl.c +++ b/board/engicam/imx8mm/spl.c @@ -54,19 +54,11 @@ 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[] = { - IMX8MM_PAD_UART2_RXD_UART2_RX | MUX_PAD_CTRL(UART_PAD_CTRL), - IMX8MM_PAD_UART2_TXD_UART2_TX | MUX_PAD_CTRL(UART_PAD_CTRL), -}; - int board_early_init_f(void) { - imx_iomux_v3_setup_multiple_pads(uart_pads, ARRAY_SIZE(uart_pads)); - - return 0; + return 0; } void board_init_f(ulong dummy) @@ -81,8 +73,6 @@ void board_init_f(ulong dummy) timer_init(); - preloader_console_init(); - /* Clear the BSS. */ memset(__bss_start, 0, __bss_end - __bss_start); @@ -92,6 +82,8 @@ void board_init_f(ulong dummy) hang(); } + preloader_console_init(); + enable_tzc380(); /* DDR initialization */ diff --git a/configs/imx8mm-icore-mx8mm-ctouch2_defconfig b/configs/imx8mm-icore-mx8mm-ctouch2_defconfig index 535ff6dcba5..d95a74a7237 100644 --- a/configs/imx8mm-icore-mx8mm-ctouch2_defconfig +++ b/configs/imx8mm-icore-mx8mm-ctouch2_defconfig @@ -74,7 +74,6 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_CONS_INDEX=2 CONFIG_DM_SERIAL=y -# CONFIG_SPL_DM_SERIAL is not set CONFIG_MXC_UART=y CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y diff --git a/configs/imx8mm-icore-mx8mm-edimm2.2_defconfig b/configs/imx8mm-icore-mx8mm-edimm2.2_defconfig index 101d5a00bc7..43c697a39d8 100644 --- a/configs/imx8mm-icore-mx8mm-edimm2.2_defconfig +++ b/configs/imx8mm-icore-mx8mm-edimm2.2_defconfig @@ -74,7 +74,6 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_CONS_INDEX=2 CONFIG_DM_SERIAL=y -# CONFIG_SPL_DM_SERIAL is not set CONFIG_MXC_UART=y CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y diff --git a/include/configs/imx8mm_icore_mx8mm.h b/include/configs/imx8mm_icore_mx8mm.h index b9b24a8c51d..1a439370c09 100644 --- a/include/configs/imx8mm_icore_mx8mm.h +++ b/include/configs/imx8mm_icore_mx8mm.h @@ -65,9 +65,6 @@ #define PHYS_SDRAM_SIZE SZ_2G /* 2GB DDR */ #define CONFIG_SYS_BOOTM_LEN SZ_256M -/* UART */ -#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(2) - /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 2048 #define CONFIG_SYS_MAXARGS 64