phy: qcom-qmp-pcie: drop unused runtime PM implementation
authorJohan Hovold <johan+linaro@kernel.org>
Wed, 7 Sep 2022 11:07:15 +0000 (13:07 +0200)
committerVinod Koul <vkoul@kernel.org>
Tue, 20 Sep 2022 05:58:07 +0000 (11:28 +0530)
Drop the unused and incomplete runtime PM implementation, which was
only used by USB PHYs before splitting the QMP driver.

Note that the runtime PM was never disabled (and state restored) on
driver unbind.

This effectively reverts commit ac0d239936bd ("phy: qcom-qmp: Add
support for runtime PM").

Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20220907110728.19092-4-johan+linaro@kernel.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/phy/qualcomm/phy-qcom-qmp-pcie.c

index 2923977..8606209 100644 (file)
 #define USB3_MODE                              BIT(0) /* enables USB3 mode */
 #define DP_MODE                                        BIT(1) /* enables DP mode */
 
-/* QPHY_PCS_AUTONOMOUS_MODE_CTRL register bits */
-#define ARCVR_DTCT_EN                          BIT(0)
-#define ALFPS_DTCT_EN                          BIT(1)
-#define ARCVR_DTCT_EVENT_SEL                   BIT(4)
-
-/* QPHY_PCS_LFPS_RXTERM_IRQ_CLEAR register bits */
-#define IRQ_CLEAR                              BIT(0)
-
-/* QPHY_PCS_LFPS_RXTERM_IRQ_STATUS register bits */
-#define RCVR_DETECT                            BIT(0)
-
-/* QPHY_V3_PCS_MISC_CLAMP_ENABLE register bits */
-#define CLAMP_EN                               BIT(0) /* enables i/o clamp_n */
-
 #define PHY_INIT_COMPLETE_TIMEOUT              10000
 #define POWER_DOWN_DELAY_US_MIN                        10
 #define POWER_DOWN_DELAY_US_MAX                        11
@@ -125,9 +111,6 @@ enum qphy_reg_layout {
        QPHY_START_CTRL,
        QPHY_PCS_READY_STATUS,
        QPHY_PCS_STATUS,
-       QPHY_PCS_AUTONOMOUS_MODE_CTRL,
-       QPHY_PCS_LFPS_RXTERM_IRQ_CLEAR,
-       QPHY_PCS_LFPS_RXTERM_IRQ_STATUS,
        QPHY_PCS_POWER_DOWN_CONTROL,
        /* PCS_MISC registers */
        QPHY_PCS_MISC_TYPEC_CTRL,
@@ -2153,15 +2136,6 @@ static int qmp_pcie_disable(struct phy *phy)
        return qmp_pcie_exit(phy);
 }
 
-static int qmp_pcie_set_mode(struct phy *phy, enum phy_mode mode, int submode)
-{
-       struct qmp_phy *qphy = phy_get_drvdata(phy);
-
-       qphy->mode = mode;
-
-       return 0;
-}
-
 static int qmp_pcie_vreg_init(struct device *dev, const struct qmp_phy_cfg *cfg)
 {
        struct qcom_qmp *qmp = dev_get_drvdata(dev);
@@ -2285,7 +2259,6 @@ static int phy_pipe_clk_register(struct qcom_qmp *qmp, struct device_node *np)
 static const struct phy_ops qmp_pcie_ops = {
        .power_on       = qmp_pcie_enable,
        .power_off      = qmp_pcie_disable,
-       .set_mode       = qmp_pcie_set_mode,
        .owner          = THIS_MODULE,
 };
 
@@ -2474,14 +2447,6 @@ static int qmp_pcie_probe(struct platform_device *pdev)
        if (!qmp->phys)
                return -ENOMEM;
 
-       pm_runtime_set_active(dev);
-       pm_runtime_enable(dev);
-       /*
-        * Prevent runtime pm from being ON by default. Users can enable
-        * it using power/control in sysfs.
-        */
-       pm_runtime_forbid(dev);
-
        id = 0;
        for_each_available_child_of_node(dev->of_node, child) {
                /* Create per-lane phy */
@@ -2509,13 +2474,10 @@ static int qmp_pcie_probe(struct platform_device *pdev)
        phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
        if (!IS_ERR(phy_provider))
                dev_info(dev, "Registered Qcom-QMP phy\n");
-       else
-               pm_runtime_disable(dev);
 
        return PTR_ERR_OR_ZERO(phy_provider);
 
 err_node_put:
-       pm_runtime_disable(dev);
        of_node_put(child);
        return ret;
 }