Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions arch/arm64/boot/dts/qcom/lemans-auto.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,7 @@
};
};
};

&iris {
firmware-name = "qcom/vpu/vpu30_p4_s6.mbn";
};
2 changes: 0 additions & 2 deletions arch/arm64/boot/dts/qcom/lemans-ride-common.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -580,8 +580,6 @@
};

&iris {
firmware-name = "qcom/vpu/vpu30_p4_s6.mbn";

status = "okay";
};

Expand Down
7 changes: 5 additions & 2 deletions arch/arm64/boot/dts/qcom/lemans.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include <dt-bindings/interconnect/qcom,osm-l3.h>
#include <dt-bindings/interconnect/qcom,sa8775p-rpmh.h>
#include <dt-bindings/mailbox/qcom-ipcc.h>
#include <dt-bindings/media/qcom,sm8550-iris.h>
#include <dt-bindings/firmware/qcom,scm.h>
#include <dt-bindings/power/qcom-rpmpd.h>
#include <dt-bindings/soc/qcom,gpr.h>
Expand Down Expand Up @@ -4617,11 +4618,13 @@

memory-region = <&pil_video_mem>;

firmware-name = "qcom/vpu/vpu30_p4_s6_16mb.mbn";

resets = <&gcc GCC_VIDEO_AXI0_CLK_ARES>;
reset-names = "bus";

iommus = <&apps_smmu 0x0880 0x0400>,
<&apps_smmu 0x0887 0x0400>;
iommu-map = <IRIS_NON_PIXEL_VCODEC &apps_smmu 0x0880 0x0400 0x1>,
<IRIS_PIXEL &apps_smmu 0x0887 0x0400 0x1>;
dma-coherent;

status = "disabled";
Expand Down