Convert CONFIG_PCA953X to Kconfig

This converts the following to Kconfig:
   CONFIG_PCA953X

Cc: Uri Mashiach <uri.mashiach@compulab.co.il>
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/README b/README
index 0a7635d1a24dacbed662ea6b8fb1006427831097..eb76c73ac3d0ec0c4e0fc4c1cdae8b12f46021d3 100644 (file)
--- a/README
+++ b/README
@@ -483,8 +483,6 @@ The following options need to be configured:
                must also be configured. See I2C Support, below.
 
 - GPIO Support:
-               CONFIG_PCA953X          - use NXP's PCA953X series I2C GPIO
-
                The CFG_SYS_I2C_PCA953X_WIDTH option specifies a list of
                chip-ngpio pairs that tell the PCA953X driver the number of
                pins supported by a particular chip.

diff --git a/configs/cl-som-imx7_defconfig b/configs/cl-som-imx7_defconfig
index 3571dba6d2ae18ee2c40e572fe067367583bcf08..d1a044e3f7ba6f55e28905eaf81479430ea72f1e 100644 (file)
--- a/configs/cl-som-imx7_defconfig
+++ b/configs/cl-som-imx7_defconfig
@@ -74,6 +74,7 @@ CONFIG_ETHPRIME="FEC"
 CONFIG_SPL_DM=y
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_CMD_PCA953X=y
+CONFIG_PCA953X=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_MXC=y

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index e007b38fac716cb98dd247b27e9393c67ad2c0a7..1e4b50ef72b57819e4db7c5487402e8f910edee2 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -520,6 +520,10 @@ config SPL_DM_PCA953X
          Now, max 24 bits chips and PCA953X compatible chips are
          supported
 
+config PCA953X
+       bool "NXP's PCA953X series I2C GPIO (legacy driver)"
+       depends on !DM_PCA953X
+
 config MPC8XXX_GPIO
        bool "Freescale MPC8XXX GPIO driver"
        depends on DM_GPIO

diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index 4aaa52f26980427a4f7b73d22f021dbc4add0544..5c9004cbd93a450574f4aff9545a106b32a1f490 100644 (file)
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -21,7 +21,6 @@
 /* PMIC */
 #define CONFIG_POWER_PFUZE3000_I2C_ADDR        0x08
 
-#define CONFIG_PCA953X
 #define CFG_SYS_I2C_PCA953X_ADDR       0x20
 #define CFG_SYS_I2C_PCA953X_WIDTH      { {0x20, 16} }
 

diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h
index 19f1dba04706d0668156d8395f36670cb2ec9e54..d75b8bf0c18f7c5a97f8593e80dac1c4d29bee09 100644 (file)
--- a/include/configs/imx8qxp_mek.h
+++ b/include/configs/imx8qxp_mek.h
@@ -110,10 +110,6 @@
 /* LPDDR4 board total DDR is 3GB */
 #define PHYS_SDRAM_2_SIZE              0x40000000      /* 1 GB */
 
-#ifndef CONFIG_DM_PCA953X
-#define CONFIG_PCA953X
-#endif
-
 /* Misc configuration */
 
 #endif /* __IMX8QXP_MEK_H */

diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h
index f5f95a1bd1ce227ae91aa191cebc32fef64a099a..888da7ce365f2fead5ebf00bc6ddcb14a45cbefb 100644 (file)
--- a/include/configs/mx6sabreauto.h
+++ b/include/configs/mx6sabreauto.h
@@ -15,7 +15,6 @@
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS   0
 
-#define CONFIG_PCA953X
 #define CFG_SYS_I2C_PCA953X_WIDTH      { {0x30, 8}, {0x32, 8}, {0x34, 8} }
 
 #include "mx6sabre_common.h"