From 247a65111a7f00bd2d3d9343f906b239665e38bc Mon Sep 17 00:00:00 2001 From: Sarthak Garg Date: Mon, 24 Aug 2020 17:33:52 +0530 Subject: [PATCH] Revert "mmc: sdhci-msm: skip eMMC slot probe if eMMC isn't a bootdevice" A proxy vote is kept for all the resources binded in the device tree and those resources would be enabled till the actual driver comes in and binds to it. For example every device that needs a clock or have binding for clock in the device tree all those clocks would be left enabled because of the proxy vote. That proxy vote would be removed in the late init when the sync-state is successful. For the sync-state to be successful every driver which have bindings toward that resource must complete the bind with that resource or probe successfully. So here for the gcc sync-state to be successful and proxy vote to be removed every gcc consumer (in this case eMMC) must not bail out and complete its probe. This reverts commit 5827a3e53d9417c5efe1c8ed179da8d3174def44. Change-Id: Ic6017ca80a051f6210c9bb1b7f4d27ca842a6f45 Signed-off-by: Sarthak Garg --- drivers/mmc/host/sdhci-msm.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index c972e64e90d9..731785389e16 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -436,18 +436,6 @@ struct sdhci_msm_host { u32 pm_qos_delay; }; -#define ANDROID_BOOT_DEV_MAX 30 -static char android_boot_dev[ANDROID_BOOT_DEV_MAX]; - -#ifndef MODULE -static int __init get_android_boot_dev(char *str) -{ - strlcpy(android_boot_dev, str, ANDROID_BOOT_DEV_MAX); - return 1; -} -__setup("androidboot.bootdevice=", get_android_boot_dev); -#endif - static struct sdhci_msm_host *sdhci_slot[2]; static int sdhci_msm_update_qos_constraints(struct qos_cpu_group *qcg, @@ -3582,13 +3570,6 @@ static int sdhci_msm_probe(struct platform_device *pdev) dev_err(&pdev->dev, "get slot index failed %d\n", ret); else if (ret <= 2) sdhci_slot[ret-1] = msm_host; - - if (of_property_read_bool(dev->of_node, "non-removable") && - strlen(android_boot_dev) && - strcmp(android_boot_dev, dev_name(dev))) { - ret = -ENODEV; - goto pltfm_free; - } } /*