Merge 2dc320456d
on remote branch
Change-Id: Idebd4d54f2a6db528f67087110d61b125f3c2ad9
This commit is contained in:
8
Kbuild
8
Kbuild
@@ -21,6 +21,14 @@ ifeq ($(CONFIG_ARCH_TUNA), y)
|
||||
dtbo-y += tuna-vidc.dtbo
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_ARCH_TUNA), y)
|
||||
dtbo-y += tuna-vidc.dtbo
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_ARCH_KERA), y)
|
||||
dtbo-y += kera-vidc.dtbo
|
||||
endif
|
||||
|
||||
always-y := $(dtb-y) $(dtbo-y)
|
||||
subdir-y := $(dts-dirs)
|
||||
clean-files := *.dtb *.dtbo
|
||||
|
19
kera-vidc.dts
Normal file
19
kera-vidc.dts
Normal file
@@ -0,0 +1,19 @@
|
||||
// SPDX-License-Identifier: BSD-3-Clause
|
||||
/*
|
||||
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||
*/
|
||||
/dts-v1/;
|
||||
/plugin/;
|
||||
|
||||
#include <dt-bindings/interrupt-controller/arm-gic.h>
|
||||
#include <dt-bindings/clock/qcom,gcc-kera.h>
|
||||
#include <dt-bindings/interconnect/qcom,kera.h>
|
||||
#include <dt-bindings/clock/qcom,videocc-tuna.h>
|
||||
#include "kera-vidc.dtsi"
|
||||
|
||||
/ {
|
||||
model = "Qualcomm Technologies, Inc. kera";
|
||||
compatible = "qcom,kera";
|
||||
qcom,msm-id = <659 0x10000>, <686 0x10000>;
|
||||
qcom,board-id = <0 0>;
|
||||
};
|
128
kera-vidc.dtsi
Normal file
128
kera-vidc.dtsi
Normal file
@@ -0,0 +1,128 @@
|
||||
// SPDX-License-Identifier: BSD-3-Clause
|
||||
/*
|
||||
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||
*/
|
||||
&soc {
|
||||
msm_vidc: qcom,vidc@aa00000 {
|
||||
compatible = "qcom,kera-vidc";
|
||||
status = "okay";
|
||||
|
||||
/* IOMMU Config */
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
||||
reg = <0x0aa00000 0xF0000>;
|
||||
interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
|
||||
|
||||
/* Power Domains */
|
||||
power-domains = <&videocc VIDEO_CC_MVS0C_GDSC>,
|
||||
<&videocc VIDEO_CC_MVS0_GDSC>;
|
||||
power-domain-names = "iris-ctl", "vcodec";
|
||||
|
||||
/* Clocks */
|
||||
clocks =
|
||||
<&gcc GCC_VIDEO_AXI0_CLK>,
|
||||
<&videocc VIDEO_CC_MVS0C_CLK>,
|
||||
<&videocc VIDEO_CC_MVS0_CLK>,
|
||||
<&videocc VIDEO_CC_MVS0_CLK_SRC>;
|
||||
clock-names =
|
||||
"gcc_video_axi0_clk",
|
||||
"video_cc_mvs0c_clk",
|
||||
"video_cc_mvs0_clk",
|
||||
"video_cc_mvs0_clk_src";
|
||||
|
||||
/* Bus Interconnects */
|
||||
interconnects =
|
||||
<&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_VENUS_CFG>,
|
||||
<&mc_virt MASTER_LLCC &mc_virt SLAVE_EBI1>,
|
||||
<&mmss_noc MASTER_VIDEO_MVP &gem_noc SLAVE_LLCC>;
|
||||
interconnect-names =
|
||||
"venus-cnoc",
|
||||
"venus-ddr",
|
||||
"venus-llcc";
|
||||
|
||||
/* FW load region */
|
||||
memory-region = <&video_mem>;
|
||||
|
||||
/* Clock Resets */
|
||||
resets =
|
||||
<&gcc GCC_VIDEO_AXI0_CLK_ARES>,
|
||||
<&videocc VIDEO_CC_XO_CLK_ARES>,
|
||||
<&videocc VIDEO_CC_MVS0C_CLK_ARES>,
|
||||
<&videocc VIDEO_CC_MVS0_CLK_ARES>;
|
||||
reset-names =
|
||||
"video_axi_reset",
|
||||
"video_xo_reset",
|
||||
"video_mvs0c_reset",
|
||||
"video_mvs0_reset";
|
||||
|
||||
/* MMUs */
|
||||
iommu_region_partition: iommu_region_partition {
|
||||
/* These IOVA regions are unique per context bank */
|
||||
iommu-addresses = <&non_secure_pixel_cb 0x0 0x00100000>,
|
||||
<&non_secure_pixel_cb 0xe0000000 0x20000000>,
|
||||
<&non_secure_cb 0x0 0x25800000>,
|
||||
<&non_secure_cb 0xe0000000 0x20000000>,
|
||||
<&secure_non_pixel_cb 0x0 0x01000000>,
|
||||
<&secure_non_pixel_cb 0x25800000 0xda800000>,
|
||||
<&secure_bitstream_cb 0x0 0x00500000>,
|
||||
<&secure_bitstream_cb 0xe0000000 0x20000000>,
|
||||
<&secure_pixel_cb 0x0 0x00500000>,
|
||||
<&secure_pixel_cb 0xe0000000 0x20000000>;
|
||||
};
|
||||
|
||||
non_secure_pixel_cb: non_secure_pixel_cb {
|
||||
compatible = "qcom,vidc,cb-ns-pxl";
|
||||
iommus = <&apps_smmu 0x1947 0x0000>;
|
||||
memory-region = <&iommu_region_partition>;
|
||||
qcom,iommu-faults = "non-fatal";
|
||||
qcom,iova-best-fit;
|
||||
/* log2 of desired alignment (1MB) - log2 of PAGE_SIZE; (8 = 20 - 12) */
|
||||
qcom,iova-max-align-shift = <8>;
|
||||
dma-coherent;
|
||||
};
|
||||
|
||||
non_secure_cb: non_secure_cb {
|
||||
compatible = "qcom,vidc,cb-ns";
|
||||
iommus = <&apps_smmu 0x1940 0x0000>;
|
||||
memory-region = <&iommu_region_partition>;
|
||||
qcom,iommu-faults = "non-fatal";
|
||||
qcom,iova-best-fit;
|
||||
qcom,iova-max-align-shift = <8>; /* 1 MB */
|
||||
dma-coherent;
|
||||
};
|
||||
|
||||
secure_non_pixel_cb: secure_non_pixel_cb {
|
||||
compatible = "qcom,vidc,cb-sec-non-pxl";
|
||||
iommus = <&apps_smmu 0x1944 0x0000>;
|
||||
memory-region = <&iommu_region_partition>;
|
||||
qcom,iommu-faults = "non-fatal";
|
||||
qcom,iommu-vmid = <0xB>; /* VMID_CP_NON_PIXEL */
|
||||
qcom,iova-best-fit;
|
||||
qcom,iova-max-align-shift = <8>; /* 1 MB */
|
||||
qcom,secure-context-bank;
|
||||
};
|
||||
|
||||
secure_bitstream_cb: secure_bitstream_cb {
|
||||
compatible = "qcom,vidc,cb-sec-bitstream";
|
||||
iommus = <&apps_smmu 0x1941 0x0004>;
|
||||
memory-region = <&iommu_region_partition>;
|
||||
qcom,iommu-faults = "non-fatal";
|
||||
qcom,iommu-vmid = <0x9>; /* VMID_CP_BITSTREAM */
|
||||
qcom,iova-best-fit;
|
||||
qcom,iova-max-align-shift = <8>; /* 1 MB */
|
||||
qcom,secure-context-bank;
|
||||
};
|
||||
|
||||
secure_pixel_cb: secure_pixel_cb {
|
||||
compatible = "qcom,vidc,cb-sec-pxl";
|
||||
iommus = <&apps_smmu 0x1943 0x0000>;
|
||||
memory-region = <&iommu_region_partition>;
|
||||
qcom,iommu-faults = "non-fatal";
|
||||
qcom,iommu-vmid = <0xA>; /* VMID_CP_PIXEL */
|
||||
qcom,iova-best-fit;
|
||||
qcom,iova-max-align-shift = <8>; /* 1 MB */
|
||||
qcom,secure-context-bank;
|
||||
};
|
||||
};
|
||||
};
|
Reference in New Issue
Block a user