From patchwork Sat Apr 30 12:43:09 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: 1624668 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=akaPKxkr; 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 4Kr7Kk2xhhz9sBy for ; Sat, 30 Apr 2022 22:03:22 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 45AA583F3A; Sat, 30 Apr 2022 14:02:24 +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="akaPKxkr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id ED9D883F37; Sat, 30 Apr 2022 14:02:01 +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=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2060b.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::60b]) (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 3841583F2E for ; Sat, 30 Apr 2022 14:01: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=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jeOdPkCkZRMmHHwss4KSll3NGadln/Wp7iMUtyf5tmwzXM44mu0hJ3cZNEXeaBdjS66RADealdWeH48gcRdXvKWgBoouEVB5dw1NOGCFHvDqdmjh0AqR53L2ttzsWWNzYJ7wViLWrHYilNRP1aL6EX4q8e5MRcl5NHVUBltJPw5WKcEJbE98Nfet9e7o7s0dUxQIwojn175SYOUfuTeIc/EKFKjPZEVAWW7dQL3eR+Lcao+DjlaKb8qwxxjGzko3vryW2rfQVVRbIjqE4Tkdi9yJoVH3KcFrXS2nxOdRcVLBwpOcLd8tvdtFKJiPRVYUBDkSwwbt/K1vBzv632wbrA== 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=fB+3KKWW2Nhf3g/MNPk9SuSlD0ahzxR2MTZ64UqTnqE=; b=Y88yfiUnKs/eqM1sGFQEGb8DWCzNpe0481/f2C32UcDcx6EjrTtjTQfsob968HtvljETDyoZjtbzWOyg8i/ekfmoNRU4M1XPLrc0cQ28wTu4XT8l0BGyctidD0BXaF/r4zsuRltsuD/LKh/LTC2APkzpdTv3UflsJdWyVbYnuBewIppRsqE+mrrgkPDe+hnq56kD8LGD4pmTcTagq27FiFxxnvK17XvA9vHDEfPCo0wX6Sd5ykJ6+CDTDHPathINtisXzcFEDwOxrXYWYFx/qAX46F8rmiLsa0qXVd2pnD200EnKQF8Gk0TgcPpIihu/RsilzG09YTeacafCMjOSbg== 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=fB+3KKWW2Nhf3g/MNPk9SuSlD0ahzxR2MTZ64UqTnqE=; b=akaPKxkry1bhyN/s//3HpL6kW79sh7QxXcSrnJfVJ7+/Ag3cX5kjGONETjeNXdkIWzcat22s04rftp+u/ChttWrlVtgfhP1vkiv1azutPuSp/RuXDcFc/xLW7ZrF3NPI2gqg/xhImc0CGltgXz3VcV5TRO7q19wyaObwJ8XF/5U= 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 VI1PR04MB6111.eurprd04.prod.outlook.com (2603:10a6:803:f9::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.14; Sat, 30 Apr 2022 12:01:55 +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; Sat, 30 Apr 2022 12:01:55 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, Teresa Remmet Cc: u-boot@lists.denx.de, Peng Fan Subject: [PATCH 07/15] imx: imx8m[m/p]_phycore: Enable DM_SERIAL Date: Sat, 30 Apr 2022 20:43:09 +0800 Message-Id: <20220430124317.17382-8-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220430124317.17382-1-peng.fan@oss.nxp.com> References: <20220430124317.17382-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SG2PR01CA0186.apcprd01.prod.exchangelabs.com (2603:1096:4:189::14) 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: 7b65cb65-de89-44f0-0e5b-08da2aa13832 X-MS-TrafficTypeDiagnostic: VI1PR04MB6111: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: sAvMluFIakFg+oWJCCTUubF+nx5awttaUgq0qzlMM9ep66bziYC8Yokl00mktIr7pKz/UxSwFhz2ZT4H99SbSV6AkxQ2TMv5jb9KbdHi1Upvs8YmaZwuvdlQw3a8/56O4y9vsghdtE5efjHdpqIclIhl04gvcCc5NJ2Lgvwr7UzJf35i1Lydtg63rRAzFNPC4VbXmlTbk8IlzXxV9ouUbXyWhOBqkDUZuPh1xzjWTCco22lQfVcMbNP94zByRd8shBAEl2lvRDUd3efUzq83GLV6TXy2fxfQWgFUeDJlYX5VTfdTof+vLk1WTZxDZ/wGMCntwqmlX+p7PIJBy5NG2oUk9ljLbCEXW0QoemJHST/Es0fjqhozn+rByKCnmk0TdGLwHVsGHNNJQFJ2MCB1QO3jv55vXClAAUYXWTi+TaNPJ2EAf2fRRyEXwFDnvye2/q1t7GGH1eKL+1fSyxH3JnOipAN6hdo1M302MQMMkdb4SzhbAPj32KSKC44uHAwfiJV74S3lSnXrziDdP28yTE38rJglWAWR85jtVyYLi2DvIyVXAjTARtsscEgq3KdCn2z/u2E/8BLhEo/nF5havjVinRxwQDh+AkJRc4XyVJ8wHvGyLhhZJsNGZixvs3bH31cmdEcyxzAS2ALrHBEaatQ5AjLAVMMN56nM4L0BMksfz/pn8nxyJrR7Yudu2+G1U4Lr6zxJrIu+vzY1X3gz2bubCp744MEZdEihSgcSVDs= 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)(8936002)(1076003)(186003)(508600001)(83380400001)(2616005)(6486002)(6506007)(66476007)(52116002)(6512007)(26005)(8676002)(4326008)(66556008)(66946007)(2906002)(38350700002)(38100700002)(316002)(5660300002)(86362001)(6916009)(6666004)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: H4LiZu3OKHLiyNcSfpishcWWsTZ8y0JAu2Hzr2qjXeGARyDqMa52as2QVs3t6mrgkBD11GJe1eGSeFN5J7a532nF+2sLpKA+KaLAztpkoSLQzH7hJ/jJQCuXMZ/DAq2MldvSiVU1OMiCLrHr2i22P8kInQj8UGyNWmc8Cd6SYoNJ2+RuLylVUnRvdtJcSdq+Hz4f2VrtSe07KKyblYrDtzqg6zMuE/xSZTw4nwWfJXgB0S4RGMWp8Hi/lYG+PW+KnIszGf/MX8d4xWO2DP5SBV/wUNQdve/HK82621A2zMhJ1Q7OWnhaEEC+942OzAba7Bc8VN6HjUXFOcxeBejepQrNszMgVskDODIzxUXB7hprUvbbdf0m1lHCQBWQmxokyyeztzrfJ1Bh4SEqiTrTA/pAk77gHUM0foYZlqogX9jfzw2dmIWv93bTru0kwlryZ0aMtoDMKYL6tWD3lCWVUKdC4ppzljfQL/sDSeIRTugQi3u6a8cstHkgVHrKE9xukJKjX2mRPYfGnhlnv8yzmzH1W3w6PdXw44TSOqJ6hTz1TQmtH3Qob/MgKQzxU4vHj3NZT7IphPXzRvFqIn4n32LTsUKSDh3qd24cHnT1SvNnVgbok1nZv4iqAVMhqPAaDBfswPr0ZkywNsjGb4/CzTwD++0cEau6YaYRe4ZxDcNp1wFXR3E3KLJS2S414xJNaIa70Ysg1P+Xrog0UwBoRt1l9qCHqhJ7abs7eTp/6A3Ssll+I5li/NDB+TM0GmnNTxFIxTE5is/YEylPibFjbu4X1T/oLLBIlexpVhovGuG7QFl0ANmnGpyLEAH/CKhz/6eH0Oe327I8qYCBLm16r2VS6vupGin5Gw6gsDJm/0J4BPgZ+GdhrAMDnpZjFSUotGfCMU15tLRDLlMhPovByk8bqA6mEYUSWaSqUNHy7cdqOwjBpZ/yO2jj36FdnqLWzwCeguIbeTQ+WaXbKu9ieOrQGp/EhZdOvvo1kr7yCdZZMKbewpFKBdcZdPaRtRwtko/r0bn0oJoWC+kyZTv42ROLHBlbMr5ANPiyEMy1PPRDjeBnMtEz1PreYS2Nw0ou3ttvVNtBZc394Zu22AzxY1pJSaj/jYfGAFM4aFbeyg81qEwPg846DIazI4RD6lXdn9XECyaJ2AjOms1PRxKkVlPAnAKsRul3rVgpDRjNdSNW21h4UQEK7qnga9gF2H5iCrqHxYnt75ba16Xy/WPK+rEDxOeetinmWWqEu+iNcXg0gwlMO4PU3H6Ctrs/f3CkvZklxLtKQHFKvdZal52l5bMCXZbOcCKPBIm1cYb/9vDvaiCDTkEKOyEwGPDon3BQlsrWNET+UMRYt5yNKMabKOSuaGEia9H+I6abfR3u2kOlrQb50JA+cOAzMCYt0m8PtAbWwmZJEu1Nqa8w7S62zcnRvkp4vGVpiS59I+O21M86FehS2Kfgi+R2G43MKul+xYSG5MeN2k5Ie4EqPC6yRc4Iq9yjdjRgnDjkZbUal/vutIwmzXvtyTcnEvvBXQ6xHzlO2CvAKVDGRNARP23VHiH/BJdeYN3l9BL2HalXWCay/3MvCzw0DiUCzRDld5Rj4xoLyeO7Vk8VdgPv2AnD+7dboShl5Eal/AkJARH5eTkI5khgDuV3pAhF7V/rlUWcHuHBNU5wWeOj94ktb5zlUAClK6YTrRYn+UZk4woPZzWE1ADLiR0vdIe8lpIbDyd08VhTSH4u/jlUEelfI9X8BQ== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7b65cb65-de89-44f0-0e5b-08da2aa13832 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Apr 2022 12:01:55.0690 (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: P6BmZ3A0z1lqI937tmR1fwfA51tF8NHYkVtk+/kWsC6qT2hYD64qHvhJ6Qa9w2bdOzPGVOho65hpcHgiMi6W9g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6111 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. 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 Tested-by: Teresa Remmet --- board/phytec/phycore_imx8mm/spl.c | 12 ++---------- board/phytec/phycore_imx8mp/spl.c | 8 -------- configs/phycore-imx8mm_defconfig | 1 + configs/phycore-imx8mp_defconfig | 1 + include/configs/phycore_imx8mm.h | 3 --- include/configs/phycore_imx8mp.h | 3 --- 6 files changed, 4 insertions(+), 24 deletions(-) diff --git a/board/phytec/phycore_imx8mm/spl.c b/board/phytec/phycore_imx8mm/spl.c index d54145ef995..7f24a3affc8 100644 --- a/board/phytec/phycore_imx8mm/spl.c +++ b/board/phytec/phycore_imx8mm/spl.c @@ -57,14 +57,8 @@ int board_fit_config_name_match(const char *name) return 0; } -#define UART_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_FSEL1) #define WDOG_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_ODE) -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), }; @@ -77,8 +71,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; } @@ -92,8 +84,6 @@ void board_init_f(ulong dummy) board_early_init_f(); - preloader_console_init(); - /* Clear the BSS. */ memset(__bss_start, 0, __bss_end - __bss_start); @@ -103,6 +93,8 @@ void board_init_f(ulong dummy) hang(); } + preloader_console_init(); + enable_tzc380(); /* DDR initialization */ diff --git a/board/phytec/phycore_imx8mp/spl.c b/board/phytec/phycore_imx8mp/spl.c index 19c486e5517..38a581bef57 100644 --- a/board/phytec/phycore_imx8mp/spl.c +++ b/board/phytec/phycore_imx8mp/spl.c @@ -89,14 +89,8 @@ int board_fit_config_name_match(const char *name) return 0; } -#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[] = { - MX8MP_PAD_UART1_RXD__UART1_DCE_RX | MUX_PAD_CTRL(UART_PAD_CTRL), - MX8MP_PAD_UART1_TXD__UART1_DCE_TX | MUX_PAD_CTRL(UART_PAD_CTRL), -}; - static iomux_v3_cfg_t const wdog_pads[] = { MX8MP_PAD_GPIO1_IO02__WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), }; @@ -109,8 +103,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; } diff --git a/configs/phycore-imx8mm_defconfig b/configs/phycore-imx8mm_defconfig index ba5833f7060..9da222afc54 100644 --- a/configs/phycore-imx8mm_defconfig +++ b/configs/phycore-imx8mm_defconfig @@ -107,6 +107,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_SPI=y CONFIG_DM_SPI=y diff --git a/configs/phycore-imx8mp_defconfig b/configs/phycore-imx8mp_defconfig index 86d0f4df7f6..a851b1bdccb 100644 --- a/configs/phycore-imx8mp_defconfig +++ b/configs/phycore-imx8mp_defconfig @@ -98,6 +98,7 @@ CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_SPL_POWER_I2C=y +CONFIG_DM_SERIAL=y CONFIG_MXC_UART=y CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y diff --git a/include/configs/phycore_imx8mm.h b/include/configs/phycore_imx8mm.h index 71f0c42ec0c..564b8125ba3 100644 --- a/include/configs/phycore_imx8mm.h +++ b/include/configs/phycore_imx8mm.h @@ -83,9 +83,6 @@ #define PHYS_SDRAM 0x40000000 #define PHYS_SDRAM_SIZE SZ_2G /* 2GB DDR */ -/* UART */ -#define CONFIG_MXC_UART_BASE UART3_BASE_ADDR - /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE SZ_2K #define CONFIG_SYS_MAXARGS 64 diff --git a/include/configs/phycore_imx8mp.h b/include/configs/phycore_imx8mp.h index 0c963b62b3b..3e4315f2b81 100644 --- a/include/configs/phycore_imx8mp.h +++ b/include/configs/phycore_imx8mp.h @@ -83,9 +83,6 @@ #define PHYS_SDRAM 0x40000000 #define PHYS_SDRAM_SIZE 0x80000000 -/* UART */ -#define CONFIG_MXC_UART_BASE UART1_BASE_ADDR - /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE SZ_2K #define CONFIG_SYS_MAXARGS 64