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 EB28BC4332F for ; Mon, 14 Nov 2022 20:54:12 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E5CE384E74; Mon, 14 Nov 2022 21:54:02 +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="WuD6L3K4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 33E26830FA; Mon, 14 Nov 2022 21:54:00 +0100 (CET) Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) (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 C68D984CBD for ; Mon, 14 Nov 2022 21:53:55 +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=pbrobinson@gmail.com Received: by mail-wm1-x332.google.com with SMTP id fn7-20020a05600c688700b003b4fb113b86so8870792wmb.0 for ; Mon, 14 Nov 2022 12:53:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zz3WRgzLd4H9eRfz1DYEh0hd8IrZ1HHIianoLyhtqCk=; b=WuD6L3K4LhXziIxq/RCMG3vV4ol/7KKqQN6N3EM3L5YzZlP/a+iTUGS1XsZxlbeDXL g1IFuURIikJp6GiouVsPGVWDO9NRQrAvPvz5y8QqFjxzKO84FzXX+1RWz73QNcNwJkMx H1xHLpNrbPEjeqjI42eIiYu0BQDhs2yvDmn55/5MYhtuCoeHz06Y9TLBPpGgoey9QN0S b7+6x5tckNW9/PbmcUMdcVtDAgKmLm18Xd9fDu7xe0tL8ejYbqwND47ogwnQtA4xExAc 58iM2QwUR1Vg9MCmV3v2fMdEJOH3BSo/u23IG1iAwwGGtOmx/Ei5HmqfHh1JlfcS3j9b wVYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zz3WRgzLd4H9eRfz1DYEh0hd8IrZ1HHIianoLyhtqCk=; b=eOehNiDO/FLMEj5FfWwIfYo+wDhLWNJzDSf5CmuAYS98YxldIaTdQTm+X3q+UanGSc gmTsPJBJrrKZTqhfEgbguTKzpsqc4p/225hOBfK+YEMmw2UDMWhswE1hIM4pfLQHVfSS 9LifibyBcWAxmX29e6J4lybH4I20gzYjl+qqQ3doBuFJewsf/4m9xUAehLwQNYD8cWIP vPZXbH92Bp6fjwKAsov01HWYWy05L9lCxxKPwengW9DrtxRs4iofLjaK4MQgxa4R82EU QpGcbRl3l97d3+eZlOfPPMRDmQ+8JpeYrBUBxNybyIfFKcQCvrBpB8CHYAsT3lMOIwS8 GGCw== X-Gm-Message-State: ANoB5pndKnJmoIFTH/07LCcEpgodz3SZcWoxA1NXcjFlWAWw69+PD2jA MHPMehTizj71qm+uHCWvyJo= X-Google-Smtp-Source: AA0mqf7aMuB6r97Hyxj2rEm6L4pS7ERKIRcTv5TwmYo999oa5wKVaB8HPso1rRkfedTiQZl6PwoiJg== X-Received: by 2002:a05:600c:4ba9:b0:3cf:6f5f:da0e with SMTP id e41-20020a05600c4ba900b003cf6f5fda0emr9028805wmp.19.1668459235275; Mon, 14 Nov 2022 12:53:55 -0800 (PST) Received: from morpheus.home.roving-it.com.com (3.e.2.0.0.0.0.0.0.0.0.0.0.0.0.0.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681::2e3]) by smtp.googlemail.com with ESMTPSA id r7-20020a05600c458700b003c7087f6c9asm20198428wmo.32.2022.11.14.12.53.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Nov 2022 12:53:54 -0800 (PST) From: Peter Robinson To: Stefano Babic , Breno Lima , Francesco Montefoschi , Fabio Estevam , u-boot@lists.denx.de Cc: Peter Robinson Subject: [PATCH v2 2/2] udoo_neo: Select DM_SERIAL and drop iomux board level init Date: Mon, 14 Nov 2022 20:53:48 +0000 Message-Id: <20221114205348.642614-2-pbrobinson@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221114205348.642614-1-pbrobinson@gmail.com> References: <20221114205348.642614-1-pbrobinson@gmail.com> 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.6 at phobos.denx.de X-Virus-Status: Clean Convert to DM_SERIAL and drop the iomux board file level init as it's handled as part of the DM serial layer instead. Signed-off-by: Peter Robinson --- Changes in v2: - Drop no longer needed setup_iomux_uart and associated bits board/udoo/neo/neo.c | 26 +++----------------------- configs/udoo_neo_defconfig | 2 +- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/board/udoo/neo/neo.c b/board/udoo/neo/neo.c index 9e2a66996c4..1287f719197 100644 --- a/board/udoo/neo/neo.c +++ b/board/udoo/neo/neo.c @@ -43,10 +43,6 @@ enum { UDOO_NEO_TYPE_EXTENDED, }; -#define UART_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ - PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \ - PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS) - #define USDHC_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ PAD_CTL_PUS_22K_UP | PAD_CTL_SPEED_LOW | \ PAD_CTL_DSE_80ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS) @@ -98,11 +94,6 @@ int power_init_board(void) return 0; } -static iomux_v3_cfg_t const uart1_pads[] = { - MX6_PAD_GPIO1_IO04__UART1_TX | MUX_PAD_CTRL(UART_PAD_CTRL), - MX6_PAD_GPIO1_IO05__UART1_RX | MUX_PAD_CTRL(UART_PAD_CTRL), -}; - static iomux_v3_cfg_t const usdhc2_pads[] = { MX6_PAD_SD2_CLK__USDHC2_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL), MX6_PAD_SD2_CMD__USDHC2_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL), @@ -130,11 +121,6 @@ static iomux_v3_cfg_t const peri_3v3_pads[] = { MX6_PAD_QSPI1A_DATA0__GPIO4_IO_16 | MUX_PAD_CTRL(NO_PAD_CTRL), }; -static void setup_iomux_uart(void) -{ - imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads)); -} - static int setup_fec(void) { struct anatop_regs *anatop = (struct anatop_regs *)ANATOP_BASE_ADDR; @@ -184,13 +170,6 @@ int board_init(void) return 0; } -int board_early_init_f(void) -{ - setup_iomux_uart(); - - return 0; -} - static struct fsl_esdhc_cfg usdhc_cfg[1] = { {USDHC2_BASE_ADDR}, }; @@ -421,11 +400,12 @@ void board_init_f(ulong dummy) /* setup AIPS and disable watchdog */ arch_cpu_init(); - board_early_init_f(); - /* setup GP timer */ timer_init(); + /* Enable device tree and early DM support*/ + spl_early_init(); + /* UART clocks enabled and gd valid - init serial console */ preloader_console_init(); diff --git a/configs/udoo_neo_defconfig b/configs/udoo_neo_defconfig index 341ee4671db..3d50bf7d79f 100644 --- a/configs/udoo_neo_defconfig +++ b/configs/udoo_neo_defconfig @@ -21,7 +21,6 @@ CONFIG_SPL_LIBDISK_SUPPORT=y # CONFIG_CMD_BMODE is not set CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd" -CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SYS_SPL_MALLOC=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_FS_EXT4=y @@ -59,6 +58,7 @@ CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_ANATOP=y CONFIG_DM_REGULATOR_PFUZE100=y +CONFIG_DM_SERIAL=y CONFIG_MXC_UART=y CONFIG_IMX_THERMAL=y CONFIG_USB=y -- 2.38.1