Merge tag 'u-boot-ufs-20251202' of https://source.denx.de/u-boot/custodians/u-boot-ufs into next

- Second batch of UFS config renames for Cadence/Qcom/Rockchip/TI

8 files changed, 44 insertions, 44 deletions

diff --git a/configs/am69_sk_a72_defconfig b/configs/am69_sk_a72_defconfig
index bd8aaf7f201..746b36a34ed 100644
--- a/configs/am69_sk_a72_defconfig
+++ b/configs/am69_sk_a72_defconfig
@@ -7,8 +7,8 @@ CONFIG_TARGET_J784S4_A72_EVM=y
 
 CONFIG_CMD_UFS=n
 CONFIG_UFS=n
-CONFIG_CADENCE_UFS=n
-CONFIG_TI_J721E_UFS=n
+CONFIG_UFS_CADENCE=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 826a2db0805..86d598c0e73 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_TI_J721E_UFS=y
+CONFIG_UFS_CADENCE=y
+CONFIG_UFS_TI_J721E=y
diff --git a/configs/j721e_evm_a72_defconfig b/configs/j721e_evm_a72_defconfig
index 42e1dd21d0b..da9abf47de8 100644
--- a/configs/j721e_evm_a72_defconfig
+++ b/configs/j721e_evm_a72_defconfig
@@ -201,8 +201,8 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0451
 CONFIG_USB_GADGET_PRODUCT_NUM=0x6163
 CONFIG_SPL_DFU=y
 CONFIG_UFS=y
-CONFIG_CADENCE_UFS=y
-CONFIG_TI_J721E_UFS=y
+CONFIG_UFS_CADENCE=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 e373a9f05b7..16d01a4b5a9 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_TI_J721E_UFS=y
+CONFIG_UFS_CADENCE=y
+CONFIG_UFS_TI_J721E=y
diff --git a/configs/j784s4_evm_a72_defconfig b/configs/j784s4_evm_a72_defconfig
index fc7acbae694..a12620a5155 100644
--- a/configs/j784s4_evm_a72_defconfig
+++ b/configs/j784s4_evm_a72_defconfig
@@ -173,7 +173,7 @@ CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_SPL_DFU=y
 CONFIG_CMD_UFS=y
 CONFIG_UFS=y
-CONFIG_CADENCE_UFS=y
-CONFIG_TI_J721E_UFS=y
+CONFIG_UFS_CADENCE=y
+CONFIG_UFS_TI_J721E=y
 
 #include <configs/k3_efi_capsule.config>
diff --git a/configs/qcom_defconfig b/configs/qcom_defconfig
index a56e1282821..a210f4dc5e6 100644
--- a/configs/qcom_defconfig
+++ b/configs/qcom_defconfig
@@ -154,7 +154,7 @@ CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GENERIC=y
 CONFIG_USB_GADGET=y
 CONFIG_UFS=y
-CONFIG_QCOM_UFS=y
+CONFIG_UFS_QCOM=y
 CONFIG_VIDEO=y
 # CONFIG_VIDEO_FONT_8X16 is not set
 CONFIG_VIDEO_FONT_16X32=y
diff --git a/drivers/ufs/Kconfig b/drivers/ufs/Kconfig
index 445270e8da1..6c75bb2a079 100644
--- a/drivers/ufs/Kconfig
+++ b/drivers/ufs/Kconfig
@@ -8,35 +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
-        help
-	  This selects the platform driver for the UFS host
-	  controller present on Qualcomm Snapdragon SoCs.
-
-config ROCKCHIP_UFS
-	bool "Rockchip specific hooks to UFS controller platform driver"
-	depends on UFS
-	help
-	  This selects the Rockchip specific additions to UFSHCD platform driver.
-
-	  Select this if you have UFS controller on Rockchip chipset.
-	  If unsure, say N.
-
-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
@@ -45,6 +16,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
@@ -70,6 +48,13 @@ config UFS_PCI
 
 	  If unsure, say N.
 
+config UFS_QCOM
+	bool "Qualcomm Host Controller driver for UFS"
+	depends on UFS && ARCH_SNAPDRAGON
+        help
+	  This selects the platform driver for the UFS host
+	  controller present on Qualcomm Snapdragon SoCs.
+
 config UFS_RENESAS
 	bool "Renesas R-Car S4 UFS Controller support"
 	depends on UFS
@@ -88,4 +73,19 @@ config UFS_RENESAS_GEN5
 	  platform driver. UFS host on Renesas needs some vendor
 	  specific configuration before accessing the hardware.
 
+config UFS_ROCKCHIP
+	bool "Rockchip specific hooks to UFS controller platform driver"
+	depends on UFS
+	help
+	  This selects the Rockchip specific additions to UFSHCD platform driver.
+
+	  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 6b2f2ccc9fc..e7f3c1d30c4 100644
--- a/drivers/ufs/Makefile
+++ b/drivers/ufs/Makefile
@@ -4,12 +4,12 @@
 #
 
 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_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