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

Commit 4b7a5c69 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "icnss: set vdd-0.8-cx-mx regulator optional for icnss driver"

parents 0d8cb867 4af1b577

Documentation/devicetree/bindings/cnss/icnss.txt

+6 −6
Original line number Diff line number Diff line
@@ -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



Optional properties:

  - <supply-name>-supply: phandle to the regulator device tree node

                          Required "supply-name" is "vdd-0.8-cx-mx".

			   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.



Optional properties:

  - 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

drivers/soc/qcom/icnss.c

+1 −1
Original line number Diff line number Diff line
@@ -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},