Commit 5adaf1e8 authored by Venkat Gopalakrishnan's avatar Venkat Gopalakrishnan Committed by Martin K. Petersen

scsi: ufs: make UFS Tx lane1 clock optional for QCOM platforms

Per Qcom's UFS host controller HW design, the UFS Tx lane1 clock could be
muxed with Tx lane0 clock, hence keep Tx lane1 clock optional by ignoring
it if it is not provided in device tree. This change also performs some
cleanup to lanes per direction checks when enable/disable lane clocks
just for symmetry.
Signed-off-by: default avatarVenkat Gopalakrishnan <venkatg@codeaurora.org>
Signed-off-by: default avatarSubhash Jadavani <subhashj@codeaurora.org>
Signed-off-by: default avatarCan Guo <cang@codeaurora.org>
Reviewed-by: default avatarVivek Gautam <vivek.gautam@codeaurora.org>
Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
Tested-by: default avatarDouglas Anderson <dianders@chromium.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 664e68bc
...@@ -70,20 +70,27 @@ static int ufs_qcom_get_connected_tx_lanes(struct ufs_hba *hba, u32 *tx_lanes) ...@@ -70,20 +70,27 @@ static int ufs_qcom_get_connected_tx_lanes(struct ufs_hba *hba, u32 *tx_lanes)
} }
static int ufs_qcom_host_clk_get(struct device *dev, static int ufs_qcom_host_clk_get(struct device *dev,
const char *name, struct clk **clk_out) const char *name, struct clk **clk_out, bool optional)
{ {
struct clk *clk; struct clk *clk;
int err = 0; int err = 0;
clk = devm_clk_get(dev, name); clk = devm_clk_get(dev, name);
if (IS_ERR(clk)) { if (!IS_ERR(clk)) {
err = PTR_ERR(clk);
dev_err(dev, "%s: failed to get %s err %d",
__func__, name, err);
} else {
*clk_out = clk; *clk_out = clk;
return 0;
} }
err = PTR_ERR(clk);
if (optional && err == -ENOENT) {
*clk_out = NULL;
return 0;
}
if (err != -EPROBE_DEFER)
dev_err(dev, "failed to get %s err %d\n", name, err);
return err; return err;
} }
...@@ -104,10 +111,8 @@ static void ufs_qcom_disable_lane_clks(struct ufs_qcom_host *host) ...@@ -104,10 +111,8 @@ static void ufs_qcom_disable_lane_clks(struct ufs_qcom_host *host)
if (!host->is_lane_clks_enabled) if (!host->is_lane_clks_enabled)
return; return;
if (host->hba->lanes_per_direction > 1)
clk_disable_unprepare(host->tx_l1_sync_clk); clk_disable_unprepare(host->tx_l1_sync_clk);
clk_disable_unprepare(host->tx_l0_sync_clk); clk_disable_unprepare(host->tx_l0_sync_clk);
if (host->hba->lanes_per_direction > 1)
clk_disable_unprepare(host->rx_l1_sync_clk); clk_disable_unprepare(host->rx_l1_sync_clk);
clk_disable_unprepare(host->rx_l0_sync_clk); clk_disable_unprepare(host->rx_l0_sync_clk);
...@@ -132,7 +137,6 @@ static int ufs_qcom_enable_lane_clks(struct ufs_qcom_host *host) ...@@ -132,7 +137,6 @@ static int ufs_qcom_enable_lane_clks(struct ufs_qcom_host *host)
if (err) if (err)
goto disable_rx_l0; goto disable_rx_l0;
if (host->hba->lanes_per_direction > 1) {
err = ufs_qcom_host_clk_enable(dev, "rx_lane1_sync_clk", err = ufs_qcom_host_clk_enable(dev, "rx_lane1_sync_clk",
host->rx_l1_sync_clk); host->rx_l1_sync_clk);
if (err) if (err)
...@@ -142,13 +146,11 @@ static int ufs_qcom_enable_lane_clks(struct ufs_qcom_host *host) ...@@ -142,13 +146,11 @@ static int ufs_qcom_enable_lane_clks(struct ufs_qcom_host *host)
host->tx_l1_sync_clk); host->tx_l1_sync_clk);
if (err) if (err)
goto disable_rx_l1; goto disable_rx_l1;
}
host->is_lane_clks_enabled = true; host->is_lane_clks_enabled = true;
goto out; goto out;
disable_rx_l1: disable_rx_l1:
if (host->hba->lanes_per_direction > 1)
clk_disable_unprepare(host->rx_l1_sync_clk); clk_disable_unprepare(host->rx_l1_sync_clk);
disable_tx_l0: disable_tx_l0:
clk_disable_unprepare(host->tx_l0_sync_clk); clk_disable_unprepare(host->tx_l0_sync_clk);
...@@ -163,25 +165,25 @@ static int ufs_qcom_init_lane_clks(struct ufs_qcom_host *host) ...@@ -163,25 +165,25 @@ static int ufs_qcom_init_lane_clks(struct ufs_qcom_host *host)
int err = 0; int err = 0;
struct device *dev = host->hba->dev; struct device *dev = host->hba->dev;
err = ufs_qcom_host_clk_get(dev, err = ufs_qcom_host_clk_get(dev, "rx_lane0_sync_clk",
"rx_lane0_sync_clk", &host->rx_l0_sync_clk); &host->rx_l0_sync_clk, false);
if (err) if (err)
goto out; goto out;
err = ufs_qcom_host_clk_get(dev, err = ufs_qcom_host_clk_get(dev, "tx_lane0_sync_clk",
"tx_lane0_sync_clk", &host->tx_l0_sync_clk); &host->tx_l0_sync_clk, false);
if (err) if (err)
goto out; goto out;
/* In case of single lane per direction, don't read lane1 clocks */ /* In case of single lane per direction, don't read lane1 clocks */
if (host->hba->lanes_per_direction > 1) { if (host->hba->lanes_per_direction > 1) {
err = ufs_qcom_host_clk_get(dev, "rx_lane1_sync_clk", err = ufs_qcom_host_clk_get(dev, "rx_lane1_sync_clk",
&host->rx_l1_sync_clk); &host->rx_l1_sync_clk, false);
if (err) if (err)
goto out; goto out;
err = ufs_qcom_host_clk_get(dev, "tx_lane1_sync_clk", err = ufs_qcom_host_clk_get(dev, "tx_lane1_sync_clk",
&host->tx_l1_sync_clk); &host->tx_l1_sync_clk, true);
} }
out: out:
return err; return err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment