From patchwork Mon Mar 14 23:24:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1605319 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 (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=LxMVGSjU; 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 (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KHXgT18Zpz9sFn for ; Tue, 15 Mar 2022 10:24:37 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E1946839AA; Tue, 15 Mar 2022 00:24:24 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="LxMVGSjU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 84530839AA; Tue, 15 Mar 2022 00:24:22 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-oi1-x229.google.com (mail-oi1-x229.google.com [IPv6:2607:f8b0:4864:20::229]) (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 F03778399C for ; Tue, 15 Mar 2022 00:24:17 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=festevam@gmail.com Received: by mail-oi1-x229.google.com with SMTP id w2so11072805oie.2 for ; Mon, 14 Mar 2022 16:24:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=NcRqSioCmjSIj3LO35Z+uCZ2+OaQ4K4HF4q96+1fYtA=; b=LxMVGSjUPYTk5e3hxcR3Es1odO5E6dzguHx9zK4uV0AURxY2SsfHUFJ67ZZihYAmh1 iGzdID8VUmqPY1wtmm+02ajVNJ2QcKfEqaXBpiNLPOw+Eorj5yEEUF7UQvUiRiSMaI6S EzI8kwQoGTFBjitvKDI+E/fXcGPsAR+ZhVzS44hrATYHqZNy5wen7NV0kgTBYRjS67oV w6ocSpbu8YGhpfBEg68C96QuOHqw5jKA9q4dCaGhmbfVqRDjv+mGSBGm8t1Otzs610B6 /OMQAECWS362GnG6aSuGvG7efGwKfW3kY4r7VyL0F4HTlytygTW51Edpzr//fOttrMMr Mx5w== 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=NcRqSioCmjSIj3LO35Z+uCZ2+OaQ4K4HF4q96+1fYtA=; b=FUmlg92NBRddclX/rLA0EkQb3W/+DQzxItON8LVlMPNXxzjgwVDHqjX5syBMhrY0JF SWxTWJVoZ51c1+pYF7UNM26qe/Bof1rOiXMfl8vbWn2T9uOO3BtUg2JtsmEMrhPrqesY /CSOrH3W8LDMGooouf8ZObnCI+bnP6TIQYFxyc1r10iUcDmw1FYy1Tyqh78ZOOssEdhc lO033jB3kkpD+rhVt63PGnzkHnSv/g1jXTrF8ubsg/uyykTe6UGt5N0gHv/IgcxeFZZu i9abJbZgZEg3s6YLszHdBlSiJ81fFv+g2mDaW+fYgjRPkGtVa2J3nd+QI5/Iyd1HM+fz CXBQ== X-Gm-Message-State: AOAM532H/DvjvN9NVCeNsD4feQZ2UR5iiK5gz6yJxTKoqPOvvPjJOqgg x5xnoo80boRyUSl7X7dbKvY= X-Google-Smtp-Source: ABdhPJyELRde/QtpWMx2Ur5KLtkS3x2sJOc2CAiHO6pPyhhOd5sudFSzXDQn++7o++/e/+rF5/Q8fQ== X-Received: by 2002:a05:6808:9ae:b0:2d9:a01a:4bf4 with SMTP id e14-20020a05680809ae00b002d9a01a4bf4mr649149oig.283.1647300256493; Mon, 14 Mar 2022 16:24:16 -0700 (PDT) Received: from localhost.localdomain ([2804:14c:485:4b69:de30:6ee4:1b00:d36]) by smtp.gmail.com with ESMTPSA id o10-20020aca410a000000b002ecf2a4fda5sm2065008oia.10.2022.03.14.16.24.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Mar 2022 16:24:16 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: u-boot@lists.denx.de, trini@konsulko.com, smoch@web.de, Fabio Estevam Subject: [PATCH] warp7: Remove UART initialization code Date: Mon, 14 Mar 2022 20:24:06 -0300 Message-Id: <20220314232406.1945308-1-festevam@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 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: Fabio Estevam With DM_SERIAL selected, it is no longer needed board code to initialize the UART. Describe the nodes that require dm-pre-reloc, which allows the DM model to configure the UART pinctrl early. Remove the now unneeded board UART initialization. Signed-off-by: Fabio Estevam --- arch/arm/dts/imx7s-warp-u-boot.dtsi | 16 ++++++++++++++++ arch/arm/dts/imx7s.dtsi | 2 +- board/warp7/warp7.c | 20 -------------------- configs/warp7_defconfig | 1 + 4 files changed, 18 insertions(+), 21 deletions(-) diff --git a/arch/arm/dts/imx7s-warp-u-boot.dtsi b/arch/arm/dts/imx7s-warp-u-boot.dtsi index 6319840b1ce3..bc4b5745fc7c 100644 --- a/arch/arm/dts/imx7s-warp-u-boot.dtsi +++ b/arch/arm/dts/imx7s-warp-u-boot.dtsi @@ -8,3 +8,19 @@ stdout-path = &uart1; }; }; + +&aips3 { + u-boot,dm-pre-reloc; +}; + +&pinctrl_uart1 { + u-boot,dm-pre-reloc; +}; + +&soc { + u-boot,dm-pre-reloc; +}; + +&uart1 { + u-boot,dm-pre-reloc; +}; diff --git a/arch/arm/dts/imx7s.dtsi b/arch/arm/dts/imx7s.dtsi index 483824fc06e6..cf0206dd0f08 100644 --- a/arch/arm/dts/imx7s.dtsi +++ b/arch/arm/dts/imx7s.dtsi @@ -184,7 +184,7 @@ ; }; - soc { + soc: soc { #address-cells = <1>; #size-cells = <1>; compatible = "simple-bus"; diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c index c5c5433048dd..95b8e82dd1cc 100644 --- a/board/warp7/warp7.c +++ b/board/warp7/warp7.c @@ -27,9 +27,6 @@ DECLARE_GLOBAL_DATA_PTR; -#define UART_PAD_CTRL (PAD_CTL_DSE_3P3V_49OHM | PAD_CTL_PUS_PU100KOHM | \ - PAD_CTL_HYS) - int dram_init(void) { gd->ram_size = PHYS_SDRAM_SIZE; @@ -46,23 +43,6 @@ static iomux_v3_cfg_t const wdog_pads[] = { MX7D_PAD_GPIO1_IO00__WDOG1_WDOG_B | MUX_PAD_CTRL(NO_PAD_CTRL), }; -static iomux_v3_cfg_t const uart1_pads[] = { - MX7D_PAD_UART1_TX_DATA__UART1_DCE_TX | MUX_PAD_CTRL(UART_PAD_CTRL), - MX7D_PAD_UART1_RX_DATA__UART1_DCE_RX | MUX_PAD_CTRL(UART_PAD_CTRL), -}; - -static void setup_iomux_uart(void) -{ - imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads)); -}; - -int board_early_init_f(void) -{ - setup_iomux_uart(); - - return 0; -} - #ifdef CONFIG_DM_PMIC int power_init_board(void) { diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index a76565edfd4a..be69174217b0 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -19,6 +19,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="mmc dev ${mmcdev};mmc dev ${mmcdev}; if mmc rescan; then run do_bootscript_hab;if run loadbootscript; then run bootscript; else if run loadimage; then run mmcboot; fi; fi; fi" +# CONFIG_BOARD_EARLY_INIT_F is not set CONFIG_HUSH_PARSER=y # CONFIG_CMD_BOOTD is not set CONFIG_CMD_BOOTZ=y