diff options
| author | Linaro CI <ci_notify@linaro.org> | 2021-01-19 23:21:10 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2021-01-19 23:21:10 +0000 |
| commit | cc6b07905167a56a5f75a5a0a7caaf81e6d4de0d (patch) | |
| tree | 3dc473a76d381f704781f8812c073fdf0017d153 | |
| parent | 9226983c1eb18192f107fd1f826f0901ef7bf91e (diff) | |
| parent | 7d06369cc9673c233bdaa3003dc2dbce4e370659 (diff) | |
Merge remote-tracking branch '8996-power-domain/tracking-qcomlt-8996-power-domain' into integration-linux-qcomlt
# Conflicts:
# arch/arm64/boot/dts/qcom/msm8996.dtsi
| -rw-r--r-- | arch/arm64/boot/dts/qcom/msm8996.dtsi | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index bc19fc80cdec..5150e7be8737 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -154,6 +154,11 @@ no-map; }; + slpi_region: slpi@90b00000 { + reg = <0x0 0x90b00000 0x0 0xa00000>; + no-map; + }; + venus_region: venus@90400000 { reg = <0x0 0x90400000 0x0 0x700000>; no-map; @@ -1004,8 +1009,7 @@ "ispif", "vfe0", "vfe1"; - power-domains = <&mmcc VFE0_GDSC>, - <&mmcc VFE1_GDSC>; + power-domains = <&mmcc VFE0_GDSC>; clocks = <&mmcc CAMSS_TOP_AHB_CLK>, <&mmcc CAMSS_ISPIF_AHB_CLK>, <&mmcc CAMSS_CSI0PHYTIMER_CLK>, @@ -2499,5 +2503,3 @@ }; }; #include "msm8996-pins.dtsi" -#include "pm8994.dtsi" -#include "pmi8994.dtsi" |