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 | 12 ++++++------ drivers/ufs/Makefile | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/configs/am69_sk_a72_defconfig b/configs/am69_sk_a72_defconfig index d91cc71aacc..746b36a34ed 100644 --- a/configs/am69_sk_a72_defconfig +++ b/configs/am69_sk_a72_defconfig @@ -8,7 +8,7 @@ CONFIG_TARGET_J784S4_A72_EVM=y CONFIG_CMD_UFS=n CONFIG_UFS=n CONFIG_UFS_CADENCE=n -CONFIG_TI_J721E_UFS=n +CONFIG_UFS_TI_J721E=n CONFIG_DEFAULT_DEVICE_TREE="ti/k3-am69-sk" CONFIG_OF_LIST="ti/k3-am69-sk" diff --git a/configs/j7200_evm_a72_defconfig b/configs/j7200_evm_a72_defconfig index 75d7d332d30..86d598c0e73 100644 --- a/configs/j7200_evm_a72_defconfig +++ b/configs/j7200_evm_a72_defconfig @@ -197,4 +197,4 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x6164 CONFIG_SPL_DFU=y CONFIG_UFS=y CONFIG_UFS_CADENCE=y -CONFIG_TI_J721E_UFS=y +CONFIG_UFS_TI_J721E=y diff --git a/configs/j721e_evm_a72_defconfig b/configs/j721e_evm_a72_defconfig index 01faa33c042..da9abf47de8 100644 --- a/configs/j721e_evm_a72_defconfig +++ b/configs/j721e_evm_a72_defconfig @@ -202,7 +202,7 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x6163 CONFIG_SPL_DFU=y CONFIG_UFS=y CONFIG_UFS_CADENCE=y -CONFIG_TI_J721E_UFS=y +CONFIG_UFS_TI_J721E=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 a231c12d803..16d01a4b5a9 100644 --- a/configs/j721s2_evm_a72_defconfig +++ b/configs/j721s2_evm_a72_defconfig @@ -189,4 +189,4 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x6168 CONFIG_SPL_DFU=y CONFIG_UFS=y CONFIG_UFS_CADENCE=y -CONFIG_TI_J721E_UFS=y +CONFIG_UFS_TI_J721E=y diff --git a/configs/j784s4_evm_a72_defconfig b/configs/j784s4_evm_a72_defconfig index dc6321cd615..5cfbbf8514c 100644 --- a/configs/j784s4_evm_a72_defconfig +++ b/configs/j784s4_evm_a72_defconfig @@ -172,6 +172,6 @@ CONFIG_SPL_DFU=y CONFIG_CMD_UFS=y CONFIG_UFS=y CONFIG_UFS_CADENCE=y -CONFIG_TI_J721E_UFS=y +CONFIG_UFS_TI_J721E=y #include <configs/k3_efi_capsule.config> diff --git a/drivers/ufs/Kconfig b/drivers/ufs/Kconfig index e9e570cddc7..6c75bb2a079 100644 --- a/drivers/ufs/Kconfig +++ b/drivers/ufs/Kconfig @@ -8,12 +8,6 @@ config UFS This selects support for Universal Flash Subsystem (UFS). Say Y here if you want UFS Support. -config TI_J721E_UFS - bool "Glue Layer driver for UFS on TI J721E devices" - help - This selects the glue layer driver for Cadence controller - present on TI's J721E devices. - config UFS_AMD_VERSAL2 bool "AMD Versal Gen 2 UFS controller platform driver" depends on UFS && ZYNQMP_FIRMWARE @@ -88,4 +82,10 @@ config UFS_ROCKCHIP Select this if you have UFS controller on Rockchip chipset. If unsure, say N. +config UFS_TI_J721E + bool "Glue Layer driver for UFS on TI J721E devices" + help + This selects the glue layer driver for Cadence controller + present on TI's J721E devices. + endmenu diff --git a/drivers/ufs/Makefile b/drivers/ufs/Makefile index 0358075435f..e7f3c1d30c4 100644 --- a/drivers/ufs/Makefile +++ b/drivers/ufs/Makefile @@ -4,7 +4,6 @@ # obj-$(CONFIG_UFS) += ufs-uclass.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 @@ -13,3 +12,4 @@ obj-$(CONFIG_UFS_QCOM) += ufs-qcom.o obj-$(CONFIG_UFS_RENESAS) += ufs-renesas.o obj-$(CONFIG_UFS_RENESAS_GEN5) += ufs-renesas-rcar-gen5.o obj-$(CONFIG_UFS_ROCKCHIP) += ufs-rockchip.o +obj-$(CONFIG_UFS_TI_J721E) += ti-j721e-ufs.o -- 2.51.0
