Kconfig: Drop CONFIG_CMD_PCA953X_INFO

It does not seem worth having an option to enable another sub-command in
this legacy driver. Drop this option so that the sub-command is always
available.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

diff --git a/README b/README
index d7efbdeedad506c4014d2a712cb424328dfea27f..d80fe8265c030d6352d17fb255383e6bfe28505d 100644 (file)
--- a/README
+++ b/README
@@ -812,7 +812,6 @@ The following options need to be configured:
                CONFIG_CMD_MII          * MII utility commands
                CONFIG_CMD_NET            bootp, tftpboot, rarpboot
                CONFIG_CMD_NFS            NFS support
-               CONFIG_CMD_PCA953X_INFO * PCA953x I2C gpio info command
                CONFIG_CMD_PCI          * pciinfo
                CONFIG_CMD_PCMCIA               * PCMCIA support
                CONFIG_CMD_PING         * send ICMP ECHO_REQUEST to network

diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c
index 238e02805cb6673d8eb681f281fb8bafb74a8947..d1c1ae141125e468a20ba30f5c31ecdcebcaf4be 100644 (file)
--- a/drivers/gpio/pca953x.c
+++ b/drivers/gpio/pca953x.c
@@ -143,7 +143,6 @@ int pca953x_get_val(uint8_t chip)
 }
 
 #ifdef CONFIG_CMD_PCA953X
-#ifdef CONFIG_CMD_PCA953X_INFO
 /*
  * Display pca953x information
  */
@@ -193,16 +192,13 @@ static int pca953x_info(uint8_t chip)
 
        return 0;
 }
