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 88BFFC4332F for ; Sat, 19 Nov 2022 23:48:37 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 283BA8526D; Sun, 20 Nov 2022 00:46:22 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.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=konsulko.com header.i=@konsulko.com header.b="R1FX4F/V"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C1C4985221; Sun, 20 Nov 2022 00:46:03 +0100 (CET) Received: from mail-qt1-x835.google.com (mail-qt1-x835.google.com [IPv6:2607:f8b0:4864:20::835]) (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 9FD8C851D4 for ; Sun, 20 Nov 2022 00:45:55 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qt1-x835.google.com with SMTP id h21so5396292qtu.2 for ; Sat, 19 Nov 2022 15:45:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=qsyvmTRKLubiFE07cCBX7iq2C4bnKHXW2B3bUwQ/bGw=; b=R1FX4F/V4rEOu12AsyZ3RLZBemkMvZM7WmJNHg2jTn5JYiYSvQa0ssDmbDs+ybvU2D amX1nmoHFs+98XrhsZTx7EoUJzqowvqVD/axIUmuS2+pt2xd1pT5V1PBFa3/zGyQdLJr VFmNaVNC+QOtEBwu8XSg07jRqNAogbeYOQjgY= 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:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qsyvmTRKLubiFE07cCBX7iq2C4bnKHXW2B3bUwQ/bGw=; b=SU9TZBDkPlYS1pzRN5wrNX/9MY7XytMOfJ1enYCcY0ZhPFNkaZsQJS7uJ/IwZAVOze fEJOvgfCMRW9s7DfugWyrTv75XmNUyf7N9ymWaDGv8tB5tcWA58Sa+8Rvw6uvRgb8Kd8 ZC3Qnc18aLF+AbUzoI3P37gjttqIRB49mB5vI+LI+P4kqvFFeDxgMA53Q4irmQpS71N/ TPTxolT19NOvz9LS0oRqqky1BYrAeNNOxeELBMeQs4LKWDYrk+dh6tbUszZRBjIoF36w szKjm+diL0SpZfiUE/3RCNscNAU4Z7GcWc6UtvadeKCWMg1DgPIDdj1tNV5ySk/PBn3R hvIw== X-Gm-Message-State: ANoB5pkMUAm3RJ/XYUBP+nVKVRwscua+jam1USVdmE/HIdhxB2Nhly8Q 42k/WvwCamjDMKrpCdnz1CD4A4hV3nwx0Q== X-Google-Smtp-Source: AA0mqf7I/A1MNAGMRawpPfNrfhPkM+idoE35MNAED2Iv9sNT4m+coSg7lVzGQbP3WvLjYdSiDsPJbA== X-Received: by 2002:ac8:5189:0:b0:39c:b790:6c9c with SMTP id c9-20020ac85189000000b0039cb7906c9cmr12007728qtn.55.1668901555048; Sat, 19 Nov 2022 15:45:55 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-55ec-b699-c19f-3363.res6.spectrum.com. [2603:6081:7b00:6400:55ec:b699:c19f:3363]) by smtp.gmail.com with ESMTPSA id y11-20020a37f60b000000b006ce1bfbd603sm5169743qkj.124.2022.11.19.15.45.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Nov 2022 15:45:54 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 15/38] Convert CONFIG_IOMUX_SHARE_CONF_REG et al to Kconfig Date: Sat, 19 Nov 2022 18:45:22 -0500 Message-Id: <20221119234545.404563-15-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221119234545.404563-1-trini@konsulko.com> References: <20221119234545.404563-1-trini@konsulko.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 This converts the following to Kconfig: CONFIG_IOMUX_LPSR CONFIG_IOMUX_SHARE_CONF_REG Signed-off-by: Tom Rini --- arch/arm/Kconfig | 1 + arch/arm/include/asm/arch-vf610/imx-regs.h | 3 --- arch/arm/mach-imx/Kconfig | 6 ++++++ arch/arm/mach-imx/mx6/Kconfig | 3 +++ arch/arm/mach-imx/mx7/Kconfig | 1 + include/configs/colibri-imx6ull.h | 1 - include/configs/mx6sllevk.h | 2 -- include/configs/mx6ullevk.h | 2 -- include/configs/mx7_common.h | 3 --- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 7866e8f3c4d9..11dddba9a36b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1245,6 +1245,7 @@ config ARCH_VF610 bool "Freescale Vybrid" select CPU_V7A select GPIO_EXTRA_HEADER + select IOMUX_SHARE_CONF_REG select MACH_IMX select SYS_FSL_ERRATUM_ESDHC111 imply CMD_MTDPARTS diff --git a/arch/arm/include/asm/arch-vf610/imx-regs.h b/arch/arm/include/asm/arch-vf610/imx-regs.h index 97211f4b12af..fa3a97824faa 100644 --- a/arch/arm/include/asm/arch-vf610/imx-regs.h +++ b/arch/arm/include/asm/arch-vf610/imx-regs.h @@ -103,9 +103,6 @@ #define QSPI0_AMBA_BASE 0x20000000 -/* MUX mode and PAD ctrl are in one register */ -#define CONFIG_IOMUX_SHARE_CONF_REG - #define FEC_QUIRK_ENET_MAC #define I2C_QUIRK_REG diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index b72b6af4340a..ee5f1996a830 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -195,3 +195,9 @@ config IMX_CONTAINER_CFG help This is to specific the cfg file for generating container image which will be loaded by SPL. + +config IOMUX_LPSR + bool + +config IOMUX_SHARE_CONF_REG + bool diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index 752c57f52db0..e6b0ee757933 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -168,6 +168,7 @@ config TARGET_COLIBRI_IMX6ULL select BOARD_LATE_INIT select DM select DM_THERMAL + select IOMUX_LPSR config TARGET_DART_6UL bool "Variscite imx6ULL dart(DART-SOM-6ULL)" @@ -396,6 +397,7 @@ config TARGET_MX6SLLEVK select BOARD_LATE_INIT select DM select DM_THERMAL + select IOMUX_LPSR imply CMD_DM config TARGET_MX6SXSABRESD @@ -464,6 +466,7 @@ config TARGET_MX6ULL_14X14_EVK select BOARD_LATE_INIT select DM select DM_THERMAL + select IOMUX_LPSR imply CMD_DM config TARGET_MX6ULZ_SMM_M2 diff --git a/arch/arm/mach-imx/mx7/Kconfig b/arch/arm/mach-imx/mx7/Kconfig index 3c388183bc28..0bb18f652009 100644 --- a/arch/arm/mach-imx/mx7/Kconfig +++ b/arch/arm/mach-imx/mx7/Kconfig @@ -6,6 +6,7 @@ config MX7 select ARCH_SUPPORT_PSCI select CPU_V7_HAS_NONSEC select CPU_V7_HAS_VIRT + select IOMUX_LPSR select ROM_UNIFIED_SECTIONS select SYSCOUNTER_TIMER imply CMD_FUSE diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index 12dc946fc782..c0c3b4e0359a 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -11,7 +11,6 @@ #define __COLIBRI_IMX6ULL_CONFIG_H #include "mx6_common.h" -#define CONFIG_IOMUX_LPSR #define PHYS_SDRAM_SIZE SZ_1G diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h index 6632e4ea29ce..8731f6a3e4ad 100644 --- a/include/configs/mx6sllevk.h +++ b/include/configs/mx6sllevk.h @@ -92,8 +92,6 @@ #define CFG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR #define CFG_SYS_FSL_USDHC_NUM 3 -#define CONFIG_IOMUX_LPSR - /* USB Configs */ #ifdef CONFIG_CMD_USB #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h index 4154d328dedf..0e986093f35a 100644 --- a/include/configs/mx6ullevk.h +++ b/include/configs/mx6ullevk.h @@ -108,8 +108,6 @@ /* environment organization */ -#define CONFIG_IOMUX_LPSR - #ifdef CONFIG_CMD_NET #define CONFIG_FEC_ENET_DEV 1 #endif diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index 4704276a74de..d5af6990107d 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -17,9 +17,6 @@ #define CONFIG_MXC_GPT_HCLK #define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */ -/* Enable iomux-lpsr support */ -#define CONFIG_IOMUX_LPSR - /* Miscellaneous configurable options */ /* UART */ -- 2.25.1