Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0d157be authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "scsi: ufs-qcom: Force probe of ufs based on boolean property"

parents 7e718fc8 1abe1e07

Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ Optional properties: 
			  Defaults to 26 MHz if not specified.

- extcon:       phandle to external connector (Refer Documentation/devicetree/bindings/extcon/extcon-gpio.txt for more details).

- non-removable		: defines if the connected ufs device is not removable

- force-ufshc-probe	: For force probing UFS device (non removable) even if it is not the boot device.





Note: If above properties are not defined it can be assumed that the supply

drivers/scsi/ufs/ufs-qcom.c

+1 −1
Original line number Diff line number Diff line
@@ -2749,7 +2749,7 @@ static int ufs_qcom_probe(struct platform_device *pdev) 
	 * the regulators.

	 */

	if (of_property_read_bool(np, "non-removable") &&

	    strlen(android_boot_dev) &&

	    !of_property_read_bool(np, "force-ufshc-probe") &&

	    strcmp(android_boot_dev, dev_name(dev)))

		return -ENODEV;