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 51876C433F5 for ; Tue, 15 Mar 2022 20:47:23 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7A8DA83ACE; Tue, 15 Mar 2022 21:47:21 +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="lobPWdi0"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A90A283BE6; Tue, 15 Mar 2022 21:47:19 +0100 (CET) Received: from mail-oi1-x235.google.com (mail-oi1-x235.google.com [IPv6:2607:f8b0:4864:20::235]) (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 DBE4080EF4 for ; Tue, 15 Mar 2022 21:47:15 +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-x235.google.com with SMTP id v75so594319oie.1 for ; Tue, 15 Mar 2022 13:47:15 -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=fqREWoFFAPUpuYR7urJeEAeURddAxBGu6r25/faJqBk=; b=lobPWdi0PwthIhkA5NNYJsIl0p2EaF3JbVdhqTuV8GnTANNZT8ncoatm4stH1VR/SR 5ok1lFU8T7OwHntKWQ3LwedO5pJtaiZz6Aqv1CTlBanAi3Vhbzr4fo8Hda4smobvUihN u6zr0ic9HRSFs7QiphoHOjVs5XD9Q+6sLxuDVcD2toKO7s7mGv898D8TqIpV3/GXDH9d FMCzNDUr7QJA4Sum9ACzc+S5Ehil3DUhjkrpA5HK9eXYPwxkrKCs58ctkaHOv02Yfqku 5+s7GdVGV5Dkf4AQ//Na9NL0FExaohhG1AAciZ5Y5En4DHWWNEgECjpbuwMJbburZFtp uttw== 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=fqREWoFFAPUpuYR7urJeEAeURddAxBGu6r25/faJqBk=; b=7Q/yX9QxU32YmK4ZSh+1QeaLCzaQmlvCXlcWU4SWxCE/D1zBIXuMafgqApng5TQidB 5Kk9CK0fWvdkZ8Vh2Xne7PMShet8dzFnydotm11mRhFqmY9FTHbm8oJpYBGZVBsk+KZz mfU9x1RQq3vX7ZsG9cPZoEId0N8WnXcT8BPUAIise+cxfca/1aboTvpvrSSamD2JHb66 G1Pd+XZjq1jofvf/tyAq3ZHpuUL+MAZe8ElVyxs2pRPIKEeHAtCJ6Lsk1IvrB+AsfboL HZex/UCgNMZx9oq9WUsljKc5EvBfFM8Cq50MZyaaY+RRVd42+DHS8+5+KQ8RH/xtj11q am8w== X-Gm-Message-State: AOAM532wCxXETSQYU0qQRWqLPuGEYH87U8/vhJSX+mG3gH2jV7erSXAQ CNup/M83lTteGiRT/p20Acc= X-Google-Smtp-Source: ABdhPJzV8ZglAcLr5cKvEYavsLS0rZeR5TA5E0+zSUd0RRNtGXMqOTUnq7E9HBcEdN8j7TWuHKvrqQ== X-Received: by 2002:aca:2110:0:b0:2ec:b1cf:2dda with SMTP id 16-20020aca2110000000b002ecb1cf2ddamr2559912oiz.143.1647377234178; Tue, 15 Mar 2022 13:47:14 -0700 (PDT) Received: from localhost.localdomain ([2804:14c:485:4b69:59cd:13ec:b109:9f3b]) by smtp.gmail.com with ESMTPSA id k22-20020a056870959600b000d277c48d18sm430oao.3.2022.03.15.13.47.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Mar 2022 13:47:13 -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] tbs2910: Convert to DM_SERIAL Date: Tue, 15 Mar 2022 17:47:05 -0300 Message-Id: <20220315204705.2175288-1-festevam@gmail.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 From: Fabio Estevam Conversion to DM_SERIAL is mandatory. Select DM_SERIAL and add a imx6q-tbs2910-u-boot.dtsi file that describes 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/imx6q-tbs2910-u-boot.dtsi | 17 +++++++++++++++++ arch/arm/dts/imx6qdl.dtsi | 4 ++-- board/tbs/tbs2910/tbs2910.c | 26 -------------------------- configs/tbs2910_defconfig | 2 +- 4 files changed, 20 insertions(+), 29 deletions(-) create mode 100644 arch/arm/dts/imx6q-tbs2910-u-boot.dtsi diff --git a/arch/arm/dts/imx6q-tbs2910-u-boot.dtsi b/arch/arm/dts/imx6q-tbs2910-u-boot.dtsi new file mode 100644 index 000000000000..65ab052ac2c0 --- /dev/null +++ b/arch/arm/dts/imx6q-tbs2910-u-boot.dtsi @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0+ + +&aips1 { + 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/imx6qdl.dtsi b/arch/arm/dts/imx6qdl.dtsi index efd89510d512..d89272039b28 100644 --- a/arch/arm/dts/imx6qdl.dtsi +++ b/arch/arm/dts/imx6qdl.dtsi @@ -139,7 +139,7 @@ interrupts = <0 94 IRQ_TYPE_LEVEL_HIGH>; }; - soc { + soc: soc { #address-cells = <1>; #size-cells = <1>; compatible = "simple-bus"; @@ -283,7 +283,7 @@ status = "disabled"; }; - bus@2000000 { /* AIPS1 */ + aips1: bus@2000000 { /* AIPS1 */ compatible = "fsl,aips-bus", "simple-bus"; #address-cells = <1>; #size-cells = <1>; diff --git a/board/tbs/tbs2910/tbs2910.c b/board/tbs/tbs2910/tbs2910.c index faf73cc218c9..3a447ca8a93c 100644 --- a/board/tbs/tbs2910/tbs2910.c +++ b/board/tbs/tbs2910/tbs2910.c @@ -22,32 +22,12 @@ #include DECLARE_GLOBAL_DATA_PTR; -#define UART_PAD_CTRL (PAD_CTL_PUS_100K_UP | \ - PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | \ - PAD_CTL_SRE_FAST | PAD_CTL_HYS) - -static iomux_v3_cfg_t const uart1_pads[] = { - MX6_PAD_CSI0_DAT10__UART1_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL), - MX6_PAD_CSI0_DAT11__UART1_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL), -}; - -static iomux_v3_cfg_t const uart2_pads[] = { - MX6_PAD_EIM_D26__UART2_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL), - MX6_PAD_EIM_D27__UART2_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL), -}; - int dram_init(void) { gd->ram_size = 2048ul * 1024 * 1024; return 0; } -static void setup_iomux_uart(void) -{ - imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads)); - imx_iomux_v3_setup_multiple_pads(uart2_pads, ARRAY_SIZE(uart2_pads)); -} - #ifdef CONFIG_FSL_ESDHC_IMX /* set environment device to boot device when booting from SD */ int board_mmc_get_env_dev(int devno) @@ -150,12 +130,6 @@ static void setup_display(void) } #endif /* CONFIG_VIDEO_IPUV3 */ -int board_early_init_f(void) -{ - setup_iomux_uart(); - return 0; -} - #ifdef CONFIG_CMD_BMODE static const struct boot_mode board_boot_modes[] = { /* 4 bit bus width */ diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig index 8a3316056408..63a778a45f0b 100644 --- a/configs/tbs2910_defconfig +++ b/configs/tbs2910_defconfig @@ -23,7 +23,6 @@ CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="echo PCI:; pci enum; pci 1; usb start; if hdmidet; then run set_con_hdmi; else run set_con_serial; fi" CONFIG_DEFAULT_FDT_FILE="imx6q-tbs2910.dtb" CONFIG_PRE_CONSOLE_BUFFER=y -CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Matrix U-Boot> " # CONFIG_CMD_BDI is not set @@ -81,6 +80,7 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y CONFIG_DM_RTC=y CONFIG_RTC_DS1307=y +CONFIG_DM_SERIAL=y CONFIG_MXC_UART=y CONFIG_DM_THERMAL=y CONFIG_IMX_THERMAL=y -- 2.25.1