usb: phy: msm: Vote for corner of VDD CX instead of voltage of VDD CX

New platform uses RBCPR hardware feature, with that voting for
absolute voltage of VDD CX is not required. Hence vote for corner of
VDD CX which uses nominal corner voltage on VDD CX.

Signed-off-by: Ivan T. Ivanov <iivanov@mm-sol.com>
Cc: Mayank Rana <mrana@codeaurora.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/Documentation/devicetree/bindings/usb/msm-hsusb.txt b/Documentation/devicetree/bindings/usb/msm-hsusb.txt
index 066966706ca11e840f4c74d8c1928696016c42dd..2826f2af503a2ca79381507b4b583aaae3a23660 100644 (file)
--- a/Documentation/devicetree/bindings/usb/msm-hsusb.txt
+++ b/Documentation/devicetree/bindings/usb/msm-hsusb.txt
@@ -65,6 +65,10 @@ Optional properties:
                 Some platforms may have configuration to allow USB
                 controller work with any of the two HSPHYs present.
 
+- qcom,vdd-levels: This property must be a list of three integer values
+                (no, min, max) where each value represents either a voltage
+                in microvolts or a value corresponding to voltage corner.
+
 Example HSUSB OTG controller device node:
 
     usb@f9a55000 {
@@ -87,4 +91,5 @@ Example HSUSB OTG controller device node:
 
         qcom,otg-control = <1>;
         qcom,phy-init-sequence = < -1 0x63 >;
+        qcom,vdd-levels = <1 5 7>;
        };

diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c
index 366527ecbdd1fc58c3f5814be17041b1fbfe2d34..8e7956eb8a7770d40a07fc162b65b2832bd3f950 100644 (file)
--- a/drivers/usb/phy/phy-msm-usb.c
+++ b/drivers/usb/phy/phy-msm-usb.c
@@ -62,6 +62,13 @@
 
 #define USB_PHY_VDD_DIG_VOL_MIN        1000000 /* uV */
 #define USB_PHY_VDD_DIG_VOL_MAX        1320000 /* uV */
+#define USB_PHY_SUSP_DIG_VOL   500000  /* uV */
+
+enum vdd_levels {
+       VDD_LEVEL_NONE = 0,
+       VDD_LEVEL_MIN,
+       VDD_LEVEL_MAX,
+};
 
 static int msm_hsusb_init_vddcx(struct msm_otg *motg, int init)
 {
@@ -69,8 +76,8 @@ static int msm_hsusb_init_vddcx(struct msm_otg *motg, int init)
 
        if (init) {
                ret = regulator_set_voltage(motg->vddcx,
-                               USB_PHY_VDD_DIG_VOL_MIN,
-                               USB_PHY_VDD_DIG_VOL_MAX);
+                               motg->vdd_levels[VDD_LEVEL_MIN],
+                               motg->vdd_levels[VDD_LEVEL_MAX]);
                if (ret) {
                        dev_err(motg->phy.dev, "Cannot set vddcx voltage\n");
                        return ret;
@@ -81,7 +88,7 @@ static int msm_hsusb_init_vddcx(struct msm_otg *motg, int init)
                        dev_err(motg->phy.dev, "unable to enable hsusb vddcx\n");
        } else {
                ret = regulator_set_voltage(motg->vddcx, 0,
-                       USB_PHY_VDD_DIG_VOL_MAX);
+                               motg->vdd_levels[VDD_LEVEL_MAX]);
                if (ret)
                        dev_err(motg->phy.dev, "Cannot set vddcx voltage\n");
                ret = regulator_disable(motg->vddcx);
@@ -435,17 +442,16 @@ static int msm_phy_init(struct usb_phy *phy)
 
 #ifdef CONFIG_PM
 
-#define USB_PHY_SUSP_DIG_VOL  500000
 static int msm_hsusb_config_vddcx(struct msm_otg *motg, int high)
 {
-       int max_vol = USB_PHY_VDD_DIG_VOL_MAX;
+       int max_vol = motg->vdd_levels[VDD_LEVEL_MAX];
        int min_vol;
        int ret;
 
        if (high)
-               min_vol = USB_PHY_VDD_DIG_VOL_MIN;
+               min_vol = motg->vdd_levels[VDD_LEVEL_MIN];
        else
-               min_vol = USB_PHY_SUSP_DIG_VOL;
+               min_vol = motg->vdd_levels[VDD_LEVEL_NONE];
 
        ret = regulator_set_voltage(motg->vddcx, min_vol, max_vol);
        if (ret) {
@@ -1441,7 +1447,7 @@ static int msm_otg_read_dt(struct platform_device *pdev, struct msm_otg *motg)
        struct device_node *node = pdev->dev.of_node;
        struct property *prop;
        int len, ret, words;
-       u32 val;
+       u32 val, tmp[3];
 
        pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
        if (!pdata)
@@ -1472,6 +1478,19 @@ static int msm_otg_read_dt(struct platform_device *pdev, struct msm_otg *motg)
        if (!of_property_read_u32(node, "qcom,phy-num", &val) && val < 2)
                motg->phy_number = val;
 
+       motg->vdd_levels[VDD_LEVEL_NONE] = USB_PHY_SUSP_DIG_VOL;
+       motg->vdd_levels[VDD_LEVEL_MIN] = USB_PHY_VDD_DIG_VOL_MIN;
+       motg->vdd_levels[VDD_LEVEL_MAX] = USB_PHY_VDD_DIG_VOL_MAX;
+
+       if (of_get_property(node, "qcom,vdd-levels", &len) &&
+           len == sizeof(tmp)) {
+               of_property_read_u32_array(node, "qcom,vdd-levels",
+                                          tmp, len / sizeof(*tmp));
+               motg->vdd_levels[VDD_LEVEL_NONE] = tmp[VDD_LEVEL_NONE];
+               motg->vdd_levels[VDD_LEVEL_MIN] = tmp[VDD_LEVEL_MIN];
+               motg->vdd_levels[VDD_LEVEL_MAX] = tmp[VDD_LEVEL_MAX];
+       }
+
        prop = of_find_property(node, "qcom,phy-init-sequence", &len);
        if (!prop || !len)
                return 0;

diff --git a/include/linux/usb/msm_hsusb.h b/include/linux/usb/msm_hsusb.h
index 4628f1a4713e7cebffb8877dec479b269ed81971..b0a39243295a326665de913b38b6857c209e7a19 100644 (file)
--- a/include/linux/usb/msm_hsusb.h
+++ b/include/linux/usb/msm_hsusb.h
@@ -169,6 +169,7 @@ struct msm_otg {
 
        struct reset_control *phy_rst;
        struct reset_control *link_rst;
+       int vdd_levels[3];
 };
 
 #endif