Merge "ARM: dts: msm: Clean-up vidc DT node"

This commit is contained in:
qctecmdr 2020-03-24 05:33:15 -07:00 • committed by Gerrit - the friendly Code Review server
commit 86f7bc57ed

View file

@ -1,7 +1,7 @@
&soc {
msm_vidc: qcom,vidc@aa00000 {
compatible = "qcom,msm-vidc", "qcom,lahaina-vidc";
status = "okay";
msm_vidc: vidc@aa00000 {
compatible = "msm-vidc", "lahaina-vidc";
status = "disabled";
reg = <0x0aa00000 0x00100000>;
interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
@ -22,17 +22,17 @@
clocks = <&clock_gcc GCC_VIDEO_AXI0_CLK>,
<&clock_videocc VIDEO_CC_MVS0C_CLK>,
<&clock_videocc VIDEO_CC_MVS0_CLK>;
qcom,proxy-clock-names = "gcc_video_axi0",
vidc,proxy-clock-names = "gcc_video_axi0",
"core_clk", "vcodec_clk";
/* Mask: Bit0: Clock Scaling, Bit1: Mem Retention*/
qcom,clock-configs = <0x0 0x1 0x1>;
qcom,allowed-clock-rates = <239999999 338000000
vidc,clock-configs = <0x0 0x1 0x1>;
vidc,allowed-clock-rates = <239999999 338000000
366000000 444000000>;
resets = <&clock_gcc GCC_VIDEO_AXI0_CLK_ARES>,
<&clock_videocc VIDEO_CC_MVS0C_CLK_ARES>;
reset-names = "video_axi_reset", "video_core_reset";
qcom,reg-presets = <0xB0088 0x0 0x11>;
vidc,reg-presets = <0xB0088 0x0 0x11>;
/* Bus Interconnects */
interconnect-names = "venus-cnoc", "venus-ddr", "venus-llcc";
@ -43,13 +43,13 @@
<&mmss_noc MASTER_VIDEO_P0
&gem_noc SLAVE_LLCC>;
/* Bus BW range (low, high) for each bus */
qcom,bus-range-kbps = <1000 1000
vidc,bus-range-kbps = <1000 1000
1000 15000000
1000 15000000>;
/* MMUs */
non_secure_cb {
compatible = "qcom,msm-vidc,context-bank";
compatible = "msm-vidc-context-bank";
label = "venus_ns";
iommus = <&apps_smmu 0x2100 0x0400>;
qcom,iommu-dma-addr-pool = <0x25800000 0xba800000>;
@ -60,7 +60,7 @@
};
secure_non_pixel_cb {
compatible = "qcom,msm-vidc,context-bank";
compatible = "msm-vidc-context-bank";
label = "venus_sec_non_pixel";
iommus = <&apps_smmu 0x2104 0x0400>;
qcom,iommu-dma-addr-pool = <0x01000000 0x24800000>;
@ -73,7 +73,7 @@
};
secure_bitstream_cb {
compatible = "qcom,msm-vidc,context-bank";
compatible = "msm-vidc-context-bank";
label = "venus_sec_bitstream";
iommus = <&apps_smmu 0x2101 0x0404>;
qcom,iommu-dma-addr-pool = <0x00500000 0xdfb00000>;
@ -86,7 +86,7 @@
};
secure_pixel_cb {
compatible = "qcom,msm-vidc,context-bank";
compatible = "msm-vidc-context-bank";
label = "venus_sec_pixel";
iommus = <&apps_smmu 0x2103 0x0400>;
qcom,iommu-dma-addr-pool = <0x00500000 0xdfb00000>;