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 1D4B5C433F5 for ; Thu, 5 May 2022 07:04:02 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 130C58409D; Thu, 5 May 2022 09:02:58 +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="XLleEJW3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 40A9483EEE; Thu, 5 May 2022 09:02:30 +0200 (CEST) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0626.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe1f::626]) (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 E070F84073 for ; Thu, 5 May 2022 09:02:20 +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=JzHTlYAaYK/AXnrfLAdYFtXQDLWPvFm7iO5wtPcKZwyNgF7vd47SSeDmo2LZF1bDu0d5Q+KZQixFpgK3lbJKPnXiAJq8lH9O4YXZpSlue0Ou7LvI/vuqBPKh4q6iNNo8ethzUcJYXtDkvYTw7Yk/wGP3KqpPL0NaFFEkmGdZD/L9zk3G65m3Duun6OWCDkzcA5Zu51T65SYiuSeRM0z9u7NLy02Bi9yfps5h4lG2LGYiaCj3MUYM8CB+DpPhO6Eu1hImHDFY5S6/jUyjn3M9LbN5lNtm96uAZdysZOvNEL9DDxT+2Fq+9+gq1Dey6w7rIj2UCGNUgJs9JyJ3TLXDlQ== 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=mA2PyThJvM1bwF7qDls2l/uwupBHy3Cf3hyWxi9kbp8=; b=IEHjqYVrBy8lLUuKDFuGn27Ail0RFtqV6Hjl379nrPVjTYSvRdhyTIj1ua1QJy92sTWUUGKOJdyr+O3v8aJI+KgWKiv8QkL7gixhTnQau4NsfV2/kRVbjuoUQbC5YD0dFRcGMz++KW+IrNOGQF7WuA6pk8EsY3XxFPuqiW9GV1Juos+g61rrxsxilLshPjM+r/dUpbnflLdOEoL0oU3h885kI0oFugFY2CfUzs++A0A6aXKgP8KQd/b9RtVDfWSWEcNP/tvcyfpvy1U6ssURpIJ7UZEHk5dfkZQfp/HtA1IJr8RGpsCRnAbmaUMTSNVhR6WWv19nXU4uLKq7IgWpqA== 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=mA2PyThJvM1bwF7qDls2l/uwupBHy3Cf3hyWxi9kbp8=; b=XLleEJW3URQzlY0vzqYVCVlnULrJR7ntJko0Wqe4qzImxHwnAaP0Q+yQX7SjRotOOAcUgn4Bhq5dApbeBRFdmy4fSHgLlsd7tw3ohosVj2DBefl+Dpqtybs1Wz3bwWqfBkXdgHFudSUD23MYohObi8W5MIuFfSWWJfsFMbAMUo8= 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 AS8PR04MB7560.eurprd04.prod.outlook.com (2603:10a6:20b:29d::14) 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 07:02:19 +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 07:02:19 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, Marek Vasut Cc: u-boot@lists.denx.de, Peng Fan , Fabio Estevam Subject: [PATCH V2 09/14] imx: imx8mm_edm_sbc: Enable SPL_DM_SERIAL Date: Thu, 5 May 2022 15:43:36 +0800 Message-Id: <20220505074341.24086-10-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220505074341.24086-1-peng.fan@oss.nxp.com> References: <20220505074341.24086-1-peng.fan@oss.nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SGXP274CA0006.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::18) 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: 3639e943-d2e2-424e-e636-08da2e6531e1 X-MS-TrafficTypeDiagnostic: AS8PR04MB7560: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: Z31+UpKgebPb5+IhO1Rf09T1kb50PMi5lyYOs+u1zq1BAkNFSdr5hyu5Xzg7zg3Y7r/FdIj95b/FvdiGnkydf9RhLSSqhDoOSpMwA9bFwGbdkoXqKcuprWKIWZcNnSsJE6QRYCXviHtM91KW5uh9zRHsVUjQlrxHMTkxCa/NJPFxp7D9k+3cg5wjvcL+nKVR+OY+TtFZ97c0at3UM8q00TQB0f2MPM7eJpGYz8tn2vQX78t3RDEtilvVHfrMJCnVrBiDmukXs9nzGMN0c+qoTg2YAfbUrk3UrYcTnQiyihypyIb3T9rRhcrg2w4JUwmkW6MtiYd3wNouPQWl5J1FrMp6mCgm7hIH/oyKsVaEE6znRcxLNudUMshTdJ31Aq+smTAUEEm94LHt/g/Vym9Oow2RPCvg/vw8ecCDpii9pRd7quhwNovmMftVyg6iqHoLFNTF0deSoWWb7yQZnFXuXHdySfIjSEO3SWgkEIqDRAxZ10gcEx/OwnR0YxjbxB0iepnP0spG39gq68XT4LWjYIOmUu/Dexm8p4KFweL1fLu6hpnW/gLLUhgqwX4o5NhcNmqIPxSwwkK47HR2gUKXsvirpEC7dDXPjkPhDlYCO0DWhohvXzmq1JO/NwhtBC0EMLBkcdlNoEKxvMSpV0mKK3IQc7WwOYuuZOe0FbIXEYdhg34OAsAXTxe5wWzbN6bV4AbgDKLnn2ye4qZ1dNftgw== 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)(66946007)(66476007)(66556008)(86362001)(8676002)(26005)(6512007)(4326008)(2616005)(6486002)(2906002)(6666004)(83380400001)(508600001)(186003)(8936002)(38350700002)(38100700002)(316002)(52116002)(54906003)(6506007)(6916009)(1076003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?IbNtB0MuSKwxie14mUmDDXchegKZ420eRHWUFEU914Ut60I8RS9c9qeTEvsS?= =?us-ascii?Q?q370RvCLuRfkvMx3FRznJmP/Joy6u7KAzILFKosJSkNLpmQKwOwPnF7yZ0Ql?= =?us-ascii?Q?WLd+yzT5toWht8SRCD/azezAoXnIaa6nkaqtZudWGhKNoG36cBnJodpRR1TX?= =?us-ascii?Q?UjOLgl4onA/MRmQnwMM3x78ez11rMD03DtZ0gw59f4xPOKIJyfbBqbNMSKQa?= =?us-ascii?Q?6QDO++TQ/W59fYu7r/SQ8YN04Cz0CqA/RJ/dW1X5e/7aOkciQBa9vYt1TFcs?= =?us-ascii?Q?B71tjY5KweGuL+LAqa4sGys5WKoxLmMppEbw6RCnXDos04zyIs7z8aTcBSzP?= =?us-ascii?Q?bWNxmgZbw+spK73kGrLenGFTQ6kuwO4J2x/44yagTAkQdWdA407T3M5RA8Lw?= =?us-ascii?Q?OpI1MO13plqlO09ZMkNSCgGrtFumcKeEZsC7xkqK1u0v3YsPRGdkaE00vziy?= =?us-ascii?Q?xnOYcElecxWv2iYEXufSuxbTZi4stHajCIZFM4QinGrfrhHMfR9LKayXMAoF?= =?us-ascii?Q?Mby4guh8YCvIeph14DTp/GXn3kRa/qaTme2YEMdZkzhHkEsfN8IMhKH88pjH?= =?us-ascii?Q?7KNC9vW54iKlGfKxtDpcDmPJX5039XeiH508yZqwoufdyoxxk47qRwysme21?= =?us-ascii?Q?mooGXeIwEqOD4HxzQuJYazLa3siQLVLbRhFcgHi4S8757saQDXi9xK3SIoFs?= =?us-ascii?Q?Mjlw9pGDltEcIMsycLCUCiTSMUYdE4Ef5u1QkkCN4RRIXfk67Dhyj2+gwRAM?= =?us-ascii?Q?iZbBsSr36mLT+o0giqNeil0u5ucCm0KudoqfFcgMnu+96hO2f9CHPtytN4wL?= =?us-ascii?Q?E/ygDaCjUlrHmVUrXWQjTP2CYCzSJ2UP3puHqGRGatWZ9N2EPi/21750OePx?= =?us-ascii?Q?bUtap3t3sjHYytm1rVX1/oZRiouuUbigIPdeRibWUrfbqnawfiAr/zkWqTAn?= =?us-ascii?Q?5EO+GwNi1ZDlHINR6E1UUqdNJ9sSwvzb3Jg0s+R7EiuYi9YGh0DmG9i+J2oW?= =?us-ascii?Q?GDcnRBp7SNa4ReKe08vwCoLyB9XNR430pwlns9puH9jF8QXZ6K1DkeSwDAgk?= =?us-ascii?Q?Wc6yfra0dsTRUqsqAHGb4rDB8XIfzKwPSgPWA67+qffnhE8mV7LM+YDKV9mH?= =?us-ascii?Q?Spklmc4O06NDxmy2zM3kp/+RQ+v4JJcGqpfXDZe7EPqVQ9xlOe04mfnlQAMT?= =?us-ascii?Q?gVGxZpI2+KihVAmF9bXieugYBlvsaYVUhFyLxt7lbEllTUQTerzdMcnHH7hI?= =?us-ascii?Q?1L/iPoc5XYrxz/dbtHqfMZwpzDiagVVMZFzpzWG2Nj4PYQ5XwJnLksOmswZM?= =?us-ascii?Q?P41aaoxL2ofcjZt3RFf1F5UKCzIY5Q1RHyg+0oLJ69ouJTWwrgNGcLNXQpgb?= =?us-ascii?Q?sz5zBEB3LczdIjYdXsPaFj78MlBIDaZIanIQ3Y2rOzWh0yShw6ySDBJ3gt8m?= =?us-ascii?Q?ITKEMQnMGSprxf+pfd3YVmIo5PYX6ainVDUhTQOvNuX2GsrY9C0yvv51bS7N?= =?us-ascii?Q?ZQ1y2pJCHS+XQfnc9GwIk8mWL6az3VsdGIRgt5Tp9QFyDECkdzQ7AvBUDytC?= =?us-ascii?Q?BwqXeFyIm+4r4siA5yppffToLAIOSLlQZTJGjcslP33j9Enmm4vXX4Ec4cgV?= =?us-ascii?Q?aWSGPuT+a48K/jJ7u+e+4IubJds5g2z3CXiJu6HCNMb98Myzws8WaXNQ8AkF?= =?us-ascii?Q?TLs9IFmcolKlXGWX07uX7zJO5LdaJN0iKUd0civIsQLg5TmSic3sT4t/CyIW?= =?us-ascii?Q?Yj76+JnroA=3D=3D?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3639e943-d2e2-424e-e636-08da2e6531e1 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2022 07:02:19.1683 (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: rk8dhKSAZPDqRaw2zXIMQBl+1mq3BlqmHTBMnqE+kHseNKJvdRF50mHSaxzLsFzKjji0FEDEvvNC/Mo2/xWgaQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7560 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. uart 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/data_modul/imx8mm_edm_sbc/spl.c | 12 ++---------- configs/imx8mm_data_modul_edm_sbc_defconfig | 1 - include/configs/imx8mm_data_modul_edm_sbc.h | 2 -- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/board/data_modul/imx8mm_edm_sbc/spl.c b/board/data_modul/imx8mm_edm_sbc/spl.c index 36cad14fc41..f5063eb8c19 100644 --- a/board/data_modul/imx8mm_edm_sbc/spl.c +++ b/board/data_modul/imx8mm_edm_sbc/spl.c @@ -28,14 +28,8 @@ DECLARE_GLOBAL_DATA_PTR; -#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 const iomux_v3_cfg_t uart_pads[] = { - IMX8MM_PAD_UART3_RXD_UART3_RX | MUX_PAD_CTRL(UART_PAD_CTRL), - IMX8MM_PAD_UART3_TXD_UART3_TX | MUX_PAD_CTRL(UART_PAD_CTRL), -}; - static const iomux_v3_cfg_t wdog_pads[] = { IMX8MM_PAD_GPIO1_IO02_WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), }; @@ -47,8 +41,6 @@ static void data_modul_imx8mm_edm_sbc_early_init_f(void) imx_iomux_v3_setup_multiple_pads(wdog_pads, ARRAY_SIZE(wdog_pads)); set_wdog_reset(wdog); - - imx_iomux_v3_setup_multiple_pads(uart_pads, ARRAY_SIZE(uart_pads)); } static int data_modul_imx8mm_edm_sbc_board_power_init(void) @@ -149,8 +141,6 @@ void board_init_f(ulong dummy) data_modul_imx8mm_edm_sbc_early_init_f(); - preloader_console_init(); - /* Clear the BSS. */ memset(__bss_start, 0, __bss_end - __bss_start); @@ -160,6 +150,8 @@ void board_init_f(ulong dummy) hang(); } + preloader_console_init(); + ret = uclass_get_device_by_name(UCLASS_CLK, "clock-controller@30380000", &dev); diff --git a/configs/imx8mm_data_modul_edm_sbc_defconfig b/configs/imx8mm_data_modul_edm_sbc_defconfig index afc8c43ca99..dd3c2e19e52 100644 --- a/configs/imx8mm_data_modul_edm_sbc_defconfig +++ b/configs/imx8mm_data_modul_edm_sbc_defconfig @@ -200,7 +200,6 @@ CONFIG_DM_RTC=y CONFIG_RTC_M41T62=y CONFIG_CONS_INDEX=2 CONFIG_DM_SERIAL=y -# CONFIG_SPL_DM_SERIAL is not set CONFIG_MXC_UART=y CONFIG_SPI=y CONFIG_DM_SPI=y diff --git a/include/configs/imx8mm_data_modul_edm_sbc.h b/include/configs/imx8mm_data_modul_edm_sbc.h index 33778a2365e..ff98095d27d 100644 --- a/include/configs/imx8mm_data_modul_edm_sbc.h +++ b/include/configs/imx8mm_data_modul_edm_sbc.h @@ -41,8 +41,6 @@ #define PHYS_SDRAM 0x40000000 #define PHYS_SDRAM_SIZE 0x40000000 /* Minimum 1 GiB DDR */ -#define CONFIG_MXC_UART_BASE UART3_BASE_ADDR - /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 2048 #define CONFIG_SYS_MAXARGS 64 -- 2.36.0