summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-02-09 22:09:23 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-02-09 22:09:23 -0800
commitcbbf109dc44a3ce60afa89e95571968cbd3f8f3b (patch)
tree17ad3967b220dd3c513e0243f4ee34243f4f2522 /Documentation
parentd8d3d2d37d89838428d73b55e82d0dd3690a1826 (diff)
parent969473a9e08bfdc2138d21dd36b2594171c3aae0 (diff)
Merge "icnss: Avoid DOMAIN_ATTR_ATOMIC setting during S1 bypass"
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/cnss/icnss.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/cnss/icnss.txt b/Documentation/devicetree/bindings/cnss/icnss.txt
index 15feda3b7407..a1cbf480890a 100644
--- a/Documentation/devicetree/bindings/cnss/icnss.txt
+++ b/Documentation/devicetree/bindings/cnss/icnss.txt
@@ -19,6 +19,7 @@ Required properties:
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
Example:
@@ -43,4 +44,5 @@ Example:
<0 140 0 /* CE10 */ >,
<0 141 0 /* CE11 */ >;
qcom,wlan-msa-memory = <0x200000>;
+ qcom,smmu-s1-bypass;
};