Skip to content

Commit

Permalink
scsi/ufs: qcom: Remove ufs_qcom_phy_*() calls from host
Browse files Browse the repository at this point in the history
The host makes direct calls into phy using ufs_qcom_phy_*()
APIs. These APIs are only defined for 20nm qcom-ufs-qmp phy
which is not being used by any architecture as yet. Future
architectures too are not going to use 20nm ufs phy.
So remove these ufs_qcom_phy_*() calls from host to let further
change declare the 20nm phy as broken.
Also remove couple of stale enum defines for ufs phy.

Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org>
Acked-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
  • Loading branch information
Vivek Gautam authored and Kishon Vijay Abraham I committed Sep 26, 2018
1 parent 2ba3c43 commit 1e1e465
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 57 deletions.
2 changes: 1 addition & 1 deletion drivers/phy/qualcomm/phy-qcom-ufs-i.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@

#include <linux/module.h>
#include <linux/clk.h>
#include <linux/phy/phy.h>
#include <linux/regulator/consumer.h>
#include <linux/slab.h>
#include <linux/phy/phy-qcom-ufs.h>
#include <linux/platform_device.h>
#include <linux/io.h>
#include <linux/delay.h>
Expand Down
28 changes: 1 addition & 27 deletions drivers/scsi/ufs/ufs-qcom.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/phy/phy.h>
#include <linux/phy/phy-qcom-ufs.h>

#include "ufshcd.h"
#include "ufshcd-pltfrm.h"
Expand Down Expand Up @@ -189,22 +188,9 @@ static int ufs_qcom_init_lane_clks(struct ufs_qcom_host *host)

static int ufs_qcom_link_startup_post_change(struct ufs_hba *hba)
{
struct ufs_qcom_host *host = ufshcd_get_variant(hba);
struct phy *phy = host->generic_phy;
u32 tx_lanes;
int err = 0;

err = ufs_qcom_get_connected_tx_lanes(hba, &tx_lanes);
if (err)
goto out;

err = ufs_qcom_phy_set_tx_lane_enable(phy, tx_lanes);
if (err)
dev_err(hba->dev, "%s: ufs_qcom_phy_set_tx_lane_enable failed\n",
__func__);

out:
return err;
return ufs_qcom_get_connected_tx_lanes(hba, &tx_lanes);
}

static int ufs_qcom_check_hibern8(struct ufs_hba *hba)
Expand Down Expand Up @@ -932,10 +918,8 @@ static int ufs_qcom_pwr_change_notify(struct ufs_hba *hba,
{
u32 val;
struct ufs_qcom_host *host = ufshcd_get_variant(hba);
struct phy *phy = host->generic_phy;
struct ufs_qcom_dev_params ufs_qcom_cap;
int ret = 0;
int res = 0;

if (!dev_req_params) {
pr_err("%s: incoming dev_req_params is NULL\n", __func__);
Expand Down Expand Up @@ -1002,12 +986,6 @@ static int ufs_qcom_pwr_change_notify(struct ufs_hba *hba,
}

val = ~(MAX_U32 << dev_req_params->lane_tx);
res = ufs_qcom_phy_set_tx_lane_enable(phy, val);
if (res) {
dev_err(hba->dev, "%s: ufs_qcom_phy_set_tx_lane_enable() failed res = %d\n",
__func__, res);
ret = res;
}

/* cache the power mode parameters to use internally */
memcpy(&host->dev_req_params,
Expand Down Expand Up @@ -1264,10 +1242,6 @@ static int ufs_qcom_init(struct ufs_hba *hba)
}
}

/* update phy revision information before calling phy_init() */
ufs_qcom_phy_save_controller_version(host->generic_phy,
host->hw_ver.major, host->hw_ver.minor, host->hw_ver.step);

err = ufs_qcom_init_lane_clks(host);
if (err)
goto out_variant_clear;
Expand Down
5 changes: 0 additions & 5 deletions drivers/scsi/ufs/ufs-qcom.h
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,6 @@ enum {
MASK_CLK_NS_REG = 0xFFFC00,
};

enum ufs_qcom_phy_init_type {
UFS_PHY_INIT_FULL,
UFS_PHY_INIT_CFG_RESTORE,
};

/* QCOM UFS debug print bit mask */
#define UFS_QCOM_DBG_PRINT_REGS_EN BIT(0)
#define UFS_QCOM_DBG_PRINT_ICE_REGS_EN BIT(1)
Expand Down
24 changes: 0 additions & 24 deletions include/linux/phy/phy-qcom-ufs.h

This file was deleted.

0 comments on commit 1e1e465

Please sign in to comment.