diff options
author | Linaro CI <ci_notify@linaro.org> | 2018-09-10 01:21:00 +0000 |
---|---|---|
committer | Linaro CI <ci_notify@linaro.org> | 2018-09-10 01:21:00 +0000 |
commit | 4f6492d3b9d06817674bb5cde7a4742d2651aa85 (patch) | |
tree | de3ef9d4f70de5a34cc91da46a108c5fb78e94fe | |
parent | 1eb3518a5f78daf59e0a7a01a88113a7eba20ca9 (diff) | |
parent | faab599884b81758880562fc170ee8142187e213 (diff) |
Merge remote-tracking branch 'sdm845-aoss-cc/qcomlt/aoss-cc' into integration-linux-qcomlt
-rw-r--r-- | arch/arm64/boot/dts/qcom/sdm845.dtsi | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index 0c9a2aa6a1b5..077760792cf0 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -9,6 +9,7 @@ #include <dt-bindings/clock/qcom,rpmh.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/soc/qcom,rpmh-rsc.h> +#include <dt-bindings/reset/qcom,sdm845-aoss.h> / { interrupt-parent = <&intc>; @@ -978,6 +979,12 @@ #thermal-sensor-cells = <1>; }; + aoss_reset: reset-controller@c2a0000 { + compatible = "qcom,sdm845-aoss-cc"; + reg = <0xc2a0000 0x31000>; + #reset-cells = <1>; + }; + spmi_bus: spmi@c440000 { compatible = "qcom,spmi-pmic-arb"; reg = <0xc440000 0x1100>, |