-#endif /* CONFIG_CMD_PCA953X_INFO */
 
 cmd_tbl_t cmd_pca953x[] = {
        U_BOOT_CMD_MKENT(device, 3, 0, (void *)PCA953X_CMD_DEVICE, "", ""),
        U_BOOT_CMD_MKENT(output, 4, 0, (void *)PCA953X_CMD_OUTPUT, "", ""),
        U_BOOT_CMD_MKENT(input, 3, 0, (void *)PCA953X_CMD_INPUT, "", ""),
        U_BOOT_CMD_MKENT(invert, 4, 0, (void *)PCA953X_CMD_INVERT, "", ""),
-#ifdef CONFIG_CMD_PCA953X_INFO
        U_BOOT_CMD_MKENT(info, 2, 0, (void *)PCA953X_CMD_INFO, "", ""),
-#endif
 };
 
 int do_pca953x(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
@@ -231,13 +227,11 @@ int do_pca953x(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                ul_arg3 = simple_strtoul(argv[3], NULL, 16) & 0x1;
 
        switch ((long)c->cmd) {
-#ifdef CONFIG_CMD_PCA953X_INFO
        case PCA953X_CMD_INFO:
                ret = pca953x_info(chip);
                if (ret)
                        ret = CMD_RET_FAILURE;
                break;
-#endif
 
        case PCA953X_CMD_DEVICE:
                if (argc == 3)
@@ -287,10 +281,8 @@ U_BOOT_CMD(
        "pca953x gpio access",
        "device [dev]\n"
        "       - show or set current device address\n"
-#ifdef CONFIG_CMD_PCA953X_INFO
        "pca953x info\n"
        "       - display info for current chip\n"
-#endif
        "pca953x output pin 0|1\n"
        "       - set pin as output and drive low or high\n"
        "pca953x invert pin 0|1\n"

diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h
index 00d2b8fa8a51b333a0e284d3a5a8e5a2f2ce3f4e..62bb2dbf33f22099b175b41efebad44b67154b04 100644 (file)
--- a/include/configs/cl-som-am57x.h
+++ b/include/configs/cl-som-am57x.h
@@ -74,7 +74,6 @@
                                                CONFIG_SYS_SCSI_MAX_LUN)
 /* PCA9555 GPIO expander support */
 #define CONFIG_PCA953X
-#define CONFIG_CMD_PCA953X_INFO
 #define CONFIG_SYS_I2C_PCA953X_ADDR     0x20
 #define CONFIG_SYS_I2C_PCA953X_WIDTH    { {0x20, 16} }
 

diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h
index 960b37760884564d773884bd34262f99513c62d8..f01783b8fdfe3403d62082e845a19181f3cf6881 100644 (file)
--- a/include/configs/cm_t335.h
+++ b/include/configs/cm_t335.h
@@ -161,7 +161,6 @@
  * First select the I2C0 bus with "i2c dev 0", then use "pca953x" command.
  */
 #define CONFIG_PCA953X
-#define CONFIG_CMD_PCA953X_INFO
 #define CONFIG_SYS_I2C_PCA953X_ADDR    0x26
 #define CONFIG_SYS_I2C_PCA953X_WIDTH   { {0x26, 16} }
 #endif /* CONFIG_SPL_BUILD */

diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h
index 0214a1df5997176d1e6ceda7067740497099a9c0..d4fd722f9981a7b18bf8e30461c0229c23f7d443 100644 (file)
--- a/include/configs/ot1200.h
+++ b/include/configs/ot1200.h
@@ -31,7 +31,6 @@
 #define CONFIG_PCA953X
 #define CONFIG_SYS_I2C_PCA953X_ADDR    0x20
 #define CONFIG_SYS_I2C_PCA953X_WIDTH   { {0x20, 16} }
-#define CONFIG_CMD_PCA953X_INFO
 
 /* I2C Configs */
 #define CONFIG_SYS_I2C

diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h
index 8ff0fa34129b1b9c98f970cc4f4c05772707d0c3..e7828a50360c56a89c925715c61590a3e95292c8 100644 (file)
--- a/include/configs/snapper9260.h
+++ b/include/configs/snapper9260.h
@@ -136,7 +136,4 @@
 /* U-Boot memory settings */
 #define CONFIG_SYS_MALLOC_LEN          (1 << 20)
 
-/* Command line configuration */
-#define CONFIG_CMD_PCA953X_INFO
-
 #endif /* __CONFIG_H */

diff --git a/include/configs/strider.h b/include/configs/strider.h
index 507a41462b5367276010e3cff4f5f34815687f10..aa7f15389cf166830820d790945beb5408609232 100644 (file)
--- a/include/configs/strider.h
+++ b/include/configs/strider.h
@@ -301,7 +301,6 @@
 #define CONFIG_SYS_FSL_I2C_OFFSET      0x3000
 
 #define CONFIG_PCA953X                 /* NXP PCA9554 */
-#define CONFIG_CMD_PCA953X_INFO
 #define CONFIG_SYS_I2C_PCA953X_WIDTH    { {0x24, 16}, {0x25, 16}, {0x26, 16}, \
                                          {0x3c, 8}, {0x3d, 8}, {0x3e, 8} }
 

diff --git a/include/configs/xilinx_zynqmp_zcu102.h b/include/configs/xilinx_zynqmp_zcu102.h
index 52278f188580c875bca82926b22a53f4fcb476e4..85f78ba43b072fe195f69febdb449788b28f079b 100644 (file)
--- a/include/configs/xilinx_zynqmp_zcu102.h
+++ b/include/configs/xilinx_zynqmp_zcu102.h
@@ -38,7 +38,6 @@
 
 #define CONFIG_SYS_I2C_ZYNQ
 #define CONFIG_PCA953X
-#define CONFIG_CMD_PCA953X_INFO
 
 #define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB0_XHCI_BASEADDR}
 

diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h
index c8695f1c78c40da8d88e3efd526daaf4dfb4611f..453a672184d56df45bc81eb823cc73231fe257b0 100644 (file)
--- a/include/configs/xpedite517x.h
+++ b/include/configs/xpedite517x.h
@@ -483,7 +483,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 /*
  * Command configuration.
  */
-#define CONFIG_CMD_PCA953X_INFO
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_PCI_ENUM
 #define CONFIG_CMD_REGINFO

diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h
index 0f7906f37c4adc89125452d6c16de2609187170e..bc612eb6544195fb6f9e24abf1640398097fee58 100644 (file)
--- a/include/configs/xpedite520x.h
+++ b/include/configs/xpedite520x.h
@@ -286,7 +286,6 @@
 /*
  * Command configuration.
  */
-#define CONFIG_CMD_PCA953X_INFO
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_PCI_ENUM
 #define CONFIG_CMD_REGINFO

diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h
index 6984bfcd6ae2b5bc565f5ebd53f69cad89c02b5e..2c45a797b958fb5c614d80f4c8f8018cc31d7267 100644 (file)
--- a/include/configs/xpedite537x.h
+++ b/include/configs/xpedite537x.h
@@ -336,7 +336,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
 /*
  * Command configuration.
  */
-#define CONFIG_CMD_PCA953X_INFO
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_PCI_ENUM
 #define CONFIG_CMD_REGINFO

diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h
index 48a8048e68669cc6cc05b8797fa71004d6a14ab5..613738804e01b12e6b63ec9d3a976e02169dfe67 100644 (file)
--- a/include/configs/xpedite550x.h
+++ b/include/configs/xpedite550x.h
@@ -335,7 +335,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
 /*
  * Command configuration.
  */
-#define CONFIG_CMD_PCA953X_INFO
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_PCI_ENUM
 #define CONFIG_CMD_REGINFO

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index af2ed0b7921aaf5f0301c214f15b3eefa207a4d3..723a5a28bd59f8620e311530a5e9957fa0649042 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -293,7 +293,6 @@ CONFIG_CM922T_XA10
 CONFIG_CMDLINE_EDITING
 CONFIG_CMDLINE_PS_SUPPORT
 CONFIG_CMDLINE_TAG
-CONFIG_CMD_PCA953X_INFO
 CONFIG_CMD_PCI
 CONFIG_CMD_PCI_ENUM
 CONFIG_CMD_PCMCIA