Merge 7716342d0b on remote branch

Change-Id: I7f122b37cb201ac5900ca7afeda7797d1534b0ab
This commit is contained in:
Linux Build Service Account
2024-04-09 08:50:23 -07:00
4 changed files with 22 additions and 2 deletions

4
Kbuild
View File

@@ -18,6 +18,10 @@ ifeq ($(CONFIG_ARCH_NEO), y)
dtbo-y += neo-vidc.dtbo
endif
ifeq ($(CONFIG_ARCH_BENGAL), y)
dtbo-y += bengal-vidc.dtbo
endif
ifeq ($(CONFIG_ARCH_KHAJE), y)
dtbo-y += khaje-vidc.dtbo
dtbo-y += khaje-vidc-iot.dtbo

15
bengal-vidc.dts Normal file
View File

@@ -0,0 +1,15 @@
/dts-v1/;
/plugin/;
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/clock/qcom,gcc-sm6115.h>
#include <dt-bindings/interconnect/qcom,bengal.h>
#include <dt-bindings/clock/qcom,sm6115-gpucc.h>
#include "khaje-vidc.dtsi"
/ {
model = "Qualcomm Technologies, Inc. Bengal SoC";
compatible = "qcom,bengal";
qcom,msm-id = <417 0x10000>, <444 0x10000>;
qcom,board-id = <0 0>;
};

View File

@@ -1,6 +1,7 @@
&soc {
msm_vidc: qcom,vidc@5a00000 {
compatible = "qcom,msm-vidc","qcom,msm-vidc-khaje", "qcom,msm-vidc-ar50lt";
compatible = "qcom,msm-vidc","qcom,msm-vidc-khaje", "qcom,msm-vidc-bengal",
"qcom,msm-vidc-ar50lt";
status = "okay";
reg = <0x5a00000 0x200000>;
interrupts = <GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>;

View File

@@ -10,6 +10,6 @@
/ {
model = "Qualcomm Technologies, Inc. Ravelin SoC";
compatible = "qcom,ravelin";
qcom,msm-id = <568 0x10000>, <602 0x10000>, <581 0x10000>, <582 0x10000>;
qcom,msm-id = <568 0x10000>, <602 0x10000>, <581 0x10000>, <582 0x10000>, <653 0x10000>, <654 0x10000>;
qcom,board-id = <0 0>, <0 0x600>, <0 0x601>, <0x10022 0x0>;
};