Align the Kconfig option with the rest of the subsystem, use CONFIG_UFS_<vendor> format for the Kconfig option.
Signed-off-by: Marek Vasut <[email protected]> --- Cc: Anshul Dalal <[email protected]> Cc: Bhupesh Sharma <[email protected]> Cc: Casey Connolly <[email protected]> Cc: Igor Belwon <[email protected]> Cc: Michal Simek <[email protected]> Cc: Neil Armstrong <[email protected]> Cc: Varadarajan Narayanan <[email protected]> Cc: Yoshihiro Shimoda <[email protected]> Cc: [email protected] Cc: [email protected] --- configs/am69_sk_a72_defconfig | 2 +- configs/j7200_evm_a72_defconfig | 2 +- configs/j721e_evm_a72_defconfig | 2 +- configs/j721s2_evm_a72_defconfig | 2 +- configs/j784s4_evm_a72_defconfig | 2 +- drivers/ufs/Kconfig | 14 +++++++------- drivers/ufs/Makefile | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/configs/am69_sk_a72_defconfig b/configs/am69_sk_a72_defconfig index bd8aaf7f201..d91cc71aacc 100644 --- a/configs/am69_sk_a72_defconfig +++ b/configs/am69_sk_a72_defconfig @@ -7,7 +7,7 @@ CONFIG_TARGET_J784S4_A72_EVM=y CONFIG_CMD_UFS=n CONFIG_UFS=n -CONFIG_CADENCE_UFS=n +CONFIG_UFS_CADENCE=n CONFIG_TI_J721E_UFS=n CONFIG_DEFAULT_DEVICE_TREE="ti/k3-am69-sk" diff --git a/configs/j7200_evm_a72_defconfig b/configs/j7200_evm_a72_defconfig index 826a2db0805..75d7d332d30 100644 --- a/configs/j7200_evm_a72_defconfig +++ b/configs/j7200_evm_a72_defconfig @@ -196,5 +196,5 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0451 CONFIG_USB_GADGET_PRODUCT_NUM=0x6164 CONFIG_SPL_DFU=y CONFIG_UFS=y -CONFIG_CADENCE_UFS=y +CONFIG_UFS_CADENCE=y CONFIG_TI_J721E_UFS=y diff --git a/configs/j721e_evm_a72_defconfig b/configs/j721e_evm_a72_defconfig index 42e1dd21d0b..01faa33c042 100644 --- a/configs/j721e_evm_a72_defconfig +++ b/configs/j721e_evm_a72_defconfig @@ -201,7 +201,7 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0451 CONFIG_USB_GADGET_PRODUCT_NUM=0x6163 CONFIG_SPL_DFU=y CONFIG_UFS=y -CONFIG_CADENCE_UFS=y +CONFIG_UFS_CADENCE=y CONFIG_TI_J721E_UFS=y CONFIG_EFI_SET_TIME=y CONFIG_TI_COMMON_CMD_OPTIONS=y diff --git a/configs/j721s2_evm_a72_defconfig b/configs/j721s2_evm_a72_defconfig index e373a9f05b7..a231c12d803 100644 --- a/configs/j721s2_evm_a72_defconfig +++ b/configs/j721s2_evm_a72_defconfig @@ -188,5 +188,5 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0451 CONFIG_USB_GADGET_PRODUCT_NUM=0x6168 CONFIG_SPL_DFU=y CONFIG_UFS=y -CONFIG_CADENCE_UFS=y +CONFIG_UFS_CADENCE=y CONFIG_TI_J721E_UFS=y diff --git a/configs/j784s4_evm_a72_defconfig b/configs/j784s4_evm_a72_defconfig index 67aa18a16da..dc6321cd615 100644 --- a/configs/j784s4_evm_a72_defconfig +++ b/configs/j784s4_evm_a72_defconfig @@ -171,7 +171,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_SPL_DFU=y CONFIG_CMD_UFS=y CONFIG_UFS=y -CONFIG_CADENCE_UFS=y +CONFIG_UFS_CADENCE=y CONFIG_TI_J721E_UFS=y #include <configs/k3_efi_capsule.config> diff --git a/drivers/ufs/Kconfig b/drivers/ufs/Kconfig index 445270e8da1..e77b144a470 100644 --- a/drivers/ufs/Kconfig +++ b/drivers/ufs/Kconfig @@ -8,13 +8,6 @@ config UFS This selects support for Universal Flash Subsystem (UFS). Say Y here if you want UFS Support. -config CADENCE_UFS - bool "Cadence platform driver for UFS" - depends on UFS - help - This selects the platform driver for the Cadence UFS host - controller present on present TI's J721e devices. - config QCOM_UFS bool "Qualcomm Host Controller driver for UFS" depends on UFS && ARCH_SNAPDRAGON @@ -45,6 +38,13 @@ config UFS_AMD_VERSAL2 UFS host on AMD needs some vendor specific configuration before accessing the hardware. +config UFS_CADENCE + bool "Cadence platform driver for UFS" + depends on UFS + help + This selects the platform driver for the Cadence UFS host + controller present on present TI's J721e devices. + config UFS_MEDIATEK tristate "MediaTek UFS Host Controller Driver" depends on UFS && ARCH_MEDIATEK diff --git a/drivers/ufs/Makefile b/drivers/ufs/Makefile index 6b2f2ccc9fc..656988ef9ad 100644 --- a/drivers/ufs/Makefile +++ b/drivers/ufs/Makefile @@ -4,11 +4,11 @@ # obj-$(CONFIG_UFS) += ufs-uclass.o -obj-$(CONFIG_CADENCE_UFS) += cdns-platform.o obj-$(CONFIG_QCOM_UFS) += ufs-qcom.o obj-$(CONFIG_ROCKCHIP_UFS) += ufs-rockchip.o obj-$(CONFIG_TI_J721E_UFS) += ti-j721e-ufs.o obj-$(CONFIG_UFS_AMD_VERSAL2) += ufs-amd-versal2.o ufshcd-dwc.o +obj-$(CONFIG_UFS_CADENCE) += cdns-platform.o obj-$(CONFIG_UFS_MEDIATEK) += ufs-mediatek.o obj-$(CONFIG_UFS_PCI) += ufs-pci.o obj-$(CONFIG_UFS_RENESAS) += ufs-renesas.o -- 2.51.0
