Merge 55e0500eb5 ("Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi") into android-mainline

Steps on the way to 5.10-rc1

Fixes merge issues in:
	drivers/scsi/ufs/ufs-qcom.c
	drivers/scsi/ufs/ufshcd.c
	drivers/scsi/ufs/ufshcd.h

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I69dcb6886b123c75dddf0781fe7bc04db7004032
This commit is contained in:
Greg Kroah-Hartman
2020-10-25 16:58:34 +01:00
147 changed files with 4127 additions and 2200 deletions

View File

@@ -9,7 +9,9 @@ contain a phandle reference to UFS M-PHY node.
Required properties for UFS nodes:
- compatible : Compatible list, contains the following controller:
"mediatek,mt8183-ufshci" for MediaTek UFS host controller
present on MT81xx chipsets.
present on MT8183 chipsets.
"mediatek,mt8192-ufshci" for MediaTek UFS host controller
present on MT8192 chipsets.
- reg : Address and length of the UFS register set.
- phys : phandle to m-phy.
- clocks : List of phandle and clock specifier pairs.