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 49171C433EF for ; Thu, 5 May 2022 07:03:03 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F39F584057; Thu, 5 May 2022 09:02:27 +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="RrxboUhC"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8F51B8405B; Thu, 5 May 2022 09:02:16 +0200 (CEST) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0623.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe1e::623]) (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 2114483F4C for ; Thu, 5 May 2022 09:02:06 +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=itU4wYiit9yujydL6qz4M2Y3EQEYenIcJvXYjd+uBAtkJP+I4MXoYfCxD7+8cLnlv/F+tn0C8CK6lAg0obPHuwgQJNbb+OM3atky7qUzwj9FE9qK2pVC0rUmGK+HFOJyQG7Ckj9um2vxG8wqSb3t22Uy+IhPwYQp6isMrhRJfjcxfc5uE4e8HnsTgS44cPGcl5zDA7Y5cbvP5D6+9S7XtZSngDGJezisXCtWp7r+7fBvx2GKUeZjjHy15UgQ/UBu1mHssBhaH/VGQv6rhKv6DjF/gLOYJCH0gb/hfpPPtyb2cSVoX3PCRzagfomP1aKfR14LBjfOWLY9KAAENZXEDg== 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=TtzkxOtSIoGPyr1ooI+hpqZq9j0IbsCDEgluXA+Fhe0=; b=R4ufU25Q5g82zjcph3R66IKqyyluY7ofyIDZw7Ub0Xz1/ZSap3hT39XWD5jx5O/3OAbtzgsVh3Hbu9kAC15tLiFcV6Z4DOmaIB2vKv/Tjm02Osv8kFs7CvMiIYfqnMq17HyvgoF4FO0tn1ayozW9hOcN8otEWSXaeSoawHYG7BcmQ2lDFQ93P960lSHE9Z7tKD8MnFW8CgXWOHuyBmmdGO+WIU4QV7xMJNb/yTnI9bJ2wvBynSSRf5ewp64hbvlMeU9RMyYx+Em0mfM3Qalykh+h2gGi5Mhw16aOr9aiUIzqQe5xaCUroNUp/QVe8R2ss+FyoUgcRD3CRHpGvvMx1Q== 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=TtzkxOtSIoGPyr1ooI+hpqZq9j0IbsCDEgluXA+Fhe0=; b=RrxboUhChyLuGiOzO76+cdziprs+bWMTJP5GU3rO7g8PXcwCYcDlSUlZz50dsnG8Bwh3SBsPTFvXXn/BRSTwZDQAht8vVPNcrJuhvrK5lb/iWrDGSrXK25Xl38z8vSWfEkNIPP2jguuHo9oRDjMpiMRT44oIAgXcxFego3ILvTM= 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:04 +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:04 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, Adam Ford Cc: u-boot@lists.denx.de, Peng Fan , Fabio Estevam Subject: [PATCH V2 04/14] imx: imx8m[m/n]_beacon: Enable SPL_DM_SERIAL Date: Thu, 5 May 2022 15:43:31 +0800 Message-Id: <20220505074341.24086-5-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: 23b9b0ec-58ad-4053-3f72-08da2e6528d9 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: c+BhD9cGLvrrzmH8DhGng/xMzFc5UbNIY//6JgWCViZ/P9ujedyd1w3uLf9IhaH76hweMn3RE0M5R61+lQXP0lhkoLNEG4BsGDwdQG3+YpKCBGSP+IH2pS89XQC7tDNVuS8XWanTLyTcF+f3ZyZfTGgRl+F87sQ5lcIq9q6/CnC69GLWHp0Nls6vFgWstntzDO/mTSxNok5VbM7PakJqs3WYf3Yl9YWTLAUWMu/7P/QQ8lZUuwQudKJv4Ci8lJK9A8CwQDoqsG8sbRv0Zf+LJMi43+IsVZpx9qMART/kyWDSdnw6MZWy0YdYwqTWvexlhpmJIBH8V0nOyRKohTvpUy/4NAA45rn3dfZj9av7EvWavTRcMTYd3R5U5/jVpaVAwN73Mx9zk3iWa0kATPiOTjx1HEKk/x3y/gyZln8T3Jb20FjBtM6Xbkbb6jVG5TX3cca0cM49uKKRVvq0vxIknFRd+yCGyHoV29Ei31tf2XtXmI9OGFRWYEx2xmTG5u6nyMZLVdtJXPAFEJ4+xUt6rmYhu1+GFE3SOFA2yr3fj8Y4scouh5NN1e/z4v6ThweKciWX5xoqoulyDQrf//hgY1sc1Pvc3sj+lFq5iRJ1Sj4oC2KbQTElOj7CDiHbOPub6FDhU4ekq3cW7Us57DfK2BPzZAoA3asCNd7XzuqKH6aGvzRt9Hn1vSOUmPiE3DbtQ815ysvZjxZfUEdeYsSti0eE/t8j+sQv/Entq9i8rlk= 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?pIoKbtkIbnZ1bOg8xUNUvc37VOfqHzwv7UED9jxC0BAEQgqV3wGYfePh2bjf?= =?us-ascii?Q?TwG4WW3y5SXnJ5on09swxl9d35Qw0TX35ER7UFH1mJeO84dZ+jxXEM0IGLGA?= =?us-ascii?Q?V77MxHneSQVonPZ1P52S8o4zJyYstAQrFDovIOF3lOOdVX4E6C6eNzmilqZL?= =?us-ascii?Q?ExSUUFYPL2SiCzy/VBVillq3xkch300K3KQOtWvHRps3iBVEtmfT4EKSWQ/d?= =?us-ascii?Q?Z+1HpCZtaBJHbBTUq/LvBLIVbkNmzVDvu24jXUyoJCHqGxeUH+cWso2R0+08?= =?us-ascii?Q?2XEYACDjIwLpAOrCdMS+ACs3aHEuJeZfQXd9dwx0Nsvf/zaQi8Wo60NhllNw?= =?us-ascii?Q?K7Bu0ph2ggg2RewYcFQfcrbx1ugwCYJ6sLZ59YhwZ7M8oT6sRG5DPmPHffKE?= =?us-ascii?Q?2/fIQoXcp4oSEA1v4tTLccR8CjBZPrZ51XfxELt/nCFq04qt74pcXognAlN5?= =?us-ascii?Q?Ur0UPUDmJLuVEpYec6mbYKgXwbpWivaU8n3PctPToV+MW/NQVMN+9yucG8XJ?= =?us-ascii?Q?K0IIFT90pMeqFVGQwJ+nLnxzUNKN4DPYKUcatmNPflNNXEec1QeMCQf1wQlp?= =?us-ascii?Q?stmM5kzUMSC0GNqCPfhMX6LAFy+t3mwenCkcjRtMJFFShpNb1j/zK7o2I9kU?= =?us-ascii?Q?yP3l/mtRAWIN6uKsO6SaRdMRpgQhgS+OsSpm20ghO8+g5qI2Ie3zbbEqHeHF?= =?us-ascii?Q?eCllXWsSUmo122aeVPpWENGApiW7qU/NT+XjwqSr6nxNvNGnjdHU0l1thjuN?= =?us-ascii?Q?PcL2KgbHswefRKI5fjteKoojHKYVoKc+EchnBDyr+QW2uY03Mog0FJSEtvk2?= =?us-ascii?Q?GRbM77Kz3A8SX0E2i8eO9JEoFYHrYSEuMW8/KbK5DYezTDlGLwy94gj8yTeK?= =?us-ascii?Q?E7D65gjEKaNAOvBjLDxYap1Mn1kfOo+mE/FbrqSGHV0KOO7/Wxoh9kLefhSx?= =?us-ascii?Q?Je9pbSttbSRfgUqas0x7vzCUqieKs1jJK4egJcHuRGn0QxM8jIsPkDMmPfsI?= =?us-ascii?Q?g7aAGEOaw/6Uh8F6AK5pHV6ikHtShxWBsJ8YhtYG39S+RQctoOgEJXYtb9mR?= =?us-ascii?Q?JSXbNuBmuI03LSyGg3tSXRuW4MJYmvDPW8yBlowwXd5Aist0KaXICCB+qTnu?= =?us-ascii?Q?1kWmiBpEoH/cZI+4Bf9ni9jrp/U4HbAqxmB/VwlIRBvAVSev0THtySkg+8Jj?= =?us-ascii?Q?Pm0vNP+ZfLsxFOXoejnELKmY9zYbochoVPNal5isdVRewVgRNj/b6jjoT0qd?= =?us-ascii?Q?O+jC9OqbEO9CUDGvnY3jTlp3ddlVsjzzqPZ1xcQw7Gs1o1QhW/1F4UhCr4mk?= =?us-ascii?Q?wJYgImIunSyBSbnb1GiJfufl+hp9s3d5N2/frvP9A9xYp7n1eIeqE7uiSCrn?= =?us-ascii?Q?mZBP0H4r7db2OpmwQlpTtolKtylf6zqCjMc935Zhhi17U5fPmQYFezUPShTH?= =?us-ascii?Q?I4E16sARGYHpw29M0TlBu8eWwxoN0nffbmaKxSbj+7Vcpl8DdwkXHb/pf8I5?= =?us-ascii?Q?2iOn97iqC9Z/lt81UHizriQ/5ErCGnHFNYHX5KWnHR3INFKbMTLRjEgPFfsJ?= =?us-ascii?Q?nnnhK9gZITSpY81MA5SXIPO1YOzhi3tP5T+eqS4i9/QGm2yb52QJ1D2wFmgj?= =?us-ascii?Q?Unv6dFBPQL1Rspz4S9lO6B6Tr9eNW9rI5iFqXlxVI03gP8CwvKPyMEoHULYg?= =?us-ascii?Q?VULnQpf01PXIzVoSz/8rbLU1O41YAG+e1eCS9DiNmHiqtnR/8Bypq//DkDln?= =?us-ascii?Q?R395ZhkyJg=3D=3D?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 23b9b0ec-58ad-4053-3f72-08da2e6528d9 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:04.0746 (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: bDFEF1WvZztFpIJQcgCLpqfdrgL+Zgy35mxx6MPY5aR7DZ0oF56gH+OgZJY6QVOIFHV/dT2N/psqjdDJyzt9NQ== 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_SPL_DM_SERIAL. uart2 and its pinmux was already marked with u-boot,dm-spl. Move preloader_console_init after spl_init to make sure driver model work. Signed-off-by: Peng Fan Tested-by: Adam Ford #imx8mm_beacon Reviewed-by: Fabio Estevam --- board/beacon/imx8mm/spl.c | 12 ++---------- board/beacon/imx8mn/spl.c | 11 ++--------- configs/imx8mm_beacon_defconfig | 1 - configs/imx8mn_beacon_2g_defconfig | 1 - configs/imx8mn_beacon_defconfig | 1 - include/configs/imx8mm_beacon.h | 2 -- include/configs/imx8mn_beacon.h | 2 -- 7 files changed, 4 insertions(+), 26 deletions(-) diff --git a/board/beacon/imx8mm/spl.c b/board/beacon/imx8mm/spl.c index 12266b22a42..f92b4c3ed0a 100644 --- a/board/beacon/imx8mm/spl.c +++ b/board/beacon/imx8mm/spl.c @@ -59,14 +59,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_UART2_RXD_UART2_RX | MUX_PAD_CTRL(UART_PAD_CTRL), - IMX8MM_PAD_UART2_TXD_UART2_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), }; @@ -79,8 +73,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; } @@ -128,8 +120,6 @@ void board_init_f(ulong dummy) timer_init(); - preloader_console_init(); - /* Clear the BSS. */ memset(__bss_start, 0, __bss_end - __bss_start); @@ -139,6 +129,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/board/beacon/imx8mn/spl.c b/board/beacon/imx8mn/spl.c index bb51be01c52..4563446db19 100644 --- a/board/beacon/imx8mn/spl.c +++ b/board/beacon/imx8mn/spl.c @@ -68,7 +68,6 @@ 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) #define PWM1_PAD_CTRL (PAD_CTL_FSEL2 | PAD_CTL_DSE6) @@ -76,11 +75,6 @@ static iomux_v3_cfg_t const pwm_pads[] = { IMX8MN_PAD_GPIO1_IO01__PWM1_OUT | MUX_PAD_CTRL(PWM1_PAD_CTRL), }; -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), }; @@ -95,7 +89,6 @@ int board_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)); init_uart_clk(1); return 0; @@ -114,14 +107,14 @@ void board_init_f(ulong dummy) timer_init(); - preloader_console_init(); - ret = spl_init(); if (ret) { debug("spl_init() failed: %d\n", ret); hang(); } + preloader_console_init(); + enable_tzc380(); /* DDR initialization */ diff --git a/configs/imx8mm_beacon_defconfig b/configs/imx8mm_beacon_defconfig index 9cd8ac97285..a8981975f66 100644 --- a/configs/imx8mm_beacon_defconfig +++ b/configs/imx8mm_beacon_defconfig @@ -112,7 +112,6 @@ CONFIG_SPL_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_SPI=y CONFIG_DM_SPI=y diff --git a/configs/imx8mn_beacon_2g_defconfig b/configs/imx8mn_beacon_2g_defconfig index 145f96d491d..cf1720725d0 100644 --- a/configs/imx8mn_beacon_2g_defconfig +++ b/configs/imx8mn_beacon_2g_defconfig @@ -114,7 +114,6 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_DM_RESET=y 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/configs/imx8mn_beacon_defconfig b/configs/imx8mn_beacon_defconfig index 9052e68e967..882a6044989 100644 --- a/configs/imx8mn_beacon_defconfig +++ b/configs/imx8mn_beacon_defconfig @@ -118,7 +118,6 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_DM_RESET=y 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_beacon.h b/include/configs/imx8mm_beacon.h index 7c17f14964f..4c9b5491f78 100644 --- a/include/configs/imx8mm_beacon.h +++ b/include/configs/imx8mm_beacon.h @@ -91,8 +91,6 @@ #define PHYS_SDRAM 0x40000000 #define PHYS_SDRAM_SIZE 0x80000000 /* 2GB DDR */ -#define CONFIG_MXC_UART_BASE UART2_BASE_ADDR - /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 2048 #define CONFIG_SYS_MAXARGS 64 diff --git a/include/configs/imx8mn_beacon.h b/include/configs/imx8mn_beacon.h index 41ce3c1c8ce..c16dda5e22c 100644 --- a/include/configs/imx8mn_beacon.h +++ b/include/configs/imx8mn_beacon.h @@ -107,8 +107,6 @@ #define PHYS_SDRAM_SIZE 0x40000000 /* 1GB DDR */ #endif -#define CONFIG_MXC_UART_BASE UART2_BASE_ADDR - /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 2048 #define CONFIG_SYS_MAXARGS 64 -- 2.36.0