diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 4149344..c995eeb 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -48,6 +48,10 @@ BOARD_CHARGER_ENABLE_SUSPEND := true
 # DRM
 TARGET_ENABLE_MEDIADRM_64 := true
 
+# FM
+BOARD_HAVE_QCOM_FM := true
+BOARD_HAS_QCA_FM_SOC := "cherokee"
+
 # HIDL
 DEVICE_FRAMEWORK_MANIFEST_FILE := $(COMMON_PATH)/framework_manifest.xml
 
diff --git a/product_prop.mk b/product_prop.mk
index 7746a08..d22a9c5 100644
--- a/product_prop.mk
+++ b/product_prop.mk
@@ -20,6 +20,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.vendor.data.mode=concurrent
 
+# FM
+PRODUCT_PRODUCT_PROPERTIES += \
+    ro.vendor.fm.use_audio_session=true
+
 # Fwk detect
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.vendor.qti.va_aosp.support=1
diff --git a/proprietary-files.txt b/proprietary-files.txt
index d5ff960..4de889c 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -26,6 +26,14 @@ product/lib64/libdpmfdmgr.so
 product/lib64/libdpmframework.so
 product/lib64/libdpmtcm.so
 
+# FM
+lib64/fm_helium.so
+lib64/libfm-hci.so
+lib/fm_helium.so
+lib/libfm-hci.so
+-product/lib64/vendor.qti.hardware.fm@1.0.so
+-product/lib/vendor.qti.hardware.fm@1.0.so
+
 # Media
 lib/libFileMux.so
 lib/libmmosal.so
diff --git a/sdm710.mk b/sdm710.mk
index b03ab88..3628a96 100644
--- a/sdm710.mk
+++ b/sdm710.mk
@@ -55,6 +55,15 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.fingerprint.xml:system/etc/permissions/android.hardware.fingerprint.xml
 
+# FM
+PRODUCT_PACKAGES += \
+    FM2 \
+    libqcomfm_jni \
+    qcom.fmradio
+
+PRODUCT_BOOT_JARS += \
+    qcom.fmradio
+
 # HIDL
 PRODUCT_PACKAGES += \
     android.hidl.base@1.0