diff options
| author | Tom Rini <[email protected]> | 2025-11-19 09:04:32 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-11-19 09:04:32 -0600 |
| commit | 2bc0715b558fa1ac5c88b11e250740b16a905837 (patch) | |
| tree | 5f534fe2e2d15ced948a6671ccef07a4f047841b /drivers | |
| parent | 05ea0a387ff08792071f822eb9b4602ef471fe9e (diff) | |
| parent | d4f80bddc58115744d681a332144e9a9371d1f59 (diff) | |
Merge tag 'u-boot-ufs-20251119' of https://source.denx.de/u-boot/custodians/u-boot-ufs
- Sort again the UFS Kconfig & Makefile
- Use unique name for the rcar-gen5 ufs driver
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ufs/Kconfig | 28 | ||||
| -rw-r--r-- | drivers/ufs/Makefile | 4 | ||||
| -rw-r--r-- | drivers/ufs/ufs-renesas-rcar-gen5.c | 2 |
3 files changed, 17 insertions, 17 deletions
diff --git a/drivers/ufs/Kconfig b/drivers/ufs/Kconfig index 68693b7d226..445270e8da1 100644 --- a/drivers/ufs/Kconfig +++ b/drivers/ufs/Kconfig @@ -15,20 +15,6 @@ config CADENCE_UFS 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 - select PHY_MTK_UFS - help - This selects the MediaTek specific additions to UFSHCD platform driver. - UFS host on Mediatek needs some vendor specific configuration before - accessing the hardware which includes PHY configuration and vendor - specific registers. - - Select this if you have UFS controller on MediaTek chipset. - - If unsure, say N. - config QCOM_UFS bool "Qualcomm Host Controller driver for UFS" depends on UFS && ARCH_SNAPDRAGON @@ -59,6 +45,20 @@ config UFS_AMD_VERSAL2 UFS host on AMD needs some vendor specific configuration before accessing the hardware. +config UFS_MEDIATEK + tristate "MediaTek UFS Host Controller Driver" + depends on UFS && ARCH_MEDIATEK + select PHY_MTK_UFS + help + This selects the MediaTek specific additions to UFSHCD platform driver. + UFS host on Mediatek needs some vendor specific configuration before + accessing the hardware which includes PHY configuration and vendor + specific registers. + + Select this if you have UFS controller on MediaTek chipset. + + If unsure, say N. + config UFS_PCI bool "PCI bus based UFS Controller support" depends on PCI && UFS diff --git a/drivers/ufs/Makefile b/drivers/ufs/Makefile index 15329b9795a..6b2f2ccc9fc 100644 --- a/drivers/ufs/Makefile +++ b/drivers/ufs/Makefile @@ -5,11 +5,11 @@ obj-$(CONFIG_UFS) += ufs-uclass.o obj-$(CONFIG_CADENCE_UFS) += cdns-platform.o -obj-$(CONFIG_UFS_MEDIATEK) += ufs-mediatek.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_MEDIATEK) += ufs-mediatek.o obj-$(CONFIG_UFS_PCI) += ufs-pci.o obj-$(CONFIG_UFS_RENESAS) += ufs-renesas.o obj-$(CONFIG_UFS_RENESAS_GEN5) += ufs-renesas-rcar-gen5.o -obj-$(CONFIG_ROCKCHIP_UFS) += ufs-rockchip.o diff --git a/drivers/ufs/ufs-renesas-rcar-gen5.c b/drivers/ufs/ufs-renesas-rcar-gen5.c index 3c66022579f..cc53e91449c 100644 --- a/drivers/ufs/ufs-renesas-rcar-gen5.c +++ b/drivers/ufs/ufs-renesas-rcar-gen5.c @@ -258,7 +258,7 @@ static const struct udevice_id ufs_renesas_pltfm_ids[] = { { /* sentinel */ } }; -U_BOOT_DRIVER(ufs_renesas) = { +U_BOOT_DRIVER(ufs_renesas_gen5) = { .name = "ufs-renesas-gen5", .id = UCLASS_UFS, .of_match = ufs_renesas_pltfm_ids, |