This converts the following to Kconfig: CONFIG_CMD_PCA953X
Signed-off-by: Simon Glass sjg@chromium.org ---
README | 1 - arch/powerpc/cpu/mpc83xx/Kconfig | 1 + configs/cl-som-am57x_defconfig | 1 + configs/cm_t335_defconfig | 1 + configs/ot1200_defconfig | 3 ++- configs/ot1200_spl_defconfig | 3 ++- configs/snapper9260_defconfig | 1 + configs/snapper9g20_defconfig | 1 + configs/xilinx_zynqmp_zcu102_defconfig | 1 + configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 + configs/xpedite517x_defconfig | 1 + configs/xpedite520x_defconfig | 1 + configs/xpedite537x_defconfig | 1 + configs/xpedite550x_defconfig | 1 + drivers/gpio/Kconfig | 9 +++++++++ include/configs/cl-som-am57x.h | 1 - include/configs/cm_t335.h | 1 - include/configs/ot1200.h | 1 - include/configs/snapper9260.h | 1 - include/configs/strider.h | 1 - include/configs/xilinx_zynqmp_zcu102.h | 1 - include/configs/xpedite517x.h | 1 - include/configs/xpedite520x.h | 1 - include/configs/xpedite537x.h | 1 - include/configs/xpedite550x.h | 1 - scripts/config_whitelist.txt | 1 - 26 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/README b/README index 4b670ba326..5c1ff03625 100644 --- a/README +++ b/README @@ -813,7 +813,6 @@ The following options need to be configured: CONFIG_CMD_NAND * NAND support CONFIG_CMD_NET bootp, tftpboot, rarpboot CONFIG_CMD_NFS NFS support - CONFIG_CMD_PCA953X * PCA953x I2C gpio commands CONFIG_CMD_PCA953X_INFO * PCA953x I2C gpio info command CONFIG_CMD_PCI * pciinfo CONFIG_CMD_PCMCIA * PCMCIA support diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig index 4b01c8254c..43ad366007 100644 --- a/arch/powerpc/cpu/mpc83xx/Kconfig +++ b/arch/powerpc/cpu/mpc83xx/Kconfig @@ -91,6 +91,7 @@ config TARGET_HRCON config TARGET_STRIDER bool "Support strider" select SYS_FSL_ERRATUM_ESDHC111 + imply CMD_PCA953X
endchoice
diff --git a/configs/cl-som-am57x_defconfig b/configs/cl-som-am57x_defconfig index bf753bc074..2f1863f1ee 100644 --- a/configs/cl-som-am57x_defconfig +++ b/configs/cl-som-am57x_defconfig @@ -33,6 +33,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ISO_PARTITION=y +CONFIG_CMD_PCA953X=y CONFIG_LED_STATUS=y CONFIG_LED_STATUS_GPIO=y CONFIG_LED_STATUS0=y diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig index f6e8689945..4fff445b5a 100644 --- a/configs/cm_t335_defconfig +++ b/configs/cm_t335_defconfig @@ -43,6 +43,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_MTDPARTS=y CONFIG_ISO_PARTITION=y CONFIG_EFI_PARTITION=y +CONFIG_CMD_PCA953X=y CONFIG_LED_STATUS=y CONFIG_LED_STATUS_GPIO=y CONFIG_LED_STATUS0=y diff --git a/configs/ot1200_defconfig b/configs/ot1200_defconfig index 7f1d7a8716..ae2fdbd8e7 100644 --- a/configs/ot1200_defconfig +++ b/configs/ot1200_defconfig @@ -23,12 +23,13 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y +CONFIG_DM=y +CONFIG_CMD_PCA953X=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_SST=y CONFIG_SPI_FLASH_WINBOND=y -CONFIG_DM=y CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/ot1200_spl_defconfig b/configs/ot1200_spl_defconfig index 6c33853987..95e652b453 100644 --- a/configs/ot1200_spl_defconfig +++ b/configs/ot1200_spl_defconfig @@ -31,12 +31,13 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y +CONFIG_DM=y +CONFIG_CMD_PCA953X=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_SST=y CONFIG_SPI_FLASH_WINBOND=y -CONFIG_DM=y CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/snapper9260_defconfig b/configs/snapper9260_defconfig index 2fbd7d2a8d..a36ac71f99 100644 --- a/configs/snapper9260_defconfig +++ b/configs/snapper9260_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_FAT=y +CONFIG_CMD_PCA953X=y # CONFIG_MMC is not set CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/snapper9g20_defconfig b/configs/snapper9g20_defconfig index 12cafd9815..fc1d9b18cc 100644 --- a/configs/snapper9g20_defconfig +++ b/configs/snapper9g20_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_FAT=y +CONFIG_CMD_PCA953X=y # CONFIG_MMC is not set CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/xilinx_zynqmp_zcu102_defconfig b/configs/xilinx_zynqmp_zcu102_defconfig index 4f1524b149..1d5150c7e4 100644 --- a/configs/xilinx_zynqmp_zcu102_defconfig +++ b/configs/xilinx_zynqmp_zcu102_defconfig @@ -46,6 +46,7 @@ CONFIG_DFU_RAM=y CONFIG_FPGA_XILINX=y CONFIG_FPGA_ZYNQMPPL=y CONFIG_DM_GPIO=y +CONFIG_CMD_PCA953X=y CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig index 4b944cb6e1..4136d76d29 100644 --- a/configs/xilinx_zynqmp_zcu102_revB_defconfig +++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig @@ -46,6 +46,7 @@ CONFIG_DFU_RAM=y CONFIG_FPGA_XILINX=y CONFIG_FPGA_ZYNQMPPL=y CONFIG_DM_GPIO=y +CONFIG_CMD_PCA953X=y CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y diff --git a/configs/xpedite517x_defconfig b/configs/xpedite517x_defconfig index 2788db0830..bdfa81f2c1 100644 --- a/configs/xpedite517x_defconfig +++ b/configs/xpedite517x_defconfig @@ -18,6 +18,7 @@ CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_CMD_JFFS2=y CONFIG_CMD_IRQ=y +CONFIG_CMD_PCA953X=y CONFIG_DS4510=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y diff --git a/configs/xpedite520x_defconfig b/configs/xpedite520x_defconfig index 904f7b9bc5..3bd5fd1ade 100644 --- a/configs/xpedite520x_defconfig +++ b/configs/xpedite520x_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_DATE=y # CONFIG_CMD_HASH is not set CONFIG_CMD_JFFS2=y # CONFIG_CMD_IRQ is not set +CONFIG_CMD_PCA953X=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_SYS_NS16550=y diff --git a/configs/xpedite537x_defconfig b/configs/xpedite537x_defconfig index 45fe128a55..90a00d9e17 100644 --- a/configs/xpedite537x_defconfig +++ b/configs/xpedite537x_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_DATE=y CONFIG_CMD_JFFS2=y # CONFIG_CMD_IRQ is not set CONFIG_SYS_FSL_DDR2=y +CONFIG_CMD_PCA953X=y CONFIG_DS4510=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y diff --git a/configs/xpedite550x_defconfig b/configs/xpedite550x_defconfig index cad0d239e9..5a41103bb8 100644 --- a/configs/xpedite550x_defconfig +++ b/configs/xpedite550x_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_DATE=y # CONFIG_CMD_HASH is not set CONFIG_CMD_JFFS2=y # CONFIG_CMD_IRQ is not set +CONFIG_CMD_PCA953X=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_SYS_NS16550=y diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 15135e538d..2fffd4dc3d 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -103,6 +103,15 @@ config OMAP_GPIO Support GPIO controllers on the TI OMAP3/4/5 and related (such as AM335x/AM43xx/AM57xx/DRA7xx/etc) families of SoCs.
+config CMD_PCA953X + bool "Enable the pca953x command" + help + Deprecated: This should be converted to driver model. + + This command provides access to a pca953x GPIO device using the + legacy GPIO interface. Several subcommands are provided which mirror + the standard 'gpio' command. It should use that instead. + config PM8916_GPIO bool "Qualcomm PM8916 PMIC GPIO/keypad driver" depends on DM_GPIO && PMIC_PM8916 diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h index a04f4cd23d..ff9dde85a4 100644 --- a/include/configs/cl-som-am57x.h +++ b/include/configs/cl-som-am57x.h @@ -75,7 +75,6 @@ CONFIG_SYS_SCSI_MAX_LUN) /* PCA9555 GPIO expander support */ #define CONFIG_PCA953X -#define CONFIG_CMD_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 3fb9daebbc..fe7ced313a 100644 --- a/include/configs/cm_t335.h +++ b/include/configs/cm_t335.h @@ -165,7 +165,6 @@ * First select the I2C0 bus with "i2c dev 0", then use "pca953x" command. */ #define CONFIG_PCA953X -#define CONFIG_CMD_PCA953X #define CONFIG_CMD_PCA953X_INFO #define CONFIG_SYS_I2C_PCA953X_ADDR 0x26 #define CONFIG_SYS_I2C_PCA953X_WIDTH { {0x26, 16} } diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index be6bbad32e..91532016ac 100644 --- 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 #define CONFIG_CMD_PCA953X_INFO
/* I2C Configs */ diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h index d3e73f2097..3f860b47e3 100644 --- a/include/configs/snapper9260.h +++ b/include/configs/snapper9260.h @@ -139,7 +139,6 @@
/* Command line configuration */ #define CONFIG_CMD_NAND -#define CONFIG_CMD_PCA953X #define CONFIG_CMD_PCA953X_INFO
#endif /* __CONFIG_H */ diff --git a/include/configs/strider.h b/include/configs/strider.h index 994ac73e13..f65215f46b 100644 --- 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 #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 4194b66c66..52278f1885 100644 --- 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 #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 07f26544fd..34abc3673a 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -485,7 +485,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); * Command configuration. */ #define CONFIG_CMD_NAND -#define CONFIG_CMD_PCA953X #define CONFIG_CMD_PCA953X_INFO #define CONFIG_CMD_PCI #define CONFIG_CMD_PCI_ENUM diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h index 2645006b37..9007b29d43 100644 --- a/include/configs/xpedite520x.h +++ b/include/configs/xpedite520x.h @@ -288,7 +288,6 @@ * Command configuration. */ #define CONFIG_CMD_NAND -#define CONFIG_CMD_PCA953X #define CONFIG_CMD_PCA953X_INFO #define CONFIG_CMD_PCI #define CONFIG_CMD_PCI_ENUM diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index abbaeaad10..250d641eb8 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -338,7 +338,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); * Command configuration. */ #define CONFIG_CMD_NAND -#define CONFIG_CMD_PCA953X #define CONFIG_CMD_PCA953X_INFO #define CONFIG_CMD_PCI #define CONFIG_CMD_PCI_ENUM diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index 254fc12cf6..dda1c5a50f 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -337,7 +337,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); * Command configuration. */ #define CONFIG_CMD_NAND -#define CONFIG_CMD_PCA953X #define CONFIG_CMD_PCA953X_INFO #define CONFIG_CMD_PCI #define CONFIG_CMD_PCI_ENUM diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index c58cdee5cd..cadfb9692c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -296,7 +296,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_PCA953X CONFIG_CMD_PCA953X_INFO CONFIG_CMD_PCI CONFIG_CMD_PCI_ENUM