Merge "ARM: dts: msm: Add CVP device for Kona" (5c9f5694) · Commits · e / devices / android_kernel_fairphone_FP4

arch/arm64/boot/dts/qcom/kona-cvp.dtsi

0 → 100644

+92 −0

Original line number	Original line	Diff line number	Diff line
			// SPDX-License-Identifier: GPL-2.0-only
			/*
			* Copyright (c) 2019, The Linux Foundation. All rights reserved.
			*/

			#include <dt-bindings/interrupt-controller/arm-gic.h>
			#include <dt-bindings/msm/msm-bus-ids.h>
			#include <dt-bindings/clock/qcom,videocc-kona.h>

			&soc {
			msm_cvp: qcom,cvp@ab00000 {
			compatible = "qcom,msm-cvp", "qcom,kona-cvp";
			status = "ok";
			reg = <0xab00000 0x100000>;
			interrupts = <GIC_SPI 234 IRQ_TYPE_LEVEL_HIGH>;

			/* Supply */
			cvp-supply = <&mvs1_gdsc>;

			/* Clocks */
			clock-names = "gcc_video_axi0",
			"gcc_video_axi1", "cvp_clk";
			clocks = <&clock_gcc GCC_VIDEO_AXI0_CLK>,
			<&clock_gcc GCC_VIDEO_AXI1_CLK>,
			<&clock_videocc VIDEO_CC_MVS1_CLK>;
			qcom,proxy-clock-names = "gcc_video_axi0", "gcc_video_axi1",
			"cvp_clk";

			qcom,clock-configs = <0x0 0x0 0x1>;
			qcom,allowed-clock-rates = <403000000 520000000
			549000000 666000000 800000000>;

			/* Buses */
			bus_cnoc {
			compatible = "qcom,msm-cvp,bus";
			label = "cnoc";
			qcom,bus-master = <MSM_BUS_MASTER_AMPSS_M0>;
			qcom,bus-slave = <MSM_BUS_SLAVE_VENUS_CFG>;
			qcom,bus-governor = "performance";
			qcom,bus-range-kbps = <1000 1000>;
			};

			venus_bus_ddr {
			compatible = "qcom,msm-cvp,bus";
			label = "venus-ddr";
			qcom,bus-master = <MSM_BUS_MASTER_VIDEO_P0>;
			qcom,bus-slave = <MSM_BUS_SLAVE_EBI_CH0>;
			qcom,bus-governor = "performance";
			qcom,bus-range-kbps = <1000 6533000>;
			};

			/* MMUs */
			non_secure_cb {
			compatible = "qcom,msm-cvp,context-bank";
			label = "cvp_hlos";
			iommus =
			<&apps_smmu 0x2120 0x400>;
			qcom,iommu-dma = "disabled";
			buffer-types = <0xfff>;
			virtual-addr-pool = <0x4b000000 0x90000000>;
			};


			secure_nonpixel_cb {
			compatible = "qcom,msm-cvp,context-bank";
			label = "cvp_sec_nonpixel";
			iommus =
			<&apps_smmu 0x2124 0x400>;
			qcom,iommu-dma = "disabled";
			buffer-types = <0x241>;
			virtual-addr-pool = <0x01000000 0x25800000>;
			qcom,secure-context-bank;
			};

			secure_pixel_cb {
			compatible = "qcom,msm-cvp,context-bank";
			label = "cvp_sec_pixel";
			iommus =
			<&apps_smmu 0x2123 0x400>;
			qcom,iommu-dma = "disabled";
			buffer-types = <0x106>;
			virtual-addr-pool = <0x25800000 0x25800000>;
			qcom,secure-context-bank;
			};

			/* Memory Heaps */
			qcom,msm-cvp,mem_cdsp {
			compatible = "qcom,msm-cvp,mem-cdsp";
			memory-region = <&cdsp_mem>;
			};
			};
			};

arch/arm64/boot/dts/qcom/kona.dtsi

+19 −1

Original line number	Original line	Diff line number	Diff line
	@@ -402,6 +402,14 @@
	size = <0x0 0x1000000>;		size = <0x0 0x1000000>;
	};		};

			cdsp_mem: cdsp_region {
			compatible = "shared-dma-pool";
			alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
			reusable;
			alignment = <0x0 0x400000>;
			size = <0x0 0x400000>;
			};

	dump_mem: mem_dump_region {		dump_mem: mem_dump_region {
	compatible = "shared-dma-pool";		compatible = "shared-dma-pool";
	reusable;		reusable;
	@@ -1775,6 +1783,16 @@
	mbox-names = "spss-pil";		mbox-names = "spss-pil";
	};		};

			qcom,cvpss@abb0000 {
			compatible = "qcom,pil-tz-generic";
			reg = <0xabb0000 0x2000>;
			status = "ok";
			qcom,pas-id = <25>;
			qcom,firmware-name = "cvpss";

			memory-region = <&pil_cvp_mem>;
			};

	qcom,npu@9800000 {		qcom,npu@9800000 {
	compatible = "qcom,pil-tz-generic";		compatible = "qcom,pil-tz-generic";
	reg = <0x9800000 0x800000>;		reg = <0x9800000 0x800000>;
	@@ -2081,4 +2099,4 @@
	#include "kona-qupv3.dtsi"		#include "kona-qupv3.dtsi"
	#include "kona-thermal.dtsi"		#include "kona-thermal.dtsi"
	#include "kona-vidc.dtsi"		#include "kona-vidc.dtsi"
			#include "kona-cvp.dtsi"