diff options
| author | Linaro CI <ci_notify@linaro.org> | 2018-10-26 20:07:04 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2018-10-26 20:07:04 +0000 |
| commit | 48c6c28f5782056141bd81785c4420f48bacd18f (patch) | |
| tree | 364e0ae02890858da9ae09cb66acc78c2ea8a6a9 | |
| parent | 3599a77942627f15e3a65c14de8b54c41ce3ee5b (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>, |