From patchwork Wed Aug 14 18:28:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1972512 X-Patchwork-Delegate: festevam@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=bUcFPQAi; dkim-atps=neutral Authentication-Results: legolas.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=patchwork.ozlabs.org) 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 ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WkcGX03KFz1yZl for ; Thu, 15 Aug 2024 04:29:07 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A6033889BA; Wed, 14 Aug 2024 20:29:04 +0200 (CEST) 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="bUcFPQAi"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 22E3C889EB; Wed, 14 Aug 2024 20:28:58 +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=-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-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) (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 55B10889BA for ; Wed, 14 Aug 2024 20:28:55 +0200 (CEST) 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-pl1-x631.google.com with SMTP id d9443c01a7336-1fc4e010efdso79155ad.3 for ; Wed, 14 Aug 2024 11:28:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723660134; x=1724264934; darn=lists.denx.de; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=60LD6LUGaFgJNbzROtGui80RskdwwlZzARBnv/v3MH4=; b=bUcFPQAij5iCYx9+l7gdV9Ka8G50cg94nesJlCiyrAZDusIqGM1tuSqUh4jM1UUEea xry558YoTD1KVcgbq77vzGd8VO7n10FH/iU7YNvoVSfoLohdgtkryWNF38HYdbQYSA4i ar9h1O0jgyDtAQGUERGLOCHGv2rZEwLXzGCrTDv1xUhBCou3kU6cIvvsO38yEXOxLh3u ZZL7E7Z26xxOFnh6cfnuXVSDKKljgnOe2NCGTmI6SSaMPS3njBoQfNYyUwXLGatAW1wC p2bbBfvZ/Ao3fNWj/jGxCcH/95N+r438qcC02+GOMSN4e2QjDio5vMlyV66A1SQGmmof GwSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723660134; x=1724264934; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=60LD6LUGaFgJNbzROtGui80RskdwwlZzARBnv/v3MH4=; b=nub/fO0jJJcVBcMtXnhKaq59Ph7c490/0L7V0gV3RSUmU5bvhFFPYajECBDeNe9HqF YLPyfRlWOodX2fp4h/oSmIF4h9ljlx89sR8ykiy3qcaaR8v9QIEUIyjA3vTPVBV05eNQ 6GQF/YPWXnk6az5FH0vDfgoRe14XMY9XwX+GsI6FyQGLHjIZIGqM2VSb33yLC7tZZCKw LProrWU7eyPZR/5S/+YEKzHGz57UjkfNWsTNpjaecI7LOicaDA+jlcm2IP+PaeSAuHOM kexW3aMdrTa3J5W4M+r4QwcYWMQ9WWrBWzgjHgXRPrnabMiI3sZi0Fg+8ux7+qOWcfec vEYw== X-Gm-Message-State: AOJu0Yyj9eb5V5llYlZNoUGVw+i26IYOM+0o+39g14/qjEM4IJOr87Y7 5+DzCCvLsvD6+i+7FaEpe0RXPPOIOYpv2I1XvQAogNFupWz8zGmlaiT8vw== X-Google-Smtp-Source: AGHT+IFU4xD8Kc0xc4rNLlCFhffeSDYKxstmPb5P+TIXC0OFFCE6Gx2ZlMFhAIHBo46CtudAeWr8zg== X-Received: by 2002:a17:902:c412:b0:1f7:1a37:d0b5 with SMTP id d9443c01a7336-201d63ba806mr24487915ad.4.1723660133686; Wed, 14 Aug 2024 11:28:53 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b61:31ab:46dd:f2b3:633]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-201cd13149csm32563535ad.47.2024.08.14.11.28.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Aug 2024 11:28:53 -0700 (PDT) From: Fabio Estevam To: Markus.Niebel@tq-group.com Cc: u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH 1/3] tqma6: Remove non-DM board code Date: Wed, 14 Aug 2024 15:28:43 -0300 Message-Id: <20240814182845.762118-1-festevam@gmail.com> X-Mailer: git-send-email 2.34.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.8 at phobos.denx.de X-Virus-Status: Clean From: Fabio Estevam CONFIG_DM_MMC and CONFIG_DM_SPI are alway selected so the mmc and spi board code can be safely removed. Remove it to make the code cleaner. Signed-off-by: Fabio Estevam --- board/tq/tqma6/tqma6.c | 126 ----------------------------------------- 1 file changed, 126 deletions(-) diff --git a/board/tq/tqma6/tqma6.c b/board/tq/tqma6/tqma6.c index 445ce987b68..40369f03e72 100644 --- a/board/tq/tqma6/tqma6.c +++ b/board/tq/tqma6/tqma6.c @@ -19,33 +19,15 @@ #include #include #include -#include -#include #include #include #include #include -#include #include "tqma6_bb.h" DECLARE_GLOBAL_DATA_PTR; -#define USDHC_CLK_PAD_CTRL (PAD_CTL_PUS_47K_UP | PAD_CTL_SPEED_LOW | \ - PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS) - -#define USDHC_PAD_CTRL (PAD_CTL_PUS_47K_UP | PAD_CTL_SPEED_LOW | \ - PAD_CTL_DSE_80ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS) - -#define GPIO_OUT_PAD_CTRL (PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_LOW | \ - PAD_CTL_DSE_40ohm | PAD_CTL_HYS) - -#define GPIO_IN_PAD_CTRL (PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_LOW | \ - PAD_CTL_DSE_40ohm | PAD_CTL_HYS) - -#define SPI_PAD_CTRL (PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \ - PAD_CTL_DSE_80ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS) - int dram_init(void) { gd->ram_size = imx_ddr_size(); @@ -55,114 +37,6 @@ int dram_init(void) static const uint16_t tqma6_emmc_dsr = 0x0100; -#ifndef CONFIG_DM_MMC -/* eMMC on USDHCI3 always present */ -static iomux_v3_cfg_t const tqma6_usdhc3_pads[] = { - NEW_PAD_CTRL(MX6_PAD_SD3_CLK__SD3_CLK, USDHC_PAD_CTRL), - NEW_PAD_CTRL(MX6_PAD_SD3_CMD__SD3_CMD, USDHC_PAD_CTRL), - NEW_PAD_CTRL(MX6_PAD_SD3_DAT0__SD3_DATA0, USDHC_PAD_CTRL), - NEW_PAD_CTRL(MX6_PAD_SD3_DAT1__SD3_DATA1, USDHC_PAD_CTRL), - NEW_PAD_CTRL(MX6_PAD_SD3_DAT2__SD3_DATA2, USDHC_PAD_CTRL), - NEW_PAD_CTRL(MX6_PAD_SD3_DAT3__SD3_DATA3, USDHC_PAD_CTRL), - NEW_PAD_CTRL(MX6_PAD_SD3_DAT4__SD3_DATA4, USDHC_PAD_CTRL), - NEW_PAD_CTRL(MX6_PAD_SD3_DAT5__SD3_DATA5, USDHC_PAD_CTRL), - NEW_PAD_CTRL(MX6_PAD_SD3_DAT6__SD3_DATA6, USDHC_PAD_CTRL), - NEW_PAD_CTRL(MX6_PAD_SD3_DAT7__SD3_DATA7, USDHC_PAD_CTRL), - /* eMMC reset */ - NEW_PAD_CTRL(MX6_PAD_SD3_RST__SD3_RESET, GPIO_OUT_PAD_CTRL), -}; - -/* - * According to board_mmc_init() the following map is done: - * (U-Boot device node) (Physical Port) - * mmc0 eMMC (SD3) on TQMa6 - * mmc1 .. n optional slots used on baseboard - */ -struct fsl_esdhc_cfg tqma6_usdhc_cfg = { - .esdhc_base = USDHC3_BASE_ADDR, - .max_bus_width = 8, -}; - -int board_mmc_getcd(struct mmc *mmc) -{ - struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv; - int ret = 0; - - if (cfg->esdhc_base == USDHC3_BASE_ADDR) - /* eMMC/uSDHC3 is always present */ - ret = 1; - else - ret = tqma6_bb_board_mmc_getcd(mmc); - - return ret; -} - -int board_mmc_getwp(struct mmc *mmc) -{ - struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv; - int ret = 0; - - if (cfg->esdhc_base == USDHC3_BASE_ADDR) - /* eMMC/uSDHC3 is always present */ - ret = 0; - else - ret = tqma6_bb_board_mmc_getwp(mmc); - - return ret; -} - -int board_mmc_init(struct bd_info *bis) -{ - imx_iomux_v3_setup_multiple_pads(tqma6_usdhc3_pads, - ARRAY_SIZE(tqma6_usdhc3_pads)); - tqma6_usdhc_cfg.sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK); - if (fsl_esdhc_initialize(bis, &tqma6_usdhc_cfg)) { - puts("Warning: failed to initialize eMMC dev\n"); - } else { - struct mmc *mmc = find_mmc_device(0); - if (mmc) - mmc_set_dsr(mmc, tqma6_emmc_dsr); - } - - tqma6_bb_board_mmc_init(bis); - - return 0; -} -#endif - -#ifndef CONFIG_DM_SPI -static iomux_v3_cfg_t const tqma6_ecspi1_pads[] = { - /* SS1 */ - NEW_PAD_CTRL(MX6_PAD_EIM_D19__GPIO3_IO19, SPI_PAD_CTRL), - NEW_PAD_CTRL(MX6_PAD_EIM_D16__ECSPI1_SCLK, SPI_PAD_CTRL), - NEW_PAD_CTRL(MX6_PAD_EIM_D17__ECSPI1_MISO, SPI_PAD_CTRL), - NEW_PAD_CTRL(MX6_PAD_EIM_D18__ECSPI1_MOSI, SPI_PAD_CTRL), -}; - -#define TQMA6_SF_CS_GPIO IMX_GPIO_NR(3, 19) - -static unsigned const tqma6_ecspi1_cs[] = { - TQMA6_SF_CS_GPIO, -}; - -__weak void tqma6_iomuxc_spi(void) -{ - unsigned i; - - for (i = 0; i < ARRAY_SIZE(tqma6_ecspi1_cs); ++i) - gpio_direction_output(tqma6_ecspi1_cs[i], 1); - imx_iomux_v3_setup_multiple_pads(tqma6_ecspi1_pads, - ARRAY_SIZE(tqma6_ecspi1_pads)); -} - -#if defined(CONFIG_SF_DEFAULT_BUS) && defined(CONFIG_SF_DEFAULT_CS) -int board_spi_cs_gpio(unsigned bus, unsigned cs) -{ - return ((bus == CONFIG_SF_DEFAULT_BUS) && - (cs == CONFIG_SF_DEFAULT_CS)) ? TQMA6_SF_CS_GPIO : -1; -} -#endif -#endif int board_early_init_f(void) { From patchwork Wed Aug 14 18:28:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1972514 X-Patchwork-Delegate: festevam@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=NZomyvGb; dkim-atps=neutral Authentication-Results: legolas.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=patchwork.ozlabs.org) 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 ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WkcGr6BYBz1yZl for ; Thu, 15 Aug 2024 04:29:24 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 64AE588A0A; Wed, 14 Aug 2024 20:29:05 +0200 (CEST) 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="NZomyvGb"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B9D06889EB; Wed, 14 Aug 2024 20:29:04 +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=-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,UPPERCASE_50_75 autolearn=no autolearn_force=no version=3.4.2 Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [IPv6:2607:f8b0:4864:20::62d]) (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 7DB7E889FC for ; Wed, 14 Aug 2024 20:28:57 +0200 (CEST) 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-pl1-x62d.google.com with SMTP id d9443c01a7336-201e2fe323aso117825ad.2 for ; Wed, 14 Aug 2024 11:28:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723660136; x=1724264936; darn=lists.denx.de; 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=+22PX4kdUf0sqSlD+VJKx2IZbZMrLX3TUb7Tpf78fbI=; b=NZomyvGbjR0f984uRa79IJh+INt2v4CBmFcGqe7DyYw17FC1pIRbFP1NGUza04sCJs jj2AMb2sbVoTIDF5AEJMY1dPH76WAAcQVhBRaGmiTXOYRQMwipl4JtHm9VPwj7cHHoMC Kw/nvCV0rnccANDet063K9/uTfkpWCtE5wECA0TdX+7bdSZpEuR/BY6pnp0nDJDmrFGf lXaCyYapTzFBKvp2tdajLImtViipUFmVZTQjlQ+j/zWE9T/MHSOmYr0KwtkF5uuWbEAi qK1rMgWdXKdf/vblPtpRX93q1X5pNoa2Rins0FqGzFiCFxxs+9c8W1qyhBb0iO0QpYLD pQUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723660136; x=1724264936; 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=+22PX4kdUf0sqSlD+VJKx2IZbZMrLX3TUb7Tpf78fbI=; b=b0Jqu1ponOUTkvcrQGt/4Ab76hwOKASmOc2LCLAkPrF1HoMTX5hpUsRO7Z+dU9/LC7 CuKhFiQ9cN2h2IX6C3MsF1K/x/wPQU+lfF9JmZJMUlWHyVYgK1GXUYJTgOq2PEQBFx7i kf9dhc2NQeYsiohR/JTgAU+/1bJSwlP8nxuzfEg6qH4GaEMLyDCI0wCg1agPJID/aCxp HnrKpaoMBY0K3lweZSRtQPNkG/WfXGPOeRA1Tluqm3bNMj09KB8Rvy+/1N4DhiUVL/Z8 zsKTLB9HMg6txZhZJAtNxeGDEUVQs1JJ8VhGaBbxZcV+bUNhpYEcNuNWqMbnLTFICuFC kZHQ== X-Gm-Message-State: AOJu0YwySZPO0lFqCCWwpkzDnRpfMcGr5VpTzSTbLsiRdHoRA2EIv+BE AIUyjuy2zng/svQ2Lud9UDvnhV4ZdvzrcNUFr/R4SD8gFKQdOsl3WaRNaw== X-Google-Smtp-Source: AGHT+IFgjSptRqsPEUO58Ua+0DzMHGx/Qg4qIaWUrLXndoNH3bauXtUv/47/G4RYbqkccSNg4Dxxaw== X-Received: by 2002:a17:902:c40b:b0:1fd:a428:a021 with SMTP id d9443c01a7336-201d654df6dmr26551495ad.11.1723660135868; Wed, 14 Aug 2024 11:28:55 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b61:31ab:46dd:f2b3:633]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-201cd13149csm32563535ad.47.2024.08.14.11.28.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Aug 2024 11:28:55 -0700 (PDT) From: Fabio Estevam To: Markus.Niebel@tq-group.com Cc: u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH 2/3] tqma6_mba6: Remove unused defines Date: Wed, 14 Aug 2024 15:28:44 -0300 Message-Id: <20240814182845.762118-2-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240814182845.762118-1-festevam@gmail.com> References: <20240814182845.762118-1-festevam@gmail.com> 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.8 at phobos.denx.de X-Virus-Status: Clean From: Fabio Estevam The PAD_CTRL definitions are not used anywhere. Remove them to make the code cleaner. Signed-off-by: Fabio Estevam --- board/tq/tqma6/tqma6_mba6.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/board/tq/tqma6/tqma6_mba6.c b/board/tq/tqma6/tqma6_mba6.c index 877539e359e..7267d812e7d 100644 --- a/board/tq/tqma6/tqma6_mba6.c +++ b/board/tq/tqma6/tqma6_mba6.c @@ -34,25 +34,6 @@ #define UART_PAD_CTRL (PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \ PAD_CTL_DSE_80ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS) -#define USDHC_CLK_PAD_CTRL (PAD_CTL_PUS_47K_UP | PAD_CTL_SPEED_LOW | \ - PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS) - -#define USDHC_PAD_CTRL (PAD_CTL_PUS_47K_UP | PAD_CTL_SPEED_LOW | \ - PAD_CTL_DSE_80ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS) - -#define GPIO_OUT_PAD_CTRL (PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_LOW | \ - PAD_CTL_DSE_40ohm | PAD_CTL_HYS) - -#define GPIO_IN_PAD_CTRL (PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_LOW | \ - PAD_CTL_DSE_40ohm | PAD_CTL_HYS) - -#define SPI_PAD_CTRL (PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \ - PAD_CTL_DSE_80ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS) - -#define I2C_PAD_CTRL (PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \ - PAD_CTL_DSE_80ohm | PAD_CTL_HYS | \ - PAD_CTL_ODE | PAD_CTL_SRE_FAST) - #if defined(CONFIG_TQMA6Q) #define IOMUX_SW_PAD_CTRL_GRP_DDR_TYPE_RGMII 0x02e0790 From patchwork Wed Aug 14 18:28:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1972513 X-Patchwork-Delegate: festevam@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=KyRWDPVn; dkim-atps=neutral Authentication-Results: legolas.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=patchwork.ozlabs.org) 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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WkcGh48Dkz1yZl for ; Thu, 15 Aug 2024 04:29:16 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0CF4B889FD; Wed, 14 Aug 2024 20:29:05 +0200 (CEST) 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="KyRWDPVn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 27208889BA; Wed, 14 Aug 2024 20:29:02 +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=-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-pl1-x629.google.com (mail-pl1-x629.google.com [IPv6:2607:f8b0:4864:20::629]) (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 E8FF9889E9 for ; Wed, 14 Aug 2024 20:28:59 +0200 (CEST) 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-pl1-x629.google.com with SMTP id d9443c01a7336-1fc47aef524so166085ad.3 for ; Wed, 14 Aug 2024 11:28:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723660138; x=1724264938; darn=lists.denx.de; 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=A2Vt9rpa2YamZsp/lZtqrb1zYci4QOWOB+5m/vqz690=; b=KyRWDPVnHazXZviUxBbZNZWck10nZVdVBYgT3mGXFI/CIir8hfYYXehzapUvxeueaF 7YahB50SjwVGsDq0Qnpo3as0EKqpewcyEIa1ET3Ll7cHJM+BJuAwYcZvxq1f5m4ltMhV pooEpcqs6GwTxd/bmgqzrKFQlh8gdVzEJ8ZGJ0eZP/VJSJPiUZxvbdFI91NznCNDVvMa EEEp7Bu9JJE0kExZiBcqPMFUrqrcp70P2j2COzyCzS0pCYrhUL5GaeE038j8BZwVw4wa qM0IOfngxg3C48sBYD2Q/EWY3EZ/pnr8nondYj0lUvCF2IZwS6hxWDcNnXxUChFOjnYF CQeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723660138; x=1724264938; 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=A2Vt9rpa2YamZsp/lZtqrb1zYci4QOWOB+5m/vqz690=; b=QzyzYA2eEfaePvmqsqNNoLKZDASXcuOY1iNEzqDSz29ZULfczl2+uZNLdLrth5SMKv C9Rth4R5k1ymuda8gxBAwIkA88uVn2ZEPaw8gB9h4GvX2XK0rKZGFCdyl9SHs5AeA54R yRGtuF5/7nu1gRITwwljDOsvDxFnlgrLDLipY5weuqO9rsyN9da56uouKOxUaqvhXqj6 /2pf9EV0x2kYc/5FauIZa9f8ToFxPp3fVaoj377xDBg4Ty1bQyElhPElEiWSeVGhFs7E zHUFJK7ZC8hejm4bbLEHDLR8aJKrwd4lBHGCi+IAFuUhq2eWxIXwpa468gBloVoW3Z4r hKpQ== X-Gm-Message-State: AOJu0Yxc/y4Xaa9bW/0WZQfvTRJT4CSkJROJBxBEV7KZRw1QNf41VwmT A1DAOrXNNbWSdf4npiDXmMfU2yca9df8dUZ4xWuB9zN1Mgi6rPzk X-Google-Smtp-Source: AGHT+IE61UoGfgXLbQQfDje/4WZ4st0LHTBGQvKKu5LN1GOwMADnTWRohvV//EMv85NNYvLmNZmV6w== X-Received: by 2002:a17:902:d0d4:b0:201:e7c2:bd0d with SMTP id d9443c01a7336-201e7c2bf11mr10316755ad.11.1723660138321; Wed, 14 Aug 2024 11:28:58 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b61:31ab:46dd:f2b3:633]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-201cd13149csm32563535ad.47.2024.08.14.11.28.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Aug 2024 11:28:57 -0700 (PDT) From: Fabio Estevam To: Markus.Niebel@tq-group.com Cc: u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH 3/3] tqma6_mba6: Remove UART board code Date: Wed, 14 Aug 2024 15:28:45 -0300 Message-Id: <20240814182845.762118-3-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240814182845.762118-1-festevam@gmail.com> References: <20240814182845.762118-1-festevam@gmail.com> 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.8 at phobos.denx.de X-Virus-Status: Clean From: Fabio Estevam With DM_SERIAL in place, there is no need to setup the UART pins in the board code. The UART pins are setup via devicetree, thanks to DM. Remove the unneeded code. Signed-off-by: Fabio Estevam --- arch/arm/dts/imx6qdl-mba6-u-boot.dtsi | 16 ++++++++++++++++ board/tq/tqma6/tqma6_mba6.c | 16 ---------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/arch/arm/dts/imx6qdl-mba6-u-boot.dtsi b/arch/arm/dts/imx6qdl-mba6-u-boot.dtsi index 78457ef68f4..c8c0fc1fba7 100644 --- a/arch/arm/dts/imx6qdl-mba6-u-boot.dtsi +++ b/arch/arm/dts/imx6qdl-mba6-u-boot.dtsi @@ -10,6 +10,22 @@ }; }; +&aips2 { + bootph-all; +}; + +&pinctrl_uart2 { + bootph-all; +}; + +&soc { + bootph-all; +}; + +&uart2 { + bootph-all; +}; + &wdog1 { bootph-pre-ram; }; diff --git a/board/tq/tqma6/tqma6_mba6.c b/board/tq/tqma6/tqma6_mba6.c index 7267d812e7d..b8f76591006 100644 --- a/board/tq/tqma6/tqma6_mba6.c +++ b/board/tq/tqma6/tqma6_mba6.c @@ -31,9 +31,6 @@ #include "tqma6_bb.h" -#define UART_PAD_CTRL (PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \ - PAD_CTL_DSE_80ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS) - #if defined(CONFIG_TQMA6Q) #define IOMUX_SW_PAD_CTRL_GRP_DDR_TYPE_RGMII 0x02e0790 @@ -70,17 +67,6 @@ static void mba6_setup_iomuxc_enet(void) (void *)IOMUX_SW_PAD_CTRL_GRP_DDR_TYPE_RGMII); } -static iomux_v3_cfg_t const mba6_uart2_pads[] = { - NEW_PAD_CTRL(MX6_PAD_SD4_DAT4__UART2_RX_DATA, UART_PAD_CTRL), - NEW_PAD_CTRL(MX6_PAD_SD4_DAT7__UART2_TX_DATA, UART_PAD_CTRL), -}; - -static void mba6_setup_iomuxc_uart(void) -{ - imx_iomux_v3_setup_multiple_pads(mba6_uart2_pads, - ARRAY_SIZE(mba6_uart2_pads)); -} - int board_mmc_get_env_dev(int devno) { /* @@ -140,8 +126,6 @@ int board_phy_config(struct phy_device *phydev) int tqma6_bb_board_early_init_f(void) { - mba6_setup_iomuxc_uart(); - return 0; }