From f8d245f3698aae3fdbd9ef6b8328f36747955e5d Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Thu, 30 Oct 2025 23:35:42 +0100 Subject: ufs: cadence: Rename CONFIG_CADENCE_UFS to CONFIG_UFS_CADENCE Align the Kconfig option with the rest of the subsystem, use CONFIG_UFS_ format for the Kconfig option. Signed-off-by: Marek Vasut Link: https://patch.msgid.link/20251030223626.20005-1-marek.vasut+renesas@mailbox.org Signed-off-by: Neil Armstrong --- 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 fc7acbae694..6314c8d8a43 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_UFS_CADENCE=y CONFIG_TI_J721E_UFS=y #include 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 -- cgit v1.2.3 From 9ce92c31d3da03c052dfae49b4ad917fe315df21 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Thu, 30 Oct 2025 23:35:43 +0100 Subject: ufs: qcom: Rename CONFIG_QCOM_UFS to CONFIG_UFS_QCOM Align the Kconfig option with the rest of the subsystem, use CONFIG_UFS_ format for the Kconfig option. Signed-off-by: Marek Vasut Link: https://patch.msgid.link/20251030223626.20005-2-marek.vasut+renesas@mailbox.org Signed-off-by: Neil Armstrong --- configs/qcom_defconfig | 2 +- drivers/ufs/Kconfig | 14 +++++++------- drivers/ufs/Makefile | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) 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 e77b144a470..288d3de824c 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 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 @@ -70,6 +63,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 diff --git a/drivers/ufs/Makefile b/drivers/ufs/Makefile index 656988ef9ad..18ed250d059 100644 --- a/drivers/ufs/Makefile +++ b/drivers/ufs/Makefile @@ -4,12 +4,12 @@ # obj-$(CONFIG_UFS) += ufs-uclass.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 -- cgit v1.2.3 From ddeb78b022417158a290499ec5957dd5f906b081 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Thu, 30 Oct 2025 23:35:44 +0100 Subject: ufs: rockchip: Rename CONFIG_ROCKCHIP_UFS to CONFIG_UFS_ROCKCHIP Align the Kconfig option with the rest of the subsystem, use CONFIG_UFS_ format for the Kconfig option. Signed-off-by: Marek Vasut Link: https://patch.msgid.link/20251030223626.20005-3-marek.vasut+renesas@mailbox.org Signed-off-by: Neil Armstrong --- drivers/ufs/Kconfig | 18 +++++++++--------- drivers/ufs/Makefile | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/ufs/Kconfig b/drivers/ufs/Kconfig index 288d3de824c..e9e570cddc7 100644 --- a/drivers/ufs/Kconfig +++ b/drivers/ufs/Kconfig @@ -8,15 +8,6 @@ config UFS This selects support for Universal Flash Subsystem (UFS). Say Y here if you want UFS Support. -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 @@ -88,4 +79,13 @@ 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. + endmenu diff --git a/drivers/ufs/Makefile b/drivers/ufs/Makefile index 18ed250d059..0358075435f 100644 --- a/drivers/ufs/Makefile +++ b/drivers/ufs/Makefile @@ -4,7 +4,6 @@ # obj-$(CONFIG_UFS) += ufs-uclass.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 @@ -13,3 +12,4 @@ 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 -- cgit v1.2.3 From b71967457883eddc022dc376251ad3c5c5d9c163 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Thu, 30 Oct 2025 23:35:45 +0100 Subject: ufs: ti: Rename CONFIG_TI_J721E_UFS to CONFIG_UFS_TI_J721E Align the Kconfig option with the rest of the subsystem, use CONFIG_UFS_ format for the Kconfig option. Signed-off-by: Marek Vasut Link: https://patch.msgid.link/20251030223626.20005-4-marek.vasut+renesas@mailbox.org Signed-off-by: Neil Armstrong --- 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 6314c8d8a43..a12620a5155 100644 --- a/configs/j784s4_evm_a72_defconfig +++ b/configs/j784s4_evm_a72_defconfig @@ -174,6 +174,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 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 -- cgit v1.2.3