Merge "defconfig: pineapple-gki: Enable the mem-offline driver"

arch/arm64/configs/vendor/pineapple_GKI.config

@@ -116,6 +116,7 @@ CONFIG_QCOM_MEM_BUF_DEV=m
 CONFIG_QCOM_MEM_BUF_DEV_GH=y
 CONFIG_QCOM_MEM_BUF_GH=y
 CONFIG_QCOM_MEM_BUF_MSGQ=m
+CONFIG_QCOM_MEM_OFFLINE=m
 # CONFIG_QCOM_MINIDUMP is not set
 CONFIG_QCOM_PANIC_ON_NOTIF_TIMEOUT=y
 CONFIG_QCOM_PANIC_ON_PDR_NOTIF_TIMEOUT=y

drivers/soc/qcom/Kconfig

@@ -631,6 +631,17 @@ config QCOM_CPU_VENDOR_HOOKS
           having scope to upstream.
           If unsure, say N.
 
+config QCOM_MEM_OFFLINE
+	tristate "Dynamic Memory Region Offline driver"
+	depends on MEMORY_HOTPLUG
+	help
+	  Add support for DDR Self-Refresh power management through the dynamic
+	  memory offline framework. This driver interfaces between the memory
+	  hotplug subsystem and AOP which hot adds or removes memory blocks and
+	  controls the start/stop of self-refresh of these DDR regions. This
+	  helps reduce power consumption during idle mode of the system.
+	  If unsure, say N
+
 config QCOM_HUNG_TASK_ENH
         tristate "QTI Hung Task Enhancement"
         depends on ARCH_QCOM

drivers/soc/qcom/Makefile

@@ -63,6 +63,7 @@ minidump-$(CONFIG_QCOM_MINIDUMP_PANIC_DUMP) += minidump_memory.o
 obj-$(CONFIG_QCOM_VA_MINIDUMP) += qcom_va_minidump.o
 obj-$(CONFIG_QCOM_LOGBUF_VENDOR_HOOKS) += qcom_logbuf_vh.o
 obj-$(CONFIG_QCOM_HUNG_TASK_ENH) += hung_task_enh.o
+obj-$(CONFIG_QCOM_MEM_OFFLINE) += mem-offline.o
 obj-$(CONFIG_GH_TLMM_VM_MEM_ACCESS) += gh_tlmm_vm_mem_access.o
 obj-$(CONFIG_QCOM_RAMDUMP) += qcom_ramdump.o
 obj-$(CONFIG_QCOM_ICC_BWMON)	+= icc-bwmon.o