Merge 7ba24419a1 on remote branch

Change-Id: I97060656a62b597cad1bf26ec2dc1b26bef97d2a
This commit is contained in:
Linux Build Service Account
2022-02-28 12:16:30 -08:00

View File

@@ -1,7 +1,7 @@
&soc {
msm_vidc: qcom,vidc@aa00000 {
compatible = "qcom,msm-vidc", "qcom,msm-vidc-kalama", "qcom,msm-vidc-iris3";
status = "disabled";
status = "okay";
reg = <0x0aa00000 0xF0000>;
interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
@@ -34,9 +34,8 @@
qcom,clock-configs = <0x0 0x0 0x0 0x1>;
qcom,allowed-clock-rates = <239999999 338000000
366000000 444000000>;
resets = <&gcc GCC_VIDEO_AXI0_CLK_ARES>,
<&videocc VIDEO_CC_MVS0C_CLK_ARES>;
reset-names = "video_axi_reset", "video_core_reset";
resets = <&gcc GCC_VIDEO_AXI0_CLK_ARES>;
reset-names = "video_axi_reset";
qcom,reg-presets = <0xB0088 0x0 0x11>;