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 D6468C433F5 for ; Mon, 18 Apr 2022 06:53:46 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 213A882FA8; Mon, 18 Apr 2022 08:53:44 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=amarulasolutions.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=amarulasolutions.com header.i=@amarulasolutions.com header.b="N3a3XIN+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BEC1A83A9F; Mon, 18 Apr 2022 08:53:42 +0200 (CEST) Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3FAEE807DF for ; Mon, 18 Apr 2022 08:53:40 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=michael@amarulasolutions.com Received: by mail-wr1-x42d.google.com with SMTP id t1so17565185wra.4 for ; Sun, 17 Apr 2022 23:53:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=QlVJ/GyHuPzW7n3CYYQ/y/4tuj9CnY0pWIh3DL20+p0=; b=N3a3XIN+xVHzREFXTc2jw7xpTbFMtEoxXxx3tYXOa0HJ3wsfOIRztNLQ5npxMyOecO 2fumfIfk/w8tVG59OJsQBo/zalQH7yXU6MH6nSF/3BLqABmj8A+Z3tuE6byd8aFHP4W5 4Q+fZPTyoAXfbkfoYfoJTLCA2MuefZuDAU7+8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=QlVJ/GyHuPzW7n3CYYQ/y/4tuj9CnY0pWIh3DL20+p0=; b=5Va/81a7rI6OnvFyiVTkTevTpFFKuSoCej0cZXwLq9V5JYAemCgv20oDHfFlpSzY7h 4t4l9LFRYsQcijpTkudc6CFk2oQMbHXZYX5OfNcK0u4gJZCF3xXXgf64U/obXWhmnjCs gOkB0xzhL0AYeRgsBmXyLWUVbNrtxoic/KRMwUOYau2Hn9xtqey6XalqvwwRj5zTFxnN gNOVgYF/izVwTC9pmcj2ohMYb7od9Lv343H7hS36Aj9thtp+vLFWMAiAnIvw020v9vMt 6D3BBd0i9+uulPCrRkTk/+8BouRigLX1L6kWFD0FyHUfHSW8/EjftyMI27egtmdNP0tA o27Q== X-Gm-Message-State: AOAM532rhDhdTq1lcbLdHrR5p7nA1DIoYEYNA7L2oesnxDed7O79SmQr 6asF9yK6FltgRm+lzKGB9yf+1A== X-Google-Smtp-Source: ABdhPJzQqXSuGr4+CxZTm7SlTsriV+PTpJrnBMPCUyyux27q070e2zu2+CE1V50dp71cyWdQgLwMOw== X-Received: by 2002:adf:dccb:0:b0:207:bc3a:aad2 with SMTP id x11-20020adfdccb000000b00207bc3aaad2mr7203262wrm.174.1650264819641; Sun, 17 Apr 2022 23:53:39 -0700 (PDT) Received: from localhost.localdomain ([2.197.89.223]) by smtp.gmail.com with ESMTPSA id u7-20020a05600c19c700b003928959f92dsm6838423wmq.2.2022.04.17.23.53.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Apr 2022 23:53:38 -0700 (PDT) From: Michael Trimarchi To: Stefano Babic , Ariel D'Alessandro Cc: Fabio Estevam , u-boot , Tim Harvey , Fabio Estevam Subject: [PATCH V3] board: bsh: imx8mn_bsh_smm_s2/s2pro: enable DM_SERIAL Date: Mon, 18 Apr 2022 08:53:36 +0200 Message-Id: <20220418065336.195452-1-michael@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Enable DM_SERIAL for both U_Boot and the SPL. The uart4 and its pinmux are already marked with u-boot,dm-spl but we need to move the call to preloader_console_init() after spl_init() to avoid a board hang as dm can't be used until after spl_init(). Remove the manual config of the UART pinmux now that it is no longer needed. Signed-off-by: Michael Trimarchi Cc: Tim Harvey Reviewed-by: Fabio Estevam --- V2->V3: - Add Fabio Estevam review - change typo in uart2 to uart4 V1->V2: - Follow Tim Harvery suggestion on Peng change - Adjust the commit message as Tim --- board/bsh/imx8mn_smm_s2/spl.c | 11 ++--------- configs/imx8mn_bsh_smm_s2_defconfig | 1 + configs/imx8mn_bsh_smm_s2pro_defconfig | 1 + 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/board/bsh/imx8mn_smm_s2/spl.c b/board/bsh/imx8mn_smm_s2/spl.c index 5f04731d72..0f61acc630 100644 --- a/board/bsh/imx8mn_smm_s2/spl.c +++ b/board/bsh/imx8mn_smm_s2/spl.c @@ -40,14 +40,8 @@ void spl_board_init(void) puts("Failed to find clock node. Check device tree\n"); } -#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[] = { - IMX8MN_PAD_UART4_RXD__UART4_DCE_RX | MUX_PAD_CTRL(UART_PAD_CTRL), - IMX8MN_PAD_UART4_TXD__UART4_DCE_TX | MUX_PAD_CTRL(UART_PAD_CTRL), -}; - static const iomux_v3_cfg_t wdog_pads[] = { IMX8MN_PAD_GPIO1_IO02__WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), }; @@ -59,7 +53,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(3); if (IS_ENABLED(CONFIG_NAND_MXS)) { @@ -82,14 +75,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(); + /* DDR initialization */ spl_dram_init(); diff --git a/configs/imx8mn_bsh_smm_s2_defconfig b/configs/imx8mn_bsh_smm_s2_defconfig index 3d67079a46..e864685a62 100644 --- a/configs/imx8mn_bsh_smm_s2_defconfig +++ b/configs/imx8mn_bsh_smm_s2_defconfig @@ -80,6 +80,7 @@ CONFIG_SPL_DM_PMIC_BD71837=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y +CONFIG_DM_SERIAL=y CONFIG_MXC_UART=y CONFIG_SYSRESET=y CONFIG_SYSRESET_PSCI=y diff --git a/configs/imx8mn_bsh_smm_s2pro_defconfig b/configs/imx8mn_bsh_smm_s2pro_defconfig index c5809f5d4b..dfc9c93809 100644 --- a/configs/imx8mn_bsh_smm_s2pro_defconfig +++ b/configs/imx8mn_bsh_smm_s2pro_defconfig @@ -77,6 +77,7 @@ CONFIG_SPL_DM_PMIC_BD71837=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y +CONFIG_DM_SERIAL=y CONFIG_MXC_UART=y CONFIG_SYSRESET=y CONFIG_SYSRESET_PSCI=y -- 2.25.1