diff options
| author | Simon Glass <sjg@chromium.org> | 2017-08-04 22:34:32 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-11 19:41:50 (GMT) |
| commit | 0091362ce50917ac028e515b9fa19d1257a3080c (patch) | |
| tree | fcfa85f693fecb68c2236e45f9098579dc7eb3b9 | |
| parent | 978f0854da2abaeebe047c24c12c1033de75060a (diff) | |
| download | u-boot-fsl-qoriq-0091362ce50917ac028e515b9fa19d1257a3080c.tar.xz | |
Convert CONFIG_CMD_PCA953X to Kconfig
This converts the following to Kconfig:
CONFIG_CMD_PCA953X
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>
26 files changed, 22 insertions, 12 deletions
@@ -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 * 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 b5b26f9..c66d661 100644 --- a/arch/powerpc/cpu/mpc83xx/Kconfig +++ b/arch/powerpc/cpu/mpc83xx/Kconfig @@ -96,6 +96,7 @@ config TARGET_STRIDER bool "Support strider" select SYS_FSL_ERRATUM_ESDHC111 imply ENV_IS_IN_FLASH + imply CMD_PCA953X endchoice diff --git a/configs/cl-som-am57x_defconfig b/configs/cl-som-am57x_defconfig index 415bc38..4371fd7 100644 --- a/configs/cl-som-am57x_defconfig +++ b/configs/cl-som-am57x_defconfig @@ -34,6 +34,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 a88b2d8..1be7b36 100644 --- a/configs/cm_t335_defconfig +++ b/configs/cm_t335_defconfig @@ -45,6 +45,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 8d40e52..86e9fe5 100644 --- a/configs/ot1200_defconfig +++ b/configs/ot1200_defconfig @@ -25,6 +25,7 @@ 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 diff --git a/configs/ot1200_spl_defconfig b/configs/ot1200_spl_defconfig index 34331ca..712dcde 100644 --- a/configs/ot1200_spl_defconfig +++ b/configs/ot1200_spl_defconfig @@ -33,6 +33,7 @@ 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 diff --git a/configs/snapper9260_defconfig b/configs/snapper9260_defconfig index 0c78b47..2e86f95 100644 --- a/configs/snapper9260_defconfig +++ b/configs/snapper9260_defconfig @@ -24,6 +24,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 f524a66..e2b5841 100644 --- a/configs/snapper9g20_defconfig +++ b/configs/snapper9g20_defconfig @@ -23,6 +23,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_revA_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig index e17a3a1..c52b583 100644 --- a/configs/xilinx_zynqmp_zcu102_revA_defconfig +++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig @@ -45,6 +45,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 6de052b..7ed0116 100644 --- a/configs/xilinx_zynqmp_zcu102_revB_defconfig +++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig @@ -45,6 +45,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 7b1f2b5..f7f8fd9 100644 --- a/configs/xpedite517x_defconfig +++ b/configs/xpedite517x_defconfig @@ -19,6 +19,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 003a8e9..339f3f1 100644 --- a/configs/xpedite520x_defconfig +++ b/configs/xpedite520x_defconfig @@ -21,6 +21,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_PHYLIB=y diff --git a/configs/xpedite537x_defconfig b/configs/xpedite537x_defconfig index 9d17e00..18809e3 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 af56226..98e7124 100644 --- a/configs/xpedite550x_defconfig +++ b/configs/xpedite550x_defconfig @@ -21,6 +21,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_PHYLIB=y diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 63951e0..d2e7c29 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -109,6 +109,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 4010354..00d2b8f 100644 --- 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 #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 6bcc63a..960b377 100644 --- 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 #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 8ca6f62..0214a1d 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 5ec8c1b..8ff0fa3 100644 --- a/include/configs/snapper9260.h +++ b/include/configs/snapper9260.h @@ -137,7 +137,6 @@ #define CONFIG_SYS_MALLOC_LEN (1 << 20) /* Command line configuration */ -#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 a702ec7..507a414 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 4194b66..52278f1 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 478ca50..c8695f1 100644 --- 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 #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 f54971e..0f7906f 100644 --- a/include/configs/xpedite520x.h +++ b/include/configs/xpedite520x.h @@ -286,7 +286,6 @@ /* * Command configuration. */ -#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 c32b63d..6984bfc 100644 --- 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 #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 7b0a0c6..48a8048 100644 --- 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 #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 b2c0fef..af2ed0b 100644 --- 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 CONFIG_CMD_PCA953X_INFO CONFIG_CMD_PCI CONFIG_CMD_PCI_ENUM |