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

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

Merge "ARM: dts: msm: add mem-offline support for trinket"

parents 4e9569a9 e3bb0dcb

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

+7 −0
Original line number Diff line number Diff line
@@ -35,6 +35,13 @@ 
	qcom,pmic-name = "pm6125 + pmi632";

	interrupt-parent = <&wakegic>;



	mem-offline {

		compatible = "qcom,mem-offline";

		offline-sizes = <0x1 0x40000000 0x0 0x40000000>,

				<0x1 0xc0000000 0x0 0x80000000>;

		granule = <512>;

	};



	aliases {

		serial0 = &qupv3_se4_2uart;

		sdhc1 = &sdhc_1; /* SDC1 eMMC slot */

arch/arm64/configs/vendor/trinket-perf_defconfig

+7 −0
Original line number Diff line number Diff line 
CONFIG_HOTPLUG_SIZE_BITS=29

CONFIG_LOCALVERSION="-perf"

# CONFIG_LOCALVERSION_AUTO is not set

# CONFIG_FHANDLE is not set
@@ -63,6 +64,10 @@ CONFIG_SCHED_MC=y 
CONFIG_NR_CPUS=8

CONFIG_PREEMPT=y

CONFIG_HZ_100=y

CONFIG_MEMORY_HOTPLUG=y

CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y

CONFIG_MEMORY_HOTPLUG_MOVABLE_NODE=y

CONFIG_MEMORY_HOTREMOVE=y

CONFIG_CMA=y

CONFIG_ZSMALLOC=y

CONFIG_BALANCE_ANON_FILE_RECLAIM=y
@@ -546,6 +551,8 @@ CONFIG_RPMSG_QCOM_GLINK_RPM=y 
CONFIG_RPMSG_QCOM_GLINK_SMEM=y

CONFIG_RPMSG_QCOM_GLINK_SPI=y

CONFIG_MSM_RPM_SMD=y

CONFIG_QCOM_MEM_OFFLINE=y

CONFIG_OVERRIDE_MEMORY_LIMIT=y

CONFIG_QCOM_CPUSS_DUMP=y

CONFIG_QCOM_RUN_QUEUE_STATS=y

CONFIG_QCOM_QMI_HELPERS=y

arch/arm64/configs/vendor/trinket_defconfig

+7 −0
Original line number Diff line number Diff line 
CONFIG_HOTPLUG_SIZE_BITS=29

# CONFIG_LOCALVERSION_AUTO is not set

# CONFIG_FHANDLE is not set

CONFIG_AUDIT=y
@@ -66,6 +67,10 @@ CONFIG_SCHED_MC=y 
CONFIG_NR_CPUS=8

CONFIG_PREEMPT=y

CONFIG_HZ_100=y

CONFIG_MEMORY_HOTPLUG=y

CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y

CONFIG_MEMORY_HOTPLUG_MOVABLE_NODE=y

CONFIG_MEMORY_HOTREMOVE=y

CONFIG_CLEANCACHE=y

CONFIG_CMA=y

CONFIG_CMA_DEBUGFS=y
@@ -570,6 +575,8 @@ CONFIG_RPMSG_QCOM_GLINK_RPM=y 
CONFIG_RPMSG_QCOM_GLINK_SMEM=y

CONFIG_RPMSG_QCOM_GLINK_SPI=y

CONFIG_MSM_RPM_SMD=y

CONFIG_QCOM_MEM_OFFLINE=y

CONFIG_OVERRIDE_MEMORY_LIMIT=y

CONFIG_QCOM_CPUSS_DUMP=y

CONFIG_QCOM_RUN_QUEUE_STATS=y

CONFIG_QCOM_QMI_HELPERS=y