diff options
author | Linaro CI <ci_notify@linaro.org> | 2022-01-14 11:50:27 +0000 |
---|---|---|
committer | Linaro CI <ci_notify@linaro.org> | 2022-01-14 11:50:27 +0000 |
commit | fdf75780c2f1f0bf6a20ccbe1724dfc7add1a2db (patch) | |
tree | 0e0eed830d3959393167216f067cec53ff33605c | |
parent | cc2041de7a547e69cd63dff0a3a773d797f40744 (diff) | |
parent | 340e6e4ca6f5bc4f77722528c07ac318c8d71d38 (diff) |
Merge remote-tracking branch 'sm8350-drivers/tracking-qcomlt-sm8350-drivers' into integration-linux-qcomlt
# Conflicts:
# Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.txt
-rw-r--r-- | Documentation/devicetree/bindings/cpufreq/cpufreq-qcom-hw.txt | 4 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.txt | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/cpufreq/cpufreq-qcom-hw.txt b/Documentation/devicetree/bindings/cpufreq/cpufreq-qcom-hw.txt index 9299028ee712..3eb3cee59d79 100644 --- a/Documentation/devicetree/bindings/cpufreq/cpufreq-qcom-hw.txt +++ b/Documentation/devicetree/bindings/cpufreq/cpufreq-qcom-hw.txt @@ -8,7 +8,9 @@ Properties: - compatible Usage: required Value type: <string> - Definition: must be "qcom,cpufreq-hw" or "qcom,cpufreq-epss". + Definition: must be "qcom,cpufreq-hw" or "qcom,cpufreq-epss" + along with SoC specific compatible: + "qcom,sm8350-cpufreq-epss", "qcom,cpufreq-epss" - clocks Usage: required diff --git a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.txt b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.txt index 7a27c500ff63..c834bac70f31 100644 --- a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.txt +++ b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.txt @@ -43,10 +43,16 @@ Required properties: "qcom,pmi8962", "qcom,pmi8994", "qcom,pmi8998", + "qcom,pm8005", + "qcom,pm8350", + "qcom,pm8350b", + "qcom,pm8350c", "qcom,pmk8002", "qcom,pmk8350", "qcom,pmr735a", + "qcom,pmr735b", "qcom,smb2351", + or generalized "qcom,spmi-pmic". - reg: Specifies the SPMI USID slave address for this device. For more information see: |