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 8CCD2C433F5 for ; Thu, 5 May 2022 07:03:17 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A922E83F2B; Thu, 5 May 2022 09:02: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=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="MCVyzr5q"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9CD3183FF2; Thu, 5 May 2022 09:02:21 +0200 (CEST) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on061a.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe1e::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 8E4DB83FF2 for ; Thu, 5 May 2022 09:02:09 +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=J0aE6onhpBth1vj02tlI8/NWR4CqQUIOLrs4MuTotxy/gTwjsSnODVZzfUuicM6I3I+oJ8eMmgkQbtmk9etVhcST0L7ggSSG9BOWQXsMKOe1me5xGHuyROk+FTtVQe38lYBN5QSdtUmI6l8L2wuEYD+FLf9W9ADwtdXyiDi5EBxtpc71o6+uBHWHVZNWH/ApCL4Ccql8W++ICrOHqG0gMH8voKbKw2e8emQjcw3LOXmQ9g3/l7tCO4qeDjxqJjUvgwQNTXyoD6ejI6ADVRnVEUDJPP0eGHi/6fBTbAGe+geQV7/41mVDNkZMZLJvAUr1jxXneiiHZCBs8Q1lIP41OQ== 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=QpwWhqAzXh5E8Uwzp6be0BeSnNJ6eufUldX2wk++soE=; b=baETlm3MgdedAfmKbvyMmhuBpkznCQG2GCRAytxB7cIUsws11mmsAbH+KdVBo8hITyn9fsLJGvFuux6K2oxMPs/LIxMSRohy/ZisvQKctcu29Ow6mRbyWoynWVxZL0L8P9mmKgZZRV7/6KJXOWigbhGWbebsTOSdUlmBDU72dauk+XCXdQdTluElgo5Y3GMzQ+rdhHAfxhwCVsj0muvVKBrogVqhreILSgzntmxbeYCAIftJTZ5GCNJ9Y0qrqLcwJ332v9rGsJU46sOw9bJFhYT8L38ol6E8cduwoH2X+IBFUqXnFaZwqn5x39KB1h3+o7VDR7nJ+aP2Fk3ukTkTsg== 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=QpwWhqAzXh5E8Uwzp6be0BeSnNJ6eufUldX2wk++soE=; b=MCVyzr5q6vYPifTRsLhzAhs4dygeFzZqs2+648lp8GWOSMqDVQf9KNZLjEYZU0R4XNPdJjIuu1IbEGZOvusoeNPTkvuO0R/LB6UUuTOTVaePJGczFUt3u30+2Foj7IIFwn1HAnjpIXDlfbt75iqD/vXz2ONNyFVwLZAGFL2PmiA= 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 AM5PR0402MB2690.eurprd04.prod.outlook.com (2603:10a6:203:97::8) 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:07 +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:07 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, "Ying-Chun Liu (PaulLiu)" Cc: u-boot@lists.denx.de, Peng Fan , Fabio Estevam Subject: [PATCH V2 05/14] imx: imx8mm-cl-iot-gate: Enable DM_SERIAL Date: Thu, 5 May 2022 15:43:32 +0800 Message-Id: <20220505074341.24086-6-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: 920653c7-48a3-41e3-a444-08da2e652aaa X-MS-TrafficTypeDiagnostic: AM5PR0402MB2690: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: h3PGs+K+9URmx9FqBiv9oVBF0wEon8pUt20LPGwWm/JEcJ//wFSVQX9uOlJFWqHSybPzMgN5fjMIflaS3A+k/F5Cy+Y7e6wrZBv1itKwd8XcxAQPw84sWdODrtcvgPadSoN1zNQW8gVMJ0cltOKRAEJXQgAs8uLueJUkuy443jym3p40eXfxYX7ypblLtt9TMsVgzacIw/6658ffma+526vgpRXaEFRsy0z//LHUtX309FbHaIiCqoYtOoPmb0N8bq8cFCjyvLJgktNKZr4eMZBcAx8yf3uXe5Ld3b++iQj3jLMfeL/d854RCe54qdjUJxZVvrzUjzRADQ9WRql5Oe1fMzkVAY89sPUTXF7UF4vXacLF3KApYJtesTa6T56ovi8CabwigK4Q/ftVdbC2KmlnayREf10o64r5eWt7r8qV/oTTp4btT1wRlIL7Z3aJiZel9JvzanIyQDlgggC78tcostQ2slvFqicgzwOfnOmtl04zN6gPLK6zd1V2/k7LI76tt54VieF8pF8pWY7/BJQA07NlQXKKfLT+T7ONA/wzkFUDoYoaPDqFUDlLtWEC5OfFtE4e2R7REnmOgQuKvuZyyLKVGHhQDMgbjyHwpMitFbofj3QoyyAFRPLcOLw0Eks7hlD8We36zpmSvYtpxzje86+ipuZpkC2+TQqRzr8lwKPj42nvkmB/hnTGdZUZfqS4pCKrNWT8nUhl3jLFf0n1Fq1nHRLM6ag854hUtKA= 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)(66946007)(83380400001)(4326008)(8676002)(52116002)(6506007)(66476007)(6512007)(66556008)(6916009)(316002)(5660300002)(2906002)(38100700002)(38350700002)(86362001)(26005)(6486002)(508600001)(1076003)(8936002)(186003)(2616005)(54906003)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?uAIBdgoSM47p4isgZ2URmvuGc4S6yIW8R3ZD8WJupiCakZYWWSAlqUerQ8Z3?= =?us-ascii?Q?BRuvNd4WBDw0NkaM4U4OEHi9P3j14HCLz06NoqQikNdKpzsco8owybesUMFa?= =?us-ascii?Q?Eb1hejqYPkwRDijgkfhswURCfW01K6G85EzmEdSTl063M+LUS01+3ipAwPbS?= =?us-ascii?Q?LfyLej2P3E/2IBr3bvG+Vp242Wy4cJ2a58orXDb3Uku6hzkBBiovPQgfJXgI?= =?us-ascii?Q?CACM+Ijk8MulLrbSvqDNOtxlGzWNk/eXxp+TMHe0AeC2+EnMshnByCOjjIsS?= =?us-ascii?Q?dHN+ZrAEkVcxUr0oKnZxUqnzRC8c8xAyX+1ttrL9B/rXfdCVv6j5bx9BrAlD?= =?us-ascii?Q?ZP2mz3qPsiZlIVrqpdW6rI2+Xg3RGFwCMyE/hVwjx/hTyajPPmLtupctmZrJ?= =?us-ascii?Q?H+QcYHMpWueQVUJugNGtEOIRi2s9RPnZCqXF3edUbugD5+pfseO+4TqK+d87?= =?us-ascii?Q?GDOt+6TRwXBdiR3S7MUJIlytck1UTu81BmxrrUGhP+yb07Oi/SP+PI4/fzVP?= =?us-ascii?Q?X9khoanlDNTvJepWsRuhrsNopuRx11Zjz6fkou4qeEqeTb+nINaI4fTU1ZPx?= =?us-ascii?Q?+aTf+enRv51hVJL7GlupDg5/pGz0YfAdAdQETx33+1jrExbNQzd6pgPgmW+J?= =?us-ascii?Q?jBeQYmRt7QvRfbK+pX+sh1IbWmZJAP9+II4+63ZyWkhZXJmeIrMiSeXsG06B?= =?us-ascii?Q?lR/z5yxW5tEI0p5SkGgxpFyCO0ChcqdIPJu3tDEdyHC32HBjPSkpcH4IOlTH?= =?us-ascii?Q?PXZKn9+NL0FvmAT1y8oWNHlDa++DH1QF2UhcthgQ/zOzGIG5Rex0u4BZh+Z/?= =?us-ascii?Q?KlP65VBqKQvLOwaK1H4RQ74Zy1xyJYpPk+ROHdMFG6IjIVCkFg9Rv0QQyEGb?= =?us-ascii?Q?1p1J5wfK2HjbJ5CTN9Ri8LSFWttJldNzhT4gp31nEyc9jvxWTysYeVFsLaRa?= =?us-ascii?Q?n6kGptaJYOG/AGZDbs3NPZJT81z29JpWmjKY0hQfWQ3x63x8pZltR/McwVmg?= =?us-ascii?Q?VBTKCtj+PMZ/d2ntU0WPxPRLX1TZNCsagMKtlOV8R0YGhz/u3jyMxpPKHTJW?= =?us-ascii?Q?L8ZN5Xhw+enshyia+Mg1hEX/wr4G/EK+DE+w8damcrtKyFCSuTieub2WlH2L?= =?us-ascii?Q?fm/RltfyFlj6MFHrHD6CS1vED3JK+nFypfoeGGOL0gobBV41IFVuCLjavHjb?= =?us-ascii?Q?abyX8P64jc4nNTRs7kNdDxTNUZGCONnL6r0w9h7TB1W2ripwdR/wBtMN33Os?= =?us-ascii?Q?eZ4AF7IH0PHTKNFHKZ0xsvMmNewIijItqSF08wdie5LAzZart9jS+YrjUg6E?= =?us-ascii?Q?5yCj/ZFsfhlO45lCUDesG7+f5mcim4UeB0vshAse96nDGk/ms8wYS1j2R2pM?= =?us-ascii?Q?Ak6Re/fHXJqs+IiKUIFqT/+rUe+f1SwisnLjPyZTDJTtGQVBvAL16OxErRwf?= =?us-ascii?Q?yC5U0aNxuxK7CKoyKSTAI8cG/RktlkolDBsV+8oUGeBxThFC+gn0/nWqIFF0?= =?us-ascii?Q?DE7h0ClyOixaFzIoRG96Uym+9PqL/Ls84OUFF7S6d9rtKyudcV2HNVc+j42r?= =?us-ascii?Q?Qc6Pc88zjW3oM830WkT+LRQRS6d0PrBo99/CI/UWhH9zVSWutVhzQQakC3Hh?= =?us-ascii?Q?OK7bOWe4LYOtUuqPf31i0uBf/VJ30vqS+B7zMoDFHpjpaPjAz0vnIMbiYko7?= =?us-ascii?Q?QyPVFGMIakULjMQu1QXtSFPAIbojC2xJBw5SOSENeVmVtTvEb2J1iQsQ+bJH?= =?us-ascii?Q?8eHzVK5Y4w=3D=3D?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 920653c7-48a3-41e3-a444-08da2e652aaa 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:07.0778 (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: oU/SaQf7vlsEZIbLh1lNAAaI/+6Y77/saliGl/5TtzlZDZGX6ZAyntUq9mojz1QeqsM0nfq8zW0iP222DTt6TQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0402MB2690 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. uart3 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/compulab/imx8mm-cl-iot-gate/spl.c | 12 ++---------- configs/imx8mm-cl-iot-gate-optee_defconfig | 1 + configs/imx8mm-cl-iot-gate_defconfig | 1 + include/configs/imx8mm-cl-iot-gate.h | 2 -- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/board/compulab/imx8mm-cl-iot-gate/spl.c b/board/compulab/imx8mm-cl-iot-gate/spl.c index 2dc62d6682e..f183704c9d2 100644 --- a/board/compulab/imx8mm-cl-iot-gate/spl.c +++ b/board/compulab/imx8mm-cl-iot-gate/spl.c @@ -83,14 +83,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[] = { - 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 iomux_v3_cfg_t const wdog_pads[] = { IMX8MM_PAD_GPIO1_IO02_WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), }; @@ -103,8 +97,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; } @@ -155,8 +147,6 @@ void board_init_f(ulong dummy) timer_init(); - preloader_console_init(); - /* Clear the BSS. */ memset(__bss_start, 0, __bss_end - __bss_start); @@ -166,6 +156,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-cl-iot-gate-optee_defconfig b/configs/imx8mm-cl-iot-gate-optee_defconfig index 0bde51a91f5..bcabc0d91d8 100644 --- a/configs/imx8mm-cl-iot-gate-optee_defconfig +++ b/configs/imx8mm-cl-iot-gate-optee_defconfig @@ -110,6 +110,7 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_DM_RTC=y CONFIG_RTC_ABX80X=y +CONFIG_DM_SERIAL=y CONFIG_MXC_UART=y CONFIG_SPI=y CONFIG_DM_SPI=y diff --git a/configs/imx8mm-cl-iot-gate_defconfig b/configs/imx8mm-cl-iot-gate_defconfig index d734586a60c..2088ad47dbf 100644 --- a/configs/imx8mm-cl-iot-gate_defconfig +++ b/configs/imx8mm-cl-iot-gate_defconfig @@ -113,6 +113,7 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_DM_RTC=y CONFIG_RTC_ABX80X=y +CONFIG_DM_SERIAL=y CONFIG_MXC_UART=y CONFIG_SPI=y CONFIG_DM_SPI=y diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h index c20c32b6951..fcb46c16605 100644 --- a/include/configs/imx8mm-cl-iot-gate.h +++ b/include/configs/imx8mm-cl-iot-gate.h @@ -145,8 +145,6 @@ #define PHYS_SDRAM 0x40000000 #define PHYS_SDRAM_SIZE 0x80000000 /* 2GB 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