[PATCH 15/38] Convert CONFIG_IOMUX_SHARE_CONF_REG et al to Kconfig

Tom Rini
2022-11-19T23:48:37Z

This converts the following to Kconfig:
CONFIG_IOMUX_LPSR
CONFIG_IOMUX_SHARE_CONF_REG

Signed-off-by: Tom Rini <trini@konsulko.com>
---
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