diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-08-20 01:17:43 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-08-20 01:17:43 -0700 |
| commit | 6187c846cd66236276c44bd4d95a881bc591175c (patch) | |
| tree | d9b42f8666110b41708cff96e5be5eaae9b43a72 /drivers/platform | |
| parent | 4c73d9ccdeb225398b56d547b488817997c94695 (diff) | |
| parent | 71e8c341e21a8b5ed1059557e81e95368de9394b (diff) | |
Merge changes I0236f849,I87b2ac56,Ia7a344e6,I1cace039 into msm-4.4
* changes:
ARM: dts: msm: Add tp rev property for PM660
iio: rradc: Update RRADC USBIN scaling
qpnp: revid: Add support to read TP Rev
ARM: dts: msm: increase PCIe PHY wakeup delay from L1ss for msm8998
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/msm/qpnp-revid.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/platform/msm/qpnp-revid.c b/drivers/platform/msm/qpnp-revid.c index 9ea0b40304eb..0fec8acde96c 100644 --- a/drivers/platform/msm/qpnp-revid.c +++ b/drivers/platform/msm/qpnp-revid.c @@ -27,6 +27,7 @@ #define REVID_SUBTYPE 0x5 #define REVID_STATUS1 0x8 #define REVID_SPARE_0 0x60 +#define REVID_TP_REV 0xf1 #define REVID_FAB_ID 0xf2 #define QPNP_REVID_DEV_NAME "qcom,qpnp-revid" @@ -157,9 +158,9 @@ static size_t build_pmic_string(char *buf, size_t n, int sid, static int qpnp_revid_probe(struct platform_device *pdev) { u8 rev1, rev2, rev3, rev4, pmic_type, pmic_subtype, pmic_status; - u8 option1, option2, option3, option4, spare0, fab_id; + u8 option1, option2, option3, option4, spare0; unsigned int base; - int rc; + int rc, fab_id, tp_rev; char pmic_string[PMIC_STRING_MAXLENGTH] = {'\0'}; struct revid_chip *revid_chip; struct regmap *regmap; @@ -207,6 +208,11 @@ static int qpnp_revid_probe(struct platform_device *pdev) else fab_id = -EINVAL; + if (of_property_read_bool(pdev->dev.of_node, "qcom,tp-rev-valid")) + tp_rev = qpnp_read_byte(regmap, base + REVID_TP_REV); + else + tp_rev = -EINVAL; + revid_chip = devm_kzalloc(&pdev->dev, sizeof(struct revid_chip), GFP_KERNEL); if (!revid_chip) @@ -220,6 +226,7 @@ static int qpnp_revid_probe(struct platform_device *pdev) revid_chip->data.pmic_subtype = pmic_subtype; revid_chip->data.pmic_type = pmic_type; revid_chip->data.fab_id = fab_id; + revid_chip->data.tp_rev = tp_rev; if (pmic_subtype < ARRAY_SIZE(pmic_names)) revid_chip->data.pmic_name = pmic_names[pmic_subtype]; |