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

Commit 835f3675 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes Ide5470ae,I5d6203c4 into msm-next 

* changes:
  defconfig: arm64: enable msm_npu
  ARM: dts: msm: add npu configuration for SDM855
parents ce8e484e 12e35173

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

0 → 100644
+33 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



&soc {

	msm_npu: qcom,msm_npu {

		compatible = "qcom,msm-npu";

		status = "ok";

		reg = <0x9800000 0x800000>;

		reg-names = "npu_base";

		interrupts = <0 346 0>;

		clocks = <&clock_npucc NPU_CC_XO_CLK>,

					<&clock_npucc NPU_CC_NPU_CORE_CLK>,

					<&clock_npucc NPU_CC_CAL_DP_CLK>,

					<&clock_npucc NPU_CC_ARMWIC_CORE_CLK>,

					<&clock_npucc NPU_CC_COMP_NOC_AXI_CLK>,

					<&clock_npucc NPU_CC_CONF_NOC_AHB_CLK>;

		clock-names = "xo", "core", "cal_dp", "armwic",

						"axi", "ahb";

		vdd-supply = <&npu_core_gdsc>;

		vdd_cx-supply = <&pm855l_s6_level>;

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

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

	};

};

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

+1 −0
Original line number Diff line number Diff line
@@ -1903,3 +1903,4 @@ 
#include "sdm855-coresight.dtsi"

#include "msm-arm-smmu-sdm855.dtsi"

#include "sdm855-qupv3.dtsi"

#include "sdm855-npu.dtsi"

arch/arm64/configs/sdm855-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -277,6 +277,7 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y 
CONFIG_VIDEO_ADV_DEBUG=y

CONFIG_VIDEO_FIXED_MINOR_RANGES=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_MSM_NPU=y

CONFIG_FB=y

CONFIG_FB_ARMCLCD=y

CONFIG_LOGO=y

arch/arm64/configs/sdm855_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -288,6 +288,7 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y 
CONFIG_VIDEO_ADV_DEBUG=y

CONFIG_VIDEO_FIXED_MINOR_RANGES=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_MSM_NPU=y

CONFIG_FB=y

CONFIG_FB_VIRTUAL=y

CONFIG_LOGO=y