Merge "phy: qcom-ufs: Modify the vdd-phy min-max range"

This commit is contained in:
Linux Build Service Account 2016-12-09 19:59:07 -08:00 committed by Gerrit - the friendly Code Review server
commit e9b171cb47

View file

@ -15,8 +15,8 @@
#include "phy-qcom-ufs-i.h" #include "phy-qcom-ufs-i.h"
#define MAX_PROP_NAME 32 #define MAX_PROP_NAME 32
#define VDDA_PHY_MIN_UV 1000000 #define VDDA_PHY_MIN_UV 800000
#define VDDA_PHY_MAX_UV 1000000 #define VDDA_PHY_MAX_UV 925000
#define VDDA_PLL_MIN_UV 1200000 #define VDDA_PLL_MIN_UV 1200000
#define VDDA_PLL_MAX_UV 1800000 #define VDDA_PLL_MAX_UV 1800000
#define VDDP_REF_CLK_MIN_UV 1200000 #define VDDP_REF_CLK_MIN_UV 1200000
@ -239,7 +239,6 @@ ufs_qcom_phy_init_vregulators(struct phy *generic_phy,
struct ufs_qcom_phy *phy_common) struct ufs_qcom_phy *phy_common)
{ {
int err; int err;
int vdda_phy_uV;
err = ufs_qcom_phy_init_vreg(generic_phy, &phy_common->vdda_pll, err = ufs_qcom_phy_init_vreg(generic_phy, &phy_common->vdda_pll,
"vdda-pll"); "vdda-pll");
@ -251,10 +250,6 @@ ufs_qcom_phy_init_vregulators(struct phy *generic_phy,
if (err) if (err)
goto out; goto out;
vdda_phy_uV = regulator_get_voltage(phy_common->vdda_phy.reg);
phy_common->vdda_phy.max_uV = vdda_phy_uV;
phy_common->vdda_phy.min_uV = vdda_phy_uV;
/* vddp-ref-clk-* properties are optional */ /* vddp-ref-clk-* properties are optional */
__ufs_qcom_phy_init_vreg(generic_phy, &phy_common->vddp_ref_clk, __ufs_qcom_phy_init_vreg(generic_phy, &phy_common->vddp_ref_clk,
"vddp-ref-clk", true); "vddp-ref-clk", true);