Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a69fe6c4 authored by Mayank Rana's avatar Mayank Rana
Browse files

usb: phy: Fix compilation errors 



This change fixes compilation errors as below:
1. remove usage of <linux/clk/msm-clk.h> as it is no longer available.
2. remove usage of DP_DM* enums within Linux QUSB PHY driver. call
qusb_phy_enable_power() API directly instead of qusb_phy_update_dpdm() API.
3. remove usage of <linux/usb/msm_hsusb.h> as it is no longer available.

Change-Id: I430f47bfc28f1d3f6b2d332ed63aec7042c890d4
Signed-off-by: default avatarMayank Rana <mrana@codeaurora.org>
parent 83ad5827

drivers/usb/phy/phy-msm-qusb-v2.c

+24 −47
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include <linux/err.h>

#include <linux/slab.h>

#include <linux/clk.h>

#include <linux/clk/msm-clk.h>

#include <linux/delay.h>

#include <linux/io.h>

#include <linux/of.h>
@@ -26,7 +25,6 @@ 
#include <linux/regulator/driver.h>

#include <linux/regulator/machine.h>

#include <linux/usb/phy.h>

#include <linux/usb/msm_hsusb.h>



#define QUSB2PHY_PWR_CTRL1		0x210

#define PWR_CTRL1_POWR_DOWN		BIT(0)
@@ -281,49 +279,6 @@ static int qusb_phy_enable_power(struct qusb_phy *qphy, bool on, 
	return ret;

}



static int qusb_phy_update_dpdm(struct usb_phy *phy, int value)

{

	struct qusb_phy *qphy = container_of(phy, struct qusb_phy, phy);

	int ret = 0;



	dev_dbg(phy->dev, "%s value:%d rm_pulldown:%d\n",

				__func__, value, qphy->rm_pulldown);



	switch (value) {

	case POWER_SUPPLY_DP_DM_DPF_DMF:

		dev_dbg(phy->dev, "POWER_SUPPLY_DP_DM_DPF_DMF\n");

		if (!qphy->rm_pulldown) {

			ret = qusb_phy_enable_power(qphy, true, false);

			if (ret >= 0) {

				qphy->rm_pulldown = true;

				dev_dbg(phy->dev, "DP_DM_F: rm_pulldown:%d\n",

						qphy->rm_pulldown);

			}

		}



		break;



	case POWER_SUPPLY_DP_DM_DPR_DMR:

		dev_dbg(phy->dev, "POWER_SUPPLY_DP_DM_DPR_DMR\n");

		if (qphy->rm_pulldown) {

			ret = qusb_phy_enable_power(qphy, false, false);

			if (ret >= 0) {

				qphy->rm_pulldown = false;

				dev_dbg(phy->dev, "DP_DM_R: rm_pulldown:%d\n",

						qphy->rm_pulldown);

			}

		}

		break;



	default:

		ret = -EINVAL;

		dev_err(phy->dev, "Invalid power supply property(%d)\n", value);

		break;

	}



	return ret;

}



static void qusb_phy_get_tune2_param(struct qusb_phy *qphy)

