From 9e33a5d6ae5839f6799d2b2b5dd6035f413301b9 Mon Sep 17 00:00:00 2001 From: Can Guo Date: Tue, 20 Aug 2019 00:52:05 -0700 Subject: [PATCH] phy: qcom-ufs: don't probe for "dev_ref_clk_ctrl_mem" This is handled in the ufs platform init. Drop the upstream change that was missed in the ufs driver port to 4.4 kernel. Change-Id: Ia3305f2b4f6c6eeafe3866833f2c98e186ad6632 Signed-off-by: Venkat Gopalakrishnan [cang@codeaurora.org: resolved trivial merge conflicts] Signed-off-by: Can Guo --- drivers/phy/qualcomm/phy-qcom-ufs.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/phy/qualcomm/phy-qcom-ufs.c b/drivers/phy/qualcomm/phy-qcom-ufs.c index af18fa467555..29806f20f6f1 100644 --- a/drivers/phy/qualcomm/phy-qcom-ufs.c +++ b/drivers/phy/qualcomm/phy-qcom-ufs.c @@ -89,13 +89,6 @@ int ufs_qcom_phy_base_init(struct platform_device *pdev, return err; } - /* "dev_ref_clk_ctrl_mem" is optional resource */ - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, - "dev_ref_clk_ctrl_mem"); - phy_common->dev_ref_clk_ctrl_mmio = devm_ioremap_resource(dev, res); - if (IS_ERR((void const *)phy_common->dev_ref_clk_ctrl_mmio)) - phy_common->dev_ref_clk_ctrl_mmio = NULL; - return 0; }