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

Commit 4bcbd3c0 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add NVMe for sa8195p adp board"

parents 5a2564a7 9b639742

arch/arm64/boot/dts/qcom/sa8195p-adp-star.dtsi

+38 −0
Original line number Diff line number Diff line
@@ -92,3 +92,41 @@ 
&ssc_sensors {

	status = "disabled";

};



&pcie2 {

	qcom,boot-option = <0x0>;

};



&pcie_rc2 {

	nvme_x8: qcom,nvme@pcie_rc2 {

		reg = <0 0 0 0 0>;

		compatible = "qcom,nvme";

		pci-ids =

			"8086:0953",

			"8086:0a54",

			"8086:0a55",

			"8086:f1a5",

			"8086:f1a5",

			"1c58:0003",

			"1c58:0023",

			"1c5c:1327",

			"1c5f:0540",

			"144d:a821",

			"144d:a822",

			"144d:a808",

			"1d1d:1f1f",

			"1d1d:2807",

			"1d1d:2601",

			"106b:2001",

			"106b:2003",

			"1179:0115",

			"1179:0116";



		qcom,smmu;

		qcom,smmu-iova-base = /bits/ 64 <0x20000000>;

		qcom,smmu-iova-size = /bits/ 64 <0x40000000>;



		qcom,smmu-attr-atomic;

		qcom,smmu-attr-s1-bypass;

	};

};

arch/arm64/configs/vendor/sdmshrike-perf_defconfig

+5 −0
Original line number Diff line number Diff line
@@ -253,6 +253,8 @@ CONFIG_ZRAM=y 
CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_BLK_DEV_NVME=y

CONFIG_NVME_QCOM=y

CONFIG_HDCP_QSEECOM=y

CONFIG_QSEECOM=y

CONFIG_UID_SYS_STATS=y
@@ -300,6 +302,9 @@ CONFIG_CNSS2=y 
CONFIG_CNSS2_QMI=y

CONFIG_CNSS_ASYNC=y

CONFIG_CNSS_GENL=y

CONFIG_NVM=y

CONFIG_NVM_RRPC=y

CONFIG_NVM_PBLK=y

CONFIG_INPUT_EVDEV=y

CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set

arch/arm64/configs/vendor/sdmshrike_defconfig

+5 −0
Original line number Diff line number Diff line
@@ -264,6 +264,8 @@ CONFIG_ZRAM=y 
CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_BLK_DEV_NVME=y

CONFIG_NVME_QCOM=y

CONFIG_HDCP_QSEECOM=y

CONFIG_QSEECOM=y

CONFIG_UID_SYS_STATS=y
@@ -312,6 +314,9 @@ CONFIG_CNSS2_DEBUG=y 
CONFIG_CNSS2_QMI=y

CONFIG_CNSS_ASYNC=y

CONFIG_CNSS_GENL=y

CONFIG_NVM=y

CONFIG_NVM_RRPC=y

CONFIG_NVM_PBLK=y

CONFIG_INPUT_EVDEV=y

CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set