diff options
| author | Linaro CI <ci_notify@linaro.org> | 2021-03-08 10:35:42 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2021-03-08 10:35:42 +0000 |
| commit | 8bc4d52cf69330b36ffd276dc047b40601b2136b (patch) | |
| tree | deb11820019c8bdad026a3daf0bfe4c400d15a94 | |
| parent | 9570dff69ef3ebc5cb38cb158b86d35c733347bc (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 f38dcebd4b1a..3690792ff3e2 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; @@ -1008,8 +1013,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>, @@ -2503,5 +2507,3 @@ }; }; #include "msm8996-pins.dtsi" -#include "pm8994.dtsi" -#include "pmi8994.dtsi" |