From patchwork Sat Apr 30 12:43:12 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: 1624670 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=H1bXOyMJ; 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 4Kr7LC2L05z9sBy for ; Sat, 30 Apr 2022 22:03:47 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9F34783F71; Sat, 30 Apr 2022 14:02:29 +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="H1bXOyMJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2EFBC83F38; Sat, 30 Apr 2022 14:02:10 +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-db8eur05on2062d.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::62d]) (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 D6A3883F4A for ; Sat, 30 Apr 2022 14:02:05 +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=InZSBUFN4/p5mRBWXTG8GqxUurMCEYDX4WmGSrzGzNQos940VZzqXjCX4mxVaFzdENPvD3v1E6K1ELFDZPhqnHCAjdZ1pI7mHa76g98bNzM1f+gHJctbcbuvCYt6fXt9kWT50plEQIsIyvIu9EcxB7YMV5x9Ikb+EB+/0Xydf4BuCIdjinsHU6cSVu9d61yPqnqG5p9vAlj3t2PRJ6jMxU3177Qx13eg1+4arMHYQd7fca5ljnkkTMXRcdCmsvIyz0wm9hv8njUyYO3mFEiLkbRnwMdS9CwbwOr+TgEqeNisfXe0ihjvv3nPCBIoRQXmqPQ/YKMqK/r+N60bGvn1mw== 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=CU5z3oynIFsolz9nw2raWUnK1s2e/a+1HGsEoljgBqY=; b=iHRWvj3yhFHY8WWkxQr+she8rkNk9pfEjwSa29P7Zg4MB2D4Z1hlcSL0O1tCNIe01WKFhUzhwBYUaT6SUlU9vyfeJiB6lOFIID1kC2tjM7XPhojoj+ZpA9L/PJLt4vlUVMdS8XeXxwLv/Ua50tnxax1lchK9Wh/vcDG0WcAoeF1TbMSOQuY2FwoJAoMOIYxqa2tb7Q6EQ7XNxF5YPDWeHVVaTxTkkFb43JdBVTXoFzWEeet1uo4dYQ+eSHghhh+pJsuw04peYqEg91hB0XidkIW+LzMqOrtiDzhFlaEuAcI0fACnL3DwxKyC+96GQJ6tRIJV5OamROLVTSjbhN3aMg== 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=CU5z3oynIFsolz9nw2raWUnK1s2e/a+1HGsEoljgBqY=; b=H1bXOyMJBq9h0Pha6yuMVLAef2/mWzBALpq1CLGDFUUhtCWm9ITkjCOcDhJLXATAXD1ETNII5DCJvKRzGisnuDddvgzysZaH1aLcC8t76b141SOm2IG+1AWCsABjlaAYkQPG+r670aiyYnLwrzmu6OFEiJn2UrX6Ew7So/Lf/yU= 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:02:03 +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:02:03 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, Frieder Schrempf Cc: u-boot@lists.denx.de, Peng Fan Subject: [PATCH 10/15] imx: kontron-sl-mx8mm: enable DM_SERIAL Date: Sat, 30 Apr 2022 20:43:12 +0800 Message-Id: <20220430124317.17382-11-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: f637bed5-1ec5-44e6-fcb9-08da2aa13cfb X-MS-TrafficTypeDiagnostic: VI1PR04MB6111: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: Up4360yDiG8rwFYp9Q86JI+YYn8yS/GPqJRlCAp1za86l6qwomuaAuluy4CgUhXA2updaQB/xIQjHEANPWymqp1iLtODC+P9jN/qKyXlZpZfmDymbjyb69kwkcaNxv3yZQ9Nk/QIVG8Nw9XNCy/QO2MVW/yQ1YIARRNumYQsIpZemJLDi+HzNJSa+8oGeAPUVUFsErXFXTnMzE+R0HGb6+pSFVBv890vH2StE/j2wR92A5indComi/gePKfNmKUupVjveLNiLLj1TJNVsit3AfPe1t1wjH69/a38jnn5SDszX/z+5yiwlxKL9Ki3cSUQeJe7X8hWlTEjlnWAdH/hME4C1T7BkoKj3ZGrLZJu+pQCbfGnUGtkt+xeEeMpWKBg+FKSBK9v9xj7rTGgC5ch5dyLXnB8nATOhDm2Y/dowmkqjtwHwSwAicUERqFseK13az3M78xke7Ihn4mvecka4qmMT3iDXZdJrGOn+7ccHtllkvTNAsrAXP38GKy9oX5El69jlPWc3EETFAxbYoEaLdSiWdvz+DNDMtacVDzkJeURwCgvpQ1zvwuLgEUijWUKrySmNoRJc2SqmlC6mSmNvB+q0V6WIGIi4RkxyWv260hW4miXG3nQMtCvnIWCOeep0d6/XrEdBHCSS7yjVH5DRIEDGss/LzW5pjBVxzawIiiQ8fKoOr/0+PBdhf3WbtN4izaEg2OLhlePF0I5gkBz7Q== 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); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9aacKGTusfLZcwGkOkROy5LxA8iGoR3JHF9bcp7KRf3Oa6/8EhpW4G+1JQfj2Kmt2DVdxgUiVjLGumJzoky/VSDMEJ0WaByYyf230A0Eys0J3mJ7aKb9TaH+BUioKuSyA8XJSUAh//tHZKUdmZniWjnnfDETX8LQ/iGM3D+LqtyJhBtu4q/06e+jTY4DIEjNk+Hh4K7bJJvYzRRJqVqyO+qBXW3yOaUQ7Sg9F5uNj9B+0UTGefFI8xMxKIbaO/zALzfn1zojSBWIlQ+YFM8QE81P6+kuNcYODkBaeLNHG2Jn8gjSRXB/UbD7fP0dxB2CyvTpkzv80T4M+py3Bk5yVYAKd3jiTcS7KX1tNbTyDQv3MoWyveqrN52da7Bg7Lrlty0QFiax0QnjHWG6g1XwzahtW6JjrRYwtHX0V4ZYLa1B6grxQhLkdn4qRafMfXRE1lZFNUg+uZ5XGU3KQb6UozIw3fD07KBFgLJ13eXbyiALWv4Vq39h1wEXDmXQgYNH2pdMjuxLmxrWexRkKVDnK0Mf9TCKosKfcwST1Zh4GNG45i1cccWHtkA2SQ52jDY/fJ1duZP3SBnVns1lfGfucCL0GHtkkWvgxD2w+d8QC6l0XEWdp8JuyK79Q0ogJtbQsgn3v4ei3EOUXjVt5QtNxF0rhAb1kDkDwxbflMNpVgF3cCJT6aKwsn/s7ea2mE/tE7A6B+6OPXjbTaP2TzMukJApUKx4DhUsjq/4JWjQz6hy0GOTi6MkUsuempO1wMCHgWhd8fZaC4rg6Pdm3M4mCsmWNcgpzRPDnuysH0WGkjX6JFL5gdJdCPiXbvAuNlCXMPkhCDdWAf5PNgpgnrunxSBgysblcJwpRLxszSU0ImamFQmcMi862ckwna0z5l1rv81OSETM0x/wh1qBXo761kvl3Ck91OjOlivTYFlgHCgPHoaPySU3zerYBZPADKRGj35C3qnRq0ntmqIp1kEJQnjcTgQ3W00lkib1yc1yl8aB8J5jDKFm5r7lsi3RoWqW3FjxQwGJinJNkRXYivKUgMo9gRFimMgMiubpMHmFnd0AD8aMSVwZoH36NZIldrRfvzFh7SxqvPaLM3xAzpWLpkhxxboLitZIFnGHfGfcGNWFBI/+dW+VW9iT6+zSxUXzhCG2J2UERrHDsfYqUYRU6Sv8yjaPXSG22io+Uy4B8tnFxyxzvkq1l5iElahwnL+MpWz04wAkkquXg97kC3RRkYyVZ2j02NS6k0S06QZ2kBRH3rQrgTAKY8+Jbk7deUzOeklg0P9y299qH+bKkHa+yyDIKgVTS5Y+XpGLgrRzMN9DfBWAwvLRd86YLjUNIU1WHN2/BSTUrS3TlhCuJw4jvaioK/apAoMndiYVfmx6mOfv1EI4DOzkZ5PFZJjFmSRDS5DPiuDTSPZ6JCG2bkroV4rQpoW/Yf/tjdJjMDIAl2gRDGspdWh2BlJbp6hi/WdkBHfaOt2DeywDgsevqzRh83kJDWbKSO0XnnDn4g89QO5+wI0rXGMroGK1o5UO9cLtyg8cOd0sbjSVhFTG0CESJtHmuSBNWr+uV/Ht6sota2z4rhl42mjdfUoTrrzRp24C9X+FixprdjirnKrAyxZARf5LX/IvTjXuaw753YHUA1IyUC0+XpZJlX0nHtg2C540nCBqx9XcylpjC+F9AhmyQsXCpaaBXG+mAabzGHDeTiqCAmvk+m2WOFATuUWp4bMwjZmFYkcn/dTyaQgXHJ/3mg== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f637bed5-1ec5-44e6-fcb9-08da2aa13cfb 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:02:03.4624 (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: cx0MxmQ7AO4MES5zgbXzVjEN/uZwsJrvIOzwsEqqAXbMCL9rWMf6Je7RaPM4kobJJumyd0l/vDg0FXqecXII+A== 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_init to make sure driver model work. Signed-off-by: Peng Fan Acked-by: Frieder Schrempf --- board/kontron/sl-mx8mm/spl.c | 12 ++---------- configs/kontron-sl-mx8mm_defconfig | 1 + include/configs/kontron-sl-mx8mm.h | 1 - 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/board/kontron/sl-mx8mm/spl.c b/board/kontron/sl-mx8mm/spl.c index 4ef03c8c172..a58a75dc958 100644 --- a/board/kontron/sl-mx8mm/spl.c +++ b/board/kontron/sl-mx8mm/spl.c @@ -32,7 +32,6 @@ enum { #define GPIO_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE) #define I2C_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_HYS | PAD_CTL_PUE) -#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 TOUCH_RESET_GPIO IMX_GPIO_NR(3, 23) @@ -51,11 +50,6 @@ static iomux_v3_cfg_t const touch_gpio[] = { IMX8MM_PAD_SAI5_RXD2_GPIO3_IO23 | MUX_PAD_CTRL(GPIO_PAD_CTRL) }; -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), }; @@ -230,8 +224,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; } @@ -273,8 +265,6 @@ void board_init_f(ulong dummy) timer_init(); - preloader_console_init(); - /* Clear the BSS. */ memset(__bss_start, 0, __bss_end - __bss_start); @@ -284,6 +274,8 @@ void board_init_f(ulong dummy) hang(); } + preloader_console_init(); + enable_tzc380(); /* PMIC initialization */ diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig index 1375c78a8c4..44ed4f3fb1f 100644 --- a/configs/kontron-sl-mx8mm_defconfig +++ b/configs/kontron-sl-mx8mm_defconfig @@ -103,6 +103,7 @@ CONFIG_DM_REGULATOR=y CONFIG_DM_RTC=y CONFIG_RTC_RV8803=y CONFIG_CONS_INDEX=2 +CONFIG_DM_SERIAL=y CONFIG_MXC_UART=y CONFIG_SPI=y CONFIG_DM_SPI=y diff --git a/include/configs/kontron-sl-mx8mm.h b/include/configs/kontron-sl-mx8mm.h index 1b429f7dbe2..20f7f7a74f5 100644 --- a/include/configs/kontron-sl-mx8mm.h +++ b/include/configs/kontron-sl-mx8mm.h @@ -28,7 +28,6 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) /* Board and environment settings */ -#define CONFIG_MXC_UART_BASE UART3_BASE_ADDR #define CONFIG_HOSTNAME "kontron-mx8mm" #ifdef CONFIG_USB_EHCI_HCD