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

Commit ce7a74d0 authored by Sridhar Arra's avatar Sridhar Arra
Browse files

mmc: sdhci-msm: Move IPCAT_MINOR_MASK to top 



Move IPCAT_MINOR_MASK to top where other registers are read.

Change-Id: Iff7667f01eb9e5f0f87820562723f0621aae7b61
Signed-off-by: default avatarSridhar Arra <sarra@codeaurora.org>
parent 1526c9c6

drivers/mmc/host/sdhci-msm.c

+5 −2
Original line number Diff line number Diff line
@@ -5275,6 +5275,7 @@ static int sdhci_msm_probe(struct platform_device *pdev) 
	void __iomem *tlmm_mem;

	unsigned long flags;

	bool force_probe;

	u32 minor;



	pr_debug("%s: Enter %s\n", dev_name(&pdev->dev), __func__);

	msm_host = devm_kzalloc(&pdev->dev, sizeof(struct sdhci_msm_host),
@@ -5574,6 +5575,9 @@ static int sdhci_msm_probe(struct platform_device *pdev) 
	if (host->quirks2 & SDHCI_QUIRK2_ALWAYS_USE_BASE_CLOCK)

		host->quirks2 |= SDHCI_QUIRK2_DIVIDE_TOUT_BY_4;



	minor = IPCAT_MINOR_MASK(readl_relaxed(host->ioaddr +

				SDCC_IP_CATALOG));



	host_version = readw_relaxed((host->ioaddr + SDHCI_HOST_VERSION));

	dev_dbg(&pdev->dev, "Host Version: 0x%x Vendor Version 0x%x\n",

		host_version, ((host_version & SDHCI_VENDOR_VER_MASK) >>
@@ -5776,8 +5780,7 @@ static int sdhci_msm_probe(struct platform_device *pdev) 
		device_remove_file(&pdev->dev, &msm_host->auto_cmd21_attr);

	}



	if (IPCAT_MINOR_MASK(readl_relaxed(host->ioaddr +

				SDCC_IP_CATALOG)) >= 2) {

	if (minor >= 2) {

		msm_host->mask_and_match.show = show_mask_and_match;

		msm_host->mask_and_match.store = store_mask_and_match;

		sysfs_attr_init(&msm_host->mask_and_match.attr);