Commit 2abf0c8e authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Vinod Koul

phy: qcom-qmp-pcie: change symbol prefix to qcom_qmp_phy_pcie_msm8996

Change all symbol names to start with qcom_qmp_phy_pcie_msm8996_ rather
than old qcom_qmp_phy_.
Acked-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Tested-by: Bjorn Andersson <bjorn.andersson@linaro.org> # UFS, PCIe and USB on SC8180X
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20220607213203.2819885-10-dmitry.baryshkov@linaro.orgSigned-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 5dbc7d86
...@@ -474,7 +474,7 @@ static const struct qmp_phy_cfg msm8996_pciephy_cfg = { ...@@ -474,7 +474,7 @@ static const struct qmp_phy_cfg msm8996_pciephy_cfg = {
.pwrdn_delay_max = POWER_DOWN_DELAY_US_MAX, .pwrdn_delay_max = POWER_DOWN_DELAY_US_MAX,
}; };
static void qcom_qmp_phy_configure_lane(void __iomem *base, static void qcom_qmp_phy_pcie_msm8996_configure_lane(void __iomem *base,
const unsigned int *regs, const unsigned int *regs,
const struct qmp_phy_init_tbl tbl[], const struct qmp_phy_init_tbl tbl[],
int num, int num,
...@@ -497,15 +497,15 @@ static void qcom_qmp_phy_configure_lane(void __iomem *base, ...@@ -497,15 +497,15 @@ static void qcom_qmp_phy_configure_lane(void __iomem *base,
} }
} }
static void qcom_qmp_phy_configure(void __iomem *base, static void qcom_qmp_phy_pcie_msm8996_configure(void __iomem *base,
const unsigned int *regs, const unsigned int *regs,
const struct qmp_phy_init_tbl tbl[], const struct qmp_phy_init_tbl tbl[],
int num) int num)
{ {
qcom_qmp_phy_configure_lane(base, regs, tbl, num, 0xff); qcom_qmp_phy_pcie_msm8996_configure_lane(base, regs, tbl, num, 0xff);
} }
static int qcom_qmp_phy_serdes_init(struct qmp_phy *qphy) static int qcom_qmp_phy_pcie_msm8996_serdes_init(struct qmp_phy *qphy)
{ {
struct qcom_qmp *qmp = qphy->qmp; struct qcom_qmp *qmp = qphy->qmp;
const struct qmp_phy_cfg *cfg = qphy->cfg; const struct qmp_phy_cfg *cfg = qphy->cfg;
...@@ -515,30 +515,30 @@ static int qcom_qmp_phy_serdes_init(struct qmp_phy *qphy) ...@@ -515,30 +515,30 @@ static int qcom_qmp_phy_serdes_init(struct qmp_phy *qphy)
int serdes_tbl_num = cfg->serdes_tbl_num; int serdes_tbl_num = cfg->serdes_tbl_num;
int ret; int ret;
qcom_qmp_phy_configure(serdes, cfg->regs, serdes_tbl, serdes_tbl_num); qcom_qmp_phy_pcie_msm8996_configure(serdes, cfg->regs, serdes_tbl, serdes_tbl_num);
if (cfg->serdes_tbl_sec) if (cfg->serdes_tbl_sec)
qcom_qmp_phy_configure(serdes, cfg->regs, cfg->serdes_tbl_sec, qcom_qmp_phy_pcie_msm8996_configure(serdes, cfg->regs, cfg->serdes_tbl_sec,
cfg->serdes_tbl_num_sec); cfg->serdes_tbl_num_sec);
if (cfg->type == PHY_TYPE_DP) { if (cfg->type == PHY_TYPE_DP) {
switch (dp_opts->link_rate) { switch (dp_opts->link_rate) {
case 1620: case 1620:
qcom_qmp_phy_configure(serdes, cfg->regs, qcom_qmp_phy_pcie_msm8996_configure(serdes, cfg->regs,
cfg->serdes_tbl_rbr, cfg->serdes_tbl_rbr,
cfg->serdes_tbl_rbr_num); cfg->serdes_tbl_rbr_num);
break; break;
case 2700: case 2700:
qcom_qmp_phy_configure(serdes, cfg->regs, qcom_qmp_phy_pcie_msm8996_configure(serdes, cfg->regs,
cfg->serdes_tbl_hbr, cfg->serdes_tbl_hbr,
cfg->serdes_tbl_hbr_num); cfg->serdes_tbl_hbr_num);
break; break;
case 5400: case 5400:
qcom_qmp_phy_configure(serdes, cfg->regs, qcom_qmp_phy_pcie_msm8996_configure(serdes, cfg->regs,
cfg->serdes_tbl_hbr2, cfg->serdes_tbl_hbr2,
cfg->serdes_tbl_hbr2_num); cfg->serdes_tbl_hbr2_num);
break; break;
case 8100: case 8100:
qcom_qmp_phy_configure(serdes, cfg->regs, qcom_qmp_phy_pcie_msm8996_configure(serdes, cfg->regs,
cfg->serdes_tbl_hbr3, cfg->serdes_tbl_hbr3,
cfg->serdes_tbl_hbr3_num); cfg->serdes_tbl_hbr3_num);
break; break;
...@@ -602,7 +602,7 @@ static int qcom_qmp_dp_phy_calibrate(struct phy *phy) ...@@ -602,7 +602,7 @@ static int qcom_qmp_dp_phy_calibrate(struct phy *phy)
return 0; return 0;
} }
static int qcom_qmp_phy_com_init(struct qmp_phy *qphy) static int qcom_qmp_phy_pcie_msm8996_com_init(struct qmp_phy *qphy)
{ {
struct qcom_qmp *qmp = qphy->qmp; struct qcom_qmp *qmp = qphy->qmp;
const struct qmp_phy_cfg *cfg = qphy->cfg; const struct qmp_phy_cfg *cfg = qphy->cfg;
...@@ -697,7 +697,7 @@ static int qcom_qmp_phy_com_init(struct qmp_phy *qphy) ...@@ -697,7 +697,7 @@ static int qcom_qmp_phy_com_init(struct qmp_phy *qphy)
return ret; return ret;
} }
static int qcom_qmp_phy_com_exit(struct qmp_phy *qphy) static int qcom_qmp_phy_pcie_msm8996_com_exit(struct qmp_phy *qphy)
{ {
struct qcom_qmp *qmp = qphy->qmp; struct qcom_qmp *qmp = qphy->qmp;
const struct qmp_phy_cfg *cfg = qphy->cfg; const struct qmp_phy_cfg *cfg = qphy->cfg;
...@@ -732,7 +732,7 @@ static int qcom_qmp_phy_com_exit(struct qmp_phy *qphy) ...@@ -732,7 +732,7 @@ static int qcom_qmp_phy_com_exit(struct qmp_phy *qphy)
return 0; return 0;
} }
static int qcom_qmp_phy_init(struct phy *phy) static int qcom_qmp_phy_pcie_msm8996_init(struct phy *phy)
{ {
struct qmp_phy *qphy = phy_get_drvdata(phy); struct qmp_phy *qphy = phy_get_drvdata(phy);
struct qcom_qmp *qmp = qphy->qmp; struct qcom_qmp *qmp = qphy->qmp;
...@@ -767,7 +767,7 @@ static int qcom_qmp_phy_init(struct phy *phy) ...@@ -767,7 +767,7 @@ static int qcom_qmp_phy_init(struct phy *phy)
return ret; return ret;
} }
ret = qcom_qmp_phy_com_init(qphy); ret = qcom_qmp_phy_pcie_msm8996_com_init(qphy);
if (ret) if (ret)
return ret; return ret;
...@@ -777,7 +777,7 @@ static int qcom_qmp_phy_init(struct phy *phy) ...@@ -777,7 +777,7 @@ static int qcom_qmp_phy_init(struct phy *phy)
return 0; return 0;
} }
static int qcom_qmp_phy_power_on(struct phy *phy) static int qcom_qmp_phy_pcie_msm8996_power_on(struct phy *phy)
{ {
struct qmp_phy *qphy = phy_get_drvdata(phy); struct qmp_phy *qphy = phy_get_drvdata(phy);
struct qcom_qmp *qmp = qphy->qmp; struct qcom_qmp *qmp = qphy->qmp;
...@@ -790,7 +790,7 @@ static int qcom_qmp_phy_power_on(struct phy *phy) ...@@ -790,7 +790,7 @@ static int qcom_qmp_phy_power_on(struct phy *phy)
unsigned int mask, val, ready; unsigned int mask, val, ready;
int ret; int ret;
qcom_qmp_phy_serdes_init(qphy); qcom_qmp_phy_pcie_msm8996_serdes_init(qphy);
if (cfg->has_lane_rst) { if (cfg->has_lane_rst) {
ret = reset_control_deassert(qphy->lane_rst); ret = reset_control_deassert(qphy->lane_rst);
...@@ -808,18 +808,18 @@ static int qcom_qmp_phy_power_on(struct phy *phy) ...@@ -808,18 +808,18 @@ static int qcom_qmp_phy_power_on(struct phy *phy)
} }
/* Tx, Rx, and PCS configurations */ /* Tx, Rx, and PCS configurations */
qcom_qmp_phy_configure_lane(tx, cfg->regs, qcom_qmp_phy_pcie_msm8996_configure_lane(tx, cfg->regs,
cfg->tx_tbl, cfg->tx_tbl_num, 1); cfg->tx_tbl, cfg->tx_tbl_num, 1);
if (cfg->tx_tbl_sec) if (cfg->tx_tbl_sec)
qcom_qmp_phy_configure_lane(tx, cfg->regs, cfg->tx_tbl_sec, qcom_qmp_phy_pcie_msm8996_configure_lane(tx, cfg->regs, cfg->tx_tbl_sec,
cfg->tx_tbl_num_sec, 1); cfg->tx_tbl_num_sec, 1);
/* Configuration for other LANE for USB-DP combo PHY */ /* Configuration for other LANE for USB-DP combo PHY */
if (cfg->is_dual_lane_phy) { if (cfg->is_dual_lane_phy) {
qcom_qmp_phy_configure_lane(qphy->tx2, cfg->regs, qcom_qmp_phy_pcie_msm8996_configure_lane(qphy->tx2, cfg->regs,
cfg->tx_tbl, cfg->tx_tbl_num, 2); cfg->tx_tbl, cfg->tx_tbl_num, 2);
if (cfg->tx_tbl_sec) if (cfg->tx_tbl_sec)
qcom_qmp_phy_configure_lane(qphy->tx2, cfg->regs, qcom_qmp_phy_pcie_msm8996_configure_lane(qphy->tx2, cfg->regs,
cfg->tx_tbl_sec, cfg->tx_tbl_sec,
cfg->tx_tbl_num_sec, 2); cfg->tx_tbl_num_sec, 2);
} }
...@@ -828,17 +828,17 @@ static int qcom_qmp_phy_power_on(struct phy *phy) ...@@ -828,17 +828,17 @@ static int qcom_qmp_phy_power_on(struct phy *phy)
if (cfg->type == PHY_TYPE_DP) if (cfg->type == PHY_TYPE_DP)
cfg->configure_dp_tx(qphy); cfg->configure_dp_tx(qphy);
qcom_qmp_phy_configure_lane(rx, cfg->regs, qcom_qmp_phy_pcie_msm8996_configure_lane(rx, cfg->regs,
cfg->rx_tbl, cfg->rx_tbl_num, 1); cfg->rx_tbl, cfg->rx_tbl_num, 1);
if (cfg->rx_tbl_sec) if (cfg->rx_tbl_sec)
qcom_qmp_phy_configure_lane(rx, cfg->regs, qcom_qmp_phy_pcie_msm8996_configure_lane(rx, cfg->regs,
cfg->rx_tbl_sec, cfg->rx_tbl_num_sec, 1); cfg->rx_tbl_sec, cfg->rx_tbl_num_sec, 1);
if (cfg->is_dual_lane_phy) { if (cfg->is_dual_lane_phy) {
qcom_qmp_phy_configure_lane(qphy->rx2, cfg->regs, qcom_qmp_phy_pcie_msm8996_configure_lane(qphy->rx2, cfg->regs,
cfg->rx_tbl, cfg->rx_tbl_num, 2); cfg->rx_tbl, cfg->rx_tbl_num, 2);
if (cfg->rx_tbl_sec) if (cfg->rx_tbl_sec)
qcom_qmp_phy_configure_lane(qphy->rx2, cfg->regs, qcom_qmp_phy_pcie_msm8996_configure_lane(qphy->rx2, cfg->regs,
cfg->rx_tbl_sec, cfg->rx_tbl_sec,
cfg->rx_tbl_num_sec, 2); cfg->rx_tbl_num_sec, 2);
} }
...@@ -847,9 +847,9 @@ static int qcom_qmp_phy_power_on(struct phy *phy) ...@@ -847,9 +847,9 @@ static int qcom_qmp_phy_power_on(struct phy *phy)
if (cfg->type == PHY_TYPE_DP) { if (cfg->type == PHY_TYPE_DP) {
cfg->configure_dp_phy(qphy); cfg->configure_dp_phy(qphy);
} else { } else {
qcom_qmp_phy_configure(pcs, cfg->regs, cfg->pcs_tbl, cfg->pcs_tbl_num); qcom_qmp_phy_pcie_msm8996_configure(pcs, cfg->regs, cfg->pcs_tbl, cfg->pcs_tbl_num);
if (cfg->pcs_tbl_sec) if (cfg->pcs_tbl_sec)
qcom_qmp_phy_configure(pcs, cfg->regs, cfg->pcs_tbl_sec, qcom_qmp_phy_pcie_msm8996_configure(pcs, cfg->regs, cfg->pcs_tbl_sec,
cfg->pcs_tbl_num_sec); cfg->pcs_tbl_num_sec);
} }
...@@ -857,10 +857,10 @@ static int qcom_qmp_phy_power_on(struct phy *phy) ...@@ -857,10 +857,10 @@ static int qcom_qmp_phy_power_on(struct phy *phy)
if (ret) if (ret)
goto err_disable_pipe_clk; goto err_disable_pipe_clk;
qcom_qmp_phy_configure(pcs_misc, cfg->regs, cfg->pcs_misc_tbl, qcom_qmp_phy_pcie_msm8996_configure(pcs_misc, cfg->regs, cfg->pcs_misc_tbl,
cfg->pcs_misc_tbl_num); cfg->pcs_misc_tbl_num);
if (cfg->pcs_misc_tbl_sec) if (cfg->pcs_misc_tbl_sec)
qcom_qmp_phy_configure(pcs_misc, cfg->regs, cfg->pcs_misc_tbl_sec, qcom_qmp_phy_pcie_msm8996_configure(pcs_misc, cfg->regs, cfg->pcs_misc_tbl_sec,
cfg->pcs_misc_tbl_num_sec); cfg->pcs_misc_tbl_num_sec);
/* /*
...@@ -908,7 +908,7 @@ static int qcom_qmp_phy_power_on(struct phy *phy) ...@@ -908,7 +908,7 @@ static int qcom_qmp_phy_power_on(struct phy *phy)
return ret; return ret;
} }
static int qcom_qmp_phy_power_off(struct phy *phy) static int qcom_qmp_phy_pcie_msm8996_power_off(struct phy *phy)
{ {
struct qmp_phy *qphy = phy_get_drvdata(phy); struct qmp_phy *qphy = phy_get_drvdata(phy);
const struct qmp_phy_cfg *cfg = qphy->cfg; const struct qmp_phy_cfg *cfg = qphy->cfg;
...@@ -939,7 +939,7 @@ static int qcom_qmp_phy_power_off(struct phy *phy) ...@@ -939,7 +939,7 @@ static int qcom_qmp_phy_power_off(struct phy *phy)
return 0; return 0;
} }
static int qcom_qmp_phy_exit(struct phy *phy) static int qcom_qmp_phy_pcie_msm8996_exit(struct phy *phy)
{ {
struct qmp_phy *qphy = phy_get_drvdata(phy); struct qmp_phy *qphy = phy_get_drvdata(phy);
const struct qmp_phy_cfg *cfg = qphy->cfg; const struct qmp_phy_cfg *cfg = qphy->cfg;
...@@ -947,37 +947,37 @@ static int qcom_qmp_phy_exit(struct phy *phy) ...@@ -947,37 +947,37 @@ static int qcom_qmp_phy_exit(struct phy *phy)
if (cfg->has_lane_rst) if (cfg->has_lane_rst)
reset_control_assert(qphy->lane_rst); reset_control_assert(qphy->lane_rst);
qcom_qmp_phy_com_exit(qphy); qcom_qmp_phy_pcie_msm8996_com_exit(qphy);
return 0; return 0;
} }
static int qcom_qmp_phy_enable(struct phy *phy) static int qcom_qmp_phy_pcie_msm8996_enable(struct phy *phy)
{ {
int ret; int ret;
ret = qcom_qmp_phy_init(phy); ret = qcom_qmp_phy_pcie_msm8996_init(phy);
if (ret) if (ret)
return ret; return ret;
ret = qcom_qmp_phy_power_on(phy); ret = qcom_qmp_phy_pcie_msm8996_power_on(phy);
if (ret) if (ret)
qcom_qmp_phy_exit(phy); qcom_qmp_phy_pcie_msm8996_exit(phy);
return ret; return ret;
} }
static int qcom_qmp_phy_disable(struct phy *phy) static int qcom_qmp_phy_pcie_msm8996_disable(struct phy *phy)
{ {
int ret; int ret;
ret = qcom_qmp_phy_power_off(phy); ret = qcom_qmp_phy_pcie_msm8996_power_off(phy);
if (ret) if (ret)
return ret; return ret;
return qcom_qmp_phy_exit(phy); return qcom_qmp_phy_pcie_msm8996_exit(phy);
} }
static int qcom_qmp_phy_set_mode(struct phy *phy, static int qcom_qmp_phy_pcie_msm8996_set_mode(struct phy *phy,
enum phy_mode mode, int submode) enum phy_mode mode, int submode)
{ {
struct qmp_phy *qphy = phy_get_drvdata(phy); struct qmp_phy *qphy = phy_get_drvdata(phy);
...@@ -987,7 +987,7 @@ static int qcom_qmp_phy_set_mode(struct phy *phy, ...@@ -987,7 +987,7 @@ static int qcom_qmp_phy_set_mode(struct phy *phy,
return 0; return 0;
} }
static void qcom_qmp_phy_enable_autonomous_mode(struct qmp_phy *qphy) static void qcom_qmp_phy_pcie_msm8996_enable_autonomous_mode(struct qmp_phy *qphy)
{ {
const struct qmp_phy_cfg *cfg = qphy->cfg; const struct qmp_phy_cfg *cfg = qphy->cfg;
void __iomem *pcs = qphy->pcs; void __iomem *pcs = qphy->pcs;
...@@ -1016,7 +1016,7 @@ static void qcom_qmp_phy_enable_autonomous_mode(struct qmp_phy *qphy) ...@@ -1016,7 +1016,7 @@ static void qcom_qmp_phy_enable_autonomous_mode(struct qmp_phy *qphy)
qphy_clrbits(pcs_misc, QPHY_V3_PCS_MISC_CLAMP_ENABLE, CLAMP_EN); qphy_clrbits(pcs_misc, QPHY_V3_PCS_MISC_CLAMP_ENABLE, CLAMP_EN);
} }
static void qcom_qmp_phy_disable_autonomous_mode(struct qmp_phy *qphy) static void qcom_qmp_phy_pcie_msm8996_disable_autonomous_mode(struct qmp_phy *qphy)
{ {
const struct qmp_phy_cfg *cfg = qphy->cfg; const struct qmp_phy_cfg *cfg = qphy->cfg;
void __iomem *pcs = qphy->pcs; void __iomem *pcs = qphy->pcs;
...@@ -1034,7 +1034,7 @@ static void qcom_qmp_phy_disable_autonomous_mode(struct qmp_phy *qphy) ...@@ -1034,7 +1034,7 @@ static void qcom_qmp_phy_disable_autonomous_mode(struct qmp_phy *qphy)
qphy_clrbits(pcs, cfg->regs[QPHY_PCS_LFPS_RXTERM_IRQ_CLEAR], IRQ_CLEAR); qphy_clrbits(pcs, cfg->regs[QPHY_PCS_LFPS_RXTERM_IRQ_CLEAR], IRQ_CLEAR);
} }
static int __maybe_unused qcom_qmp_phy_runtime_suspend(struct device *dev) static int __maybe_unused qcom_qmp_phy_pcie_msm8996_runtime_suspend(struct device *dev)
{ {
struct qcom_qmp *qmp = dev_get_drvdata(dev); struct qcom_qmp *qmp = dev_get_drvdata(dev);
struct qmp_phy *qphy = qmp->phys[0]; struct qmp_phy *qphy = qmp->phys[0];
...@@ -1051,7 +1051,7 @@ static int __maybe_unused qcom_qmp_phy_runtime_suspend(struct device *dev) ...@@ -1051,7 +1051,7 @@ static int __maybe_unused qcom_qmp_phy_runtime_suspend(struct device *dev)
return 0; return 0;
} }
qcom_qmp_phy_enable_autonomous_mode(qphy); qcom_qmp_phy_pcie_msm8996_enable_autonomous_mode(qphy);
clk_disable_unprepare(qphy->pipe_clk); clk_disable_unprepare(qphy->pipe_clk);
clk_bulk_disable_unprepare(cfg->num_clks, qmp->clks); clk_bulk_disable_unprepare(cfg->num_clks, qmp->clks);
...@@ -1059,7 +1059,7 @@ static int __maybe_unused qcom_qmp_phy_runtime_suspend(struct device *dev) ...@@ -1059,7 +1059,7 @@ static int __maybe_unused qcom_qmp_phy_runtime_suspend(struct device *dev)
return 0; return 0;
} }
static int __maybe_unused qcom_qmp_phy_runtime_resume(struct device *dev) static int __maybe_unused qcom_qmp_phy_pcie_msm8996_runtime_resume(struct device *dev)
{ {
struct qcom_qmp *qmp = dev_get_drvdata(dev); struct qcom_qmp *qmp = dev_get_drvdata(dev);
struct qmp_phy *qphy = qmp->phys[0]; struct qmp_phy *qphy = qmp->phys[0];
...@@ -1088,12 +1088,12 @@ static int __maybe_unused qcom_qmp_phy_runtime_resume(struct device *dev) ...@@ -1088,12 +1088,12 @@ static int __maybe_unused qcom_qmp_phy_runtime_resume(struct device *dev)
return ret; return ret;
} }
qcom_qmp_phy_disable_autonomous_mode(qphy); qcom_qmp_phy_pcie_msm8996_disable_autonomous_mode(qphy);
return 0; return 0;
} }
static int qcom_qmp_phy_vreg_init(struct device *dev, const struct qmp_phy_cfg *cfg) static int qcom_qmp_phy_pcie_msm8996_vreg_init(struct device *dev, const struct qmp_phy_cfg *cfg)
{ {
struct qcom_qmp *qmp = dev_get_drvdata(dev); struct qcom_qmp *qmp = dev_get_drvdata(dev);
int num = cfg->num_vregs; int num = cfg->num_vregs;
...@@ -1109,7 +1109,7 @@ static int qcom_qmp_phy_vreg_init(struct device *dev, const struct qmp_phy_cfg * ...@@ -1109,7 +1109,7 @@ static int qcom_qmp_phy_vreg_init(struct device *dev, const struct qmp_phy_cfg *
return devm_regulator_bulk_get(dev, num, qmp->vregs); return devm_regulator_bulk_get(dev, num, qmp->vregs);
} }
static int qcom_qmp_phy_reset_init(struct device *dev, const struct qmp_phy_cfg *cfg) static int qcom_qmp_phy_pcie_msm8996_reset_init(struct device *dev, const struct qmp_phy_cfg *cfg)
{ {
struct qcom_qmp *qmp = dev_get_drvdata(dev); struct qcom_qmp *qmp = dev_get_drvdata(dev);
int i; int i;
...@@ -1134,7 +1134,7 @@ static int qcom_qmp_phy_reset_init(struct device *dev, const struct qmp_phy_cfg ...@@ -1134,7 +1134,7 @@ static int qcom_qmp_phy_reset_init(struct device *dev, const struct qmp_phy_cfg
return 0; return 0;
} }
static int qcom_qmp_phy_clk_init(struct device *dev, const struct qmp_phy_cfg *cfg) static int qcom_qmp_phy_pcie_msm8996_clk_init(struct device *dev, const struct qmp_phy_cfg *cfg)
{ {
struct qcom_qmp *qmp = dev_get_drvdata(dev); struct qcom_qmp *qmp = dev_get_drvdata(dev);
int num = cfg->num_clks; int num = cfg->num_clks;
...@@ -1402,28 +1402,28 @@ static int phy_dp_clks_register(struct qcom_qmp *qmp, struct qmp_phy *qphy, ...@@ -1402,28 +1402,28 @@ static int phy_dp_clks_register(struct qcom_qmp *qmp, struct qmp_phy *qphy,
return devm_add_action_or_reset(qmp->dev, phy_clk_release_provider, np); return devm_add_action_or_reset(qmp->dev, phy_clk_release_provider, np);
} }
static const struct phy_ops qcom_qmp_phy_gen_ops = { static const struct phy_ops qcom_qmp_phy_pcie_msm8996_gen_ops = {
.init = qcom_qmp_phy_enable, .init = qcom_qmp_phy_pcie_msm8996_enable,
.exit = qcom_qmp_phy_disable, .exit = qcom_qmp_phy_pcie_msm8996_disable,
.set_mode = qcom_qmp_phy_set_mode, .set_mode = qcom_qmp_phy_pcie_msm8996_set_mode,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
static const struct phy_ops qcom_qmp_phy_dp_ops = { static const struct phy_ops qcom_qmp_phy_pcie_msm8996_dp_ops = {
.init = qcom_qmp_phy_init, .init = qcom_qmp_phy_pcie_msm8996_init,
.configure = qcom_qmp_dp_phy_configure, .configure = qcom_qmp_dp_phy_configure,
.power_on = qcom_qmp_phy_power_on, .power_on = qcom_qmp_phy_pcie_msm8996_power_on,
.calibrate = qcom_qmp_dp_phy_calibrate, .calibrate = qcom_qmp_dp_phy_calibrate,
.power_off = qcom_qmp_phy_power_off, .power_off = qcom_qmp_phy_pcie_msm8996_power_off,
.exit = qcom_qmp_phy_exit, .exit = qcom_qmp_phy_pcie_msm8996_exit,
.set_mode = qcom_qmp_phy_set_mode, .set_mode = qcom_qmp_phy_pcie_msm8996_set_mode,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
static const struct phy_ops qcom_qmp_pcie_ufs_ops = { static const struct phy_ops qcom_qmp_pcie_ufs_ops = {
.power_on = qcom_qmp_phy_enable, .power_on = qcom_qmp_phy_pcie_msm8996_enable,
.power_off = qcom_qmp_phy_disable, .power_off = qcom_qmp_phy_pcie_msm8996_disable,
.set_mode = qcom_qmp_phy_set_mode, .set_mode = qcom_qmp_phy_pcie_msm8996_set_mode,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
...@@ -1433,7 +1433,7 @@ static void qcom_qmp_reset_control_put(void *data) ...@@ -1433,7 +1433,7 @@ static void qcom_qmp_reset_control_put(void *data)
} }
static static
int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id, int qcom_qmp_phy_pcie_msm8996_create(struct device *dev, struct device_node *np, int id,
void __iomem *serdes, const struct qmp_phy_cfg *cfg) void __iomem *serdes, const struct qmp_phy_cfg *cfg)
{ {
struct qcom_qmp *qmp = dev_get_drvdata(dev); struct qcom_qmp *qmp = dev_get_drvdata(dev);
...@@ -1535,9 +1535,9 @@ int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id, ...@@ -1535,9 +1535,9 @@ int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id,
if (cfg->type == PHY_TYPE_UFS || cfg->type == PHY_TYPE_PCIE) if (cfg->type == PHY_TYPE_UFS || cfg->type == PHY_TYPE_PCIE)
ops = &qcom_qmp_pcie_ufs_ops; ops = &qcom_qmp_pcie_ufs_ops;
else if (cfg->type == PHY_TYPE_DP) else if (cfg->type == PHY_TYPE_DP)
ops = &qcom_qmp_phy_dp_ops; ops = &qcom_qmp_phy_pcie_msm8996_dp_ops;
else else
ops = &qcom_qmp_phy_gen_ops; ops = &qcom_qmp_phy_pcie_msm8996_gen_ops;
generic_phy = devm_phy_create(dev, np, ops); generic_phy = devm_phy_create(dev, np, ops);
if (IS_ERR(generic_phy)) { if (IS_ERR(generic_phy)) {
...@@ -1555,21 +1555,21 @@ int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id, ...@@ -1555,21 +1555,21 @@ int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id,
return 0; return 0;
} }
static const struct of_device_id qcom_qmp_phy_of_match_table[] = { static const struct of_device_id qcom_qmp_phy_pcie_msm8996_of_match_table[] = {
{ {
.compatible = "qcom,msm8996-qmp-pcie-phy", .compatible = "qcom,msm8996-qmp-pcie-phy",
.data = &msm8996_pciephy_cfg, .data = &msm8996_pciephy_cfg,
}, },
{ }, { },
}; };
MODULE_DEVICE_TABLE(of, qcom_qmp_phy_of_match_table); MODULE_DEVICE_TABLE(of, qcom_qmp_phy_pcie_msm8996_of_match_table);
static const struct dev_pm_ops qcom_qmp_phy_pm_ops = { static const struct dev_pm_ops qcom_qmp_phy_pcie_msm8996_pm_ops = {
SET_RUNTIME_PM_OPS(qcom_qmp_phy_runtime_suspend, SET_RUNTIME_PM_OPS(qcom_qmp_phy_pcie_msm8996_runtime_suspend,
qcom_qmp_phy_runtime_resume, NULL) qcom_qmp_phy_pcie_msm8996_runtime_resume, NULL)
}; };
static int qcom_qmp_phy_probe(struct platform_device *pdev) static int qcom_qmp_phy_pcie_msm8996_probe(struct platform_device *pdev)
{ {
struct qcom_qmp *qmp; struct qcom_qmp *qmp;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
...@@ -1623,15 +1623,15 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev) ...@@ -1623,15 +1623,15 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)
mutex_init(&qmp->phy_mutex); mutex_init(&qmp->phy_mutex);
ret = qcom_qmp_phy_clk_init(dev, cfg); ret = qcom_qmp_phy_pcie_msm8996_clk_init(dev, cfg);
if (ret) if (ret)
return ret; return ret;
ret = qcom_qmp_phy_reset_init(dev, cfg); ret = qcom_qmp_phy_pcie_msm8996_reset_init(dev, cfg);
if (ret) if (ret)
return ret; return ret;
ret = qcom_qmp_phy_vreg_init(dev, cfg); ret = qcom_qmp_phy_pcie_msm8996_vreg_init(dev, cfg);
if (ret) { if (ret) {
if (ret != -EPROBE_DEFER) if (ret != -EPROBE_DEFER)
dev_err(dev, "failed to get regulator supplies: %d\n", dev_err(dev, "failed to get regulator supplies: %d\n",
...@@ -1667,7 +1667,7 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev) ...@@ -1667,7 +1667,7 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)
} }
/* Create per-lane phy */ /* Create per-lane phy */
ret = qcom_qmp_phy_create(dev, child, id, serdes, cfg); ret = qcom_qmp_phy_pcie_msm8996_create(dev, child, id, serdes, cfg);
if (ret) { if (ret) {
dev_err(dev, "failed to create lane%d phy, %d\n", dev_err(dev, "failed to create lane%d phy, %d\n",
id, ret); id, ret);
...@@ -1710,16 +1710,16 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev) ...@@ -1710,16 +1710,16 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)
return ret; return ret;
} }
static struct platform_driver qcom_qmp_phy_driver = { static struct platform_driver qcom_qmp_phy_pcie_msm8996_driver = {
.probe = qcom_qmp_phy_probe, .probe = qcom_qmp_phy_pcie_msm8996_probe,
.driver = { .driver = {
.name = "qcom-qmp-msm8996-pcie-phy", .name = "qcom-qmp-msm8996-pcie-phy",
.pm = &qcom_qmp_phy_pm_ops, .pm = &qcom_qmp_phy_pcie_msm8996_pm_ops,
.of_match_table = qcom_qmp_phy_of_match_table, .of_match_table = qcom_qmp_phy_pcie_msm8996_of_match_table,
}, },
}; };
module_platform_driver(qcom_qmp_phy_driver); module_platform_driver(qcom_qmp_phy_pcie_msm8996_driver);
MODULE_AUTHOR("Vivek Gautam <vivek.gautam@codeaurora.org>"); MODULE_AUTHOR("Vivek Gautam <vivek.gautam@codeaurora.org>");
MODULE_DESCRIPTION("Qualcomm QMP MSM8996 PCIe PHY driver"); MODULE_DESCRIPTION("Qualcomm QMP MSM8996 PCIe PHY driver");
......
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