diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index dfd8999..6e13037 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -167,6 +167,10 @@ TARGET_USES_ION := true
 TARGET_DISABLED_UBWC := true
 TARGET_SCREEN_DENSITY := 420
 
+# FM
+BOARD_HAS_QCA_FM_SOC := cherokee
+BOARD_HAVE_QCOM_FM := true
+
 # RIL
 BOARD_PROVIDES_LIBRIL := true
 ENABLE_VENDOR_RIL_SERVICE := true
diff --git a/common.mk b/common.mk
index 819cda7..7030cb9 100644
--- a/common.mk
+++ b/common.mk
@@ -150,6 +150,16 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     fastbootd
 
+# FM
+PRODUCT_PACKAGES += \
+    FM2 \
+    libqcomfm_jni \
+    qcom.fmradio \
+    qcom.fmradio.xml
+
+PRODUCT_BOOT_JARS += \
+    qcom.fmradio
+
 # Gatekeeper
 PRODUCT_PACKAGES += \
     android.hardware.gatekeeper@1.0-impl \
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 350ee74..6f32af2 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -252,4 +252,7 @@
     <!-- default refresh rate in the zone defined by brightness and ambient thresholds -->
     <integer name="config_defaultRefreshRateInZone">90</integer>
 
+    <!-- When true use the linux /dev/input/event subsystem to detect the switch changes
+         on the headphone/microphone jack. When false use the older uevent framework. -->
+    <bool name="config_useDevInputEventForAudioJack">true</bool>
 </resources>
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 15f169b..a3deaad 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -675,6 +675,12 @@ vendor/lib/vendor.qti.hardware.fm@1.0.so
 vendor/lib/hw/vendor.qti.hardware.fm@1.0-impl.so
 vendor/lib64/vendor.qti.hardware.fm@1.0.so
 vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so
+system_ext/lib/fm_helium.so
+system_ext/lib64/fm_helium.so
+system_ext/lib/libfm-hci.so
+system_ext/lib64/libfm-hci.so
+system_ext/lib/vendor.qti.hardware.fm@1.0.so
+system_ext/lib64/vendor.qti.hardware.fm@1.0.so
 
 # Gatekeeper
 vendor/lib64/hw/gatekeeper.mdfpp.so