{

	u8 num_of_bits;
@@ -649,18 +604,40 @@ static int qusb_phy_notify_disconnect(struct usb_phy *phy, 


static int qusb_phy_dpdm_regulator_enable(struct regulator_dev *rdev)

{

	int ret = 0;

	struct qusb_phy *qphy = rdev_get_drvdata(rdev);



	dev_dbg(qphy->phy.dev, "%s\n", __func__);

	return qusb_phy_update_dpdm(&qphy->phy, POWER_SUPPLY_DP_DM_DPF_DMF);



	if (qphy->rm_pulldown) {

		ret = qusb_phy_enable_power(qphy, true, false);

		if (ret >= 0) {

			qphy->rm_pulldown = true;

			dev_dbg(qphy->phy.dev, "dpdm_enable:rm_pulldown:%d\n",

							qphy->rm_pulldown);

		}

	}



	return ret;

}



static int qusb_phy_dpdm_regulator_disable(struct regulator_dev *rdev)

{

	int ret = 0;

	struct qusb_phy *qphy = rdev_get_drvdata(rdev);



	dev_dbg(qphy->phy.dev, "%s\n", __func__);

	return qusb_phy_update_dpdm(&qphy->phy, POWER_SUPPLY_DP_DM_DPR_DMR);



	if (!qphy->rm_pulldown) {

		ret = qusb_phy_enable_power(qphy, false, false);

		if (ret >= 0) {

			qphy->rm_pulldown = false;

			dev_dbg(qphy->phy.dev, "dpdm_disable:rm_pulldown:%d\n",

							qphy->rm_pulldown);

		}

	}



	return ret;

}



static int qusb_phy_dpdm_regulator_is_enabled(struct regulator_dev *rdev)

drivers/usb/phy/phy-msm-qusb.c

+24 −47
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include <linux/err.h>

#include <linux/slab.h>

#include <linux/clk.h>

#include <linux/clk/msm-clk.h>

#include <linux/delay.h>

#include <linux/io.h>

#include <linux/of.h>
@@ -26,7 +25,6 @@ 
#include <linux/regulator/driver.h>

#include <linux/regulator/machine.h>

#include <linux/usb/phy.h>

#include <linux/usb/msm_hsusb.h>



#define QUSB2PHY_PLL_STATUS	0x38

#define QUSB2PHY_PLL_LOCK	BIT(5)
@@ -317,49 +315,6 @@ static int qusb_phy_enable_power(struct qusb_phy *qphy, bool on, 
	return ret;

}



static int qusb_phy_update_dpdm(struct usb_phy *phy, int value)

{

	struct qusb_phy *qphy = container_of(phy, struct qusb_phy, phy);

	int ret = 0;



	dev_dbg(phy->dev, "%s value:%d rm_pulldown:%d\n",

				__func__, value, qphy->rm_pulldown);



	switch (value) {

	case POWER_SUPPLY_DP_DM_DPF_DMF:

		dev_dbg(phy->dev, "POWER_SUPPLY_DP_DM_DPF_DMF\n");

		if (!qphy->rm_pulldown) {

			ret = qusb_phy_enable_power(qphy, true, false);

			if (ret >= 0) {

				qphy->rm_pulldown = true;

				dev_dbg(phy->dev, "DP_DM_F: rm_pulldown:%d\n",

						qphy->rm_pulldown);

			}

		}



		break;



	case POWER_SUPPLY_DP_DM_DPR_DMR:

		dev_dbg(phy->dev, "POWER_SUPPLY_DP_DM_DPR_DMR\n");

		if (qphy->rm_pulldown) {

			ret = qusb_phy_enable_power(qphy, false, false);

			if (ret >= 0) {

				qphy->rm_pulldown = false;

				dev_dbg(phy->dev, "DP_DM_R: rm_pulldown:%d\n",

						qphy->rm_pulldown);

			}

		}

		break;



	default:

		ret = -EINVAL;

		dev_err(phy->dev, "Invalid power supply property(%d)\n", value);

		break;

	}



	return ret;

}



static void qusb_phy_get_tune2_param(struct qusb_phy *qphy)

{

	u8 num_of_bits;
@@ -710,18 +665,40 @@ static int qusb_phy_notify_disconnect(struct usb_phy *phy, 


static int qusb_phy_dpdm_regulator_enable(struct regulator_dev *rdev)

{

	int ret = 0;

	struct qusb_phy *qphy = rdev_get_drvdata(rdev);



	dev_dbg(qphy->phy.dev, "%s\n", __func__);

	return qusb_phy_update_dpdm(&qphy->phy, POWER_SUPPLY_DP_DM_DPF_DMF);



	if (qphy->rm_pulldown) {

		ret = qusb_phy_enable_power(qphy, true, false);

		if (ret >= 0) {

			qphy->rm_pulldown = true;

			dev_dbg(qphy->phy.dev, "dpdm_enable:rm_pulldown:%d\n",

							qphy->rm_pulldown);

		}

	}



	return ret;

}



static int qusb_phy_dpdm_regulator_disable(struct regulator_dev *rdev)

{

	int ret = 0;

	struct qusb_phy *qphy = rdev_get_drvdata(rdev);



	dev_dbg(qphy->phy.dev, "%s\n", __func__);

	return qusb_phy_update_dpdm(&qphy->phy, POWER_SUPPLY_DP_DM_DPR_DMR);



	if (!qphy->rm_pulldown) {

		ret = qusb_phy_enable_power(qphy, false, false);

		if (ret >= 0) {

			qphy->rm_pulldown = false;

			dev_dbg(qphy->phy.dev, "dpdm_disable:rm_pulldown:%d\n",

							qphy->rm_pulldown);

		}

	}



	return ret;

}



static int qusb_phy_dpdm_regulator_is_enabled(struct regulator_dev *rdev)

drivers/usb/phy/phy-msm-ssusb-qmp.c

+0 −2
Original line number Diff line number Diff line
@@ -22,9 +22,7 @@ 
#include <linux/platform_device.h>

#include <linux/regulator/consumer.h>

#include <linux/usb/phy.h>

#include <linux/usb/msm_hsusb.h>

#include <linux/clk.h>

#include <linux/clk/msm-clk.h>



enum core_ldo_levels {

	CORE_LEVEL_NONE = 0,