diff options
| author | Sarada Prasanna Garnayak <sgarna@codeaurora.org> | 2017-03-04 12:31:12 +0530 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-06 22:26:09 -0800 |
| commit | 4af1b577f9d9286e6b97cf16299bc004687a2622 (patch) | |
| tree | b2f01b48390926bad10c01b007e556fdab951beb | |
| parent | 783427f7ad16090b68801d1142c20df47bced74b (diff) | |
icnss: set vdd-0.8-cx-mx regulator optional for icnss driver
The wlan firmware is configuring the clk and voltage regulator
for hardware power on and hardware reset sequence.
The icnss platform driver is configuring this clk and regulators
to avoid invalid access to copy engine register during the wlan
recovery.
As platform driver is not configuring this regulator to power on
or reset the WLAN hardware, So no need to define the voltage
regulators are the required properties for the ICNSS platform driver.
Define vdd-0.8-cx-mx as an optional voltage regulator for
the icnss platform driver.
CRs-Fixed: 2014965
Change-Id: I74a1445522997ba4e7a52da5a29e9afb57ad12df
Signed-off-by: Sarada Prasanna Garnayak <sgarna@codeaurora.org>
| -rw-r--r-- | Documentation/devicetree/bindings/cnss/icnss.txt | 12 | ||||
| -rw-r--r-- | drivers/soc/qcom/icnss.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/devicetree/bindings/cnss/icnss.txt b/Documentation/devicetree/bindings/cnss/icnss.txt index 4b70e670798d..c801e8486f87 100644 --- a/Documentation/devicetree/bindings/cnss/icnss.txt +++ b/Documentation/devicetree/bindings/cnss/icnss.txt @@ -17,14 +17,14 @@ Required properties: - iommus: SMMUs and corresponding Stream IDs needed by WLAN - qcom,wlan-smmu-iova-address: I/O virtual address range as <start length> format to be used for allocations associated between WLAN and SMMU - - <supply-name>-supply: phandle to the regulator device tree node - Required "supply-name" is "vdd-0.8-cx-mx". - - qcom,<supply>-config: Specifies voltage levels for supply. Should be - specified in pairs (min, max), units uV. There can - be optional load in uA and Regulator settle delay in - uS. Optional properties: + - <supply-name>-supply: phandle to the regulator device tree node + optional "supply-name" is "vdd-0.8-cx-mx". + - qcom,<supply>-config: Specifies voltage levels for supply. Should be + specified in pairs (min, max), units uV. There can + be optional load in uA and Regulator settle delay in + uS. - qcom,icnss-vadc: VADC handle for vph_pwr read APIs. - qcom,icnss-adc_tm: VADC handle for vph_pwr notification APIs. - qcom,smmu-s1-bypass: Boolean context flag to set SMMU to S1 bypass diff --git a/drivers/soc/qcom/icnss.c b/drivers/soc/qcom/icnss.c index 4e541773c805..0a68eaf79e60 100644 --- a/drivers/soc/qcom/icnss.c +++ b/drivers/soc/qcom/icnss.c @@ -213,7 +213,7 @@ struct icnss_clk_info { }; static struct icnss_vreg_info icnss_vreg_info[] = { - {NULL, "vdd-0.8-cx-mx", 800000, 800000, 0, 0, true}, + {NULL, "vdd-0.8-cx-mx", 800000, 800000, 0, 0, false}, {NULL, "vdd-1.8-xo", 1800000, 1800000, 0, 0, false}, {NULL, "vdd-1.3-rfa", 1304000, 1304000, 0, 0, false}, {NULL, "vdd-3.3-ch0", 3312000, 3312000, 0, 0, false}, |