Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02b92966 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig:kona: Add support for NPU driver"

parents 2dd061a8 2fdc9bae

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

0 → 100644
+328 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2019, The Linux Foundation. All rights reserved.

 */



&soc {

	msm_npu: qcom,msm_npu@9800000 {

		compatible = "qcom,msm-npu";

		status = "ok";

		reg = <0x9900000 0x20000>,

			<0x99F0000 0x10000>,

			<0x9800000 0x100000>,

			<0x17c00000 0x10000>;

		reg-names = "tcm", "core", "qdsp", "apss_shared";

		interrupts = <GIC_SPI 364 IRQ_TYPE_EDGE_RISING>,

				<GIC_SPI 366 IRQ_TYPE_EDGE_RISING>,

				<GIC_SPI 368 IRQ_TYPE_EDGE_RISING>;

		interrupt-names = "error_irq", "wdg_bite_irq", "ipc_irq";

		iommus = <&apps_smmu 0x1081 0x400>, <&apps_smmu 0x1082 0x400>,

			<&apps_smmu 0x10A1 0x400>, <&apps_smmu 0x10A2 0x400>;



		clocks = <&clock_npucc NPU_CC_XO_CLK>,

				<&clock_npucc NPU_CC_CORE_CLK>,

				<&clock_npucc NPU_CC_CAL_HM0_CLK>,

				<&clock_npucc NPU_CC_CAL_HM1_CLK>,

				<&clock_npucc NPU_CC_CAL_HM0_CDC_CLK>,

				<&clock_npucc NPU_CC_CAL_HM1_CDC_CLK>,

				<&clock_npucc NPU_CC_NOC_AXI_CLK>,

				<&clock_npucc NPU_CC_NOC_AHB_CLK>,

				<&clock_npucc NPU_CC_NOC_DMA_CLK>,

				<&clock_npucc NPU_CC_LLM_CLK>,

				<&clock_npucc NPU_CC_LLM_XO_CLK>,

				<&clock_npucc NPU_CC_LLM_TEMP_CLK>,

				<&clock_npucc NPU_CC_LLM_CURR_CLK>,

				<&clock_npucc NPU_CC_DL_LLM_CLK>,

				<&clock_npucc NPU_CC_ISENSE_CLK>,

				<&clock_npucc NPU_CC_DPM_CLK>,

				<&clock_npucc NPU_CC_DPM_XO_CLK>,

				<&clock_npucc NPU_CC_DL_DPM_CLK>,

				<&clock_npucc NPU_CC_RSC_XO_CLK>,

				<&clock_npucc NPU_CC_DPM_TEMP_CLK>,

				<&clock_npucc NPU_CC_CAL_HM0_DPM_IP_CLK>,

				<&clock_npucc NPU_CC_CAL_HM1_DPM_IP_CLK>,

				<&clock_npucc NPU_CC_DSP_AHBS_CLK>,

				<&clock_npucc NPU_CC_DSP_AHBM_CLK>,

				<&clock_npucc NPU_CC_DSP_AXI_CLK>,

				<&clock_npucc NPU_CC_DSP_BWMON_CLK>,

				<&clock_npucc NPU_CC_DSP_BWMON_AHB_CLK>,

				<&clock_npucc NPU_CC_ATB_CLK>,

				<&clock_npucc NPU_CC_S2P_CLK>,

				<&clock_npucc NPU_CC_BWMON_CLK>,

				<&clock_npucc NPU_CC_CAL_HM0_PERF_CNT_CLK>,

				<&clock_npucc NPU_CC_CAL_HM1_PERF_CNT_CLK>,

				<&clock_npucc NPU_CC_BTO_CORE_CLK>;

		clock-names = "xo_clk",

				"npu_core_clk",

				"cal_hm0_clk",

				"cal_hm1_clk",

				"cal_hm0_cdc_clk",

				"cal_hm1_cdc_clk",

				"axi_clk",

				"ahb_clk",

				"dma_clk",

				"llm_clk",

				"llm_xo_clk",

				"llm_temp_clk",

				"llm_curr_clk",

				"dl_llm_clk",

				"isense_clk",

				"dpm_clk",

				"dpm_xo_clk",

				"dl_dpm_clk",

				"rsc_xo_clk",

				"dpm_temp_clk",

				"cal_hm0_dpm_ip_clk",

				"cal_hm1_dpm_ip_clk",

				"dsp_ahbs_clk",

				"dsp_ahbm_clk",

				"dsp_axi_clk",

				"dsp_bwmon_clk",

				"dsp_bwmon_ahb_clk",

				"atb_clk",

				"s2p_clk",

				"bwmon_clk",

				"cal_hm0_perf_cnt_clk",

				"cal_hm1_perf_cnt_clk",

				"bto_core_clk";



		vdd-supply = <&npu_core_gdsc>;

		vdd_cx-supply = <&VDD_CX_LEVEL>;

		qcom,proxy-reg-names ="vdd", "vdd_cx";

		qcom,vdd_cx-uV-uA = <RPMH_REGULATOR_LEVEL_TURBO 100000>;

		#cooling-cells = <2>;

		qcom,npu-pwrlevels {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "qcom,npu-pwrlevels";

			initial-pwrlevel = <4>;

			qcom,npu-pwrlevel@0 {

				reg = <0>;

				vreg = <0>;

				clk-freq = <19200000

					60000000

					200000000

					200000000

					200000000

					200000000

					120000000

					20000000

					200000000

					60000000

					19200000

					50000000

					50000000

					60000000

					60000000

					60000000

					19200000

					60000000

					19200000

					50000000

					200000000

					200000000

					60000000

					60000000

					120000000

					19200000

					60000000

					30000000

					50000000

					19200000

					200000000

					200000000

					19200000>;

			};



			qcom,npu-pwrlevel@1 {

				reg = <1>;

				vreg = <1>;

				clk-freq = <19200000

					100000000

					300000000

					300000000

					300000000

					300000000

					200000000

					40000000

					300000000

					100000000

					19200000

					50000000

					50000000

					100000000

					100000000

					100000000

					19200000

					100000000

					19200000

					50000000

					200000000

					200000000

					100000000

					100000000

					200000000

					19200000

					100000000

					60000000

					50000000

					19200000

					300000000

					300000000

					19200000>;

			};



			qcom,npu-pwrlevel@2 {

				reg = <2>;

				vreg = <2>;

				clk-freq = <19200000

					200000000

					466000000

					466000000

					466000000

					466000000

					267000000

					40000000

					403000000

					200000000

					19200000

					50000000

					50000000

					200000000

					200000000

					200000000

					19200000

					200000000

					19200000

					50000000

					466000000

					466000000

					200000000

					200000000

					267000000

					19200000

					200000000

					120000000

					50000000

					19200000

					466000000

					466000000

					19200000>;

			};



			qcom,npu-pwrlevel@3 {

				reg = <3>;

				vreg = <3>;

				clk-freq = <19200000

					333000000

					533000000

					533000000

					533000000

					533000000

					403000000

					75000000

					533000000

					214000000

					19200000

					50000000

					100000000

					214000000

					214000000

					214000000

					19200000

					214000000

					19200000

					50000000

					533000000

					533000000

					333000000

					333000000

					403000000

					19200000

					333000000

					240000000

					50000000

					19200000

					533000000

					533000000

					19200000>;

			};



			qcom,npu-pwrlevel@4 {

				reg = <4>;

				vreg = <4>;

				clk-freq = <19200000

					428000000

					850000000

					850000000

					850000000

					850000000

					533000000

					75000000

					700000000

					300000000

					19200000

					100000000

					200000000

					300000000

					300000000

					300000000

					19200000

					300000000

					19200000

					100000000

					850000000

					850000000

					428000000

					428000000

					533000000

					19200000

					428000000

					240000000

					100000000

					19200000

					850000000

					850000000

					19200000>;

			};



			qcom,npu-pwrlevel@5 {

				reg = <5>;

				vreg = <6>;

				clk-freq = <19200000

					500000000

					1000000000

					1000000000

					1000000000

					1000000000

					700000000

					75000000

					806000000

					300000000

					19200000

					100000000

					200000000

					300000000

					300000000

					300000000

					19200000

					300000000

					19200000

					100000000

					1000000000

					1000000000

					500000000

					500000000

					700000000

					19200000

					500000000

					30000000

					100000000

					19200000

					1000000000

					1000000000

					19200000>;

			};

		};

	};

};

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

+1 −0
Original line number Diff line number Diff line
@@ -2833,3 +2833,4 @@ 
#include "kona-thermal.dtsi"

#include "kona-vidc.dtsi"

#include "kona-cvp.dtsi"

#include "kona-npu.dtsi"

arch/arm64/configs/vendor/kona-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -353,6 +353,7 @@ CONFIG_MSM_CVP_V4L2=y 
CONFIG_MSM_SDE_ROTATOR=y

CONFIG_MSM_SDE_ROTATOR_EVTLOG_DEBUG=y

CONFIG_MSM_VIDC_V4L2=y

CONFIG_MSM_NPU=y

CONFIG_DRM=y

CONFIG_DRM_MSM_REGISTER_LOGGING=y

CONFIG_FB_ARMCLCD=y

arch/arm64/configs/vendor/kona_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -362,6 +362,7 @@ CONFIG_MSM_CVP_V4L2=y 
CONFIG_MSM_SDE_ROTATOR=y

CONFIG_MSM_SDE_ROTATOR_EVTLOG_DEBUG=y

CONFIG_MSM_VIDC_V4L2=y

CONFIG_MSM_NPU=y

CONFIG_DRM=y

CONFIG_DRM_MSM_REGISTER_LOGGING=y

CONFIG_FB_VIRTUAL=y