diff --git a/debian/changelog b/debian/changelog
index 76ebcfdde..3a0ca1115 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -186,6 +186,11 @@ linux (4.7.4-1) UNRELEASED; urgency=medium
     as modules (Closes: #837627, thanks to Vagrant Cascadian)
   * linux-image: postrm: Make failure of rmdir on purge non-fatal
     (Closes: #836282)
+  * [armhf] Enable drivers and options for OpenPandora console: POWER_AVS_OMAP
+    as built-in; DISPLAY_CONNECTOR_ANALOG_TV, DISPLAY_PANEL_TPO_TD043MTEA1,
+    SENSORS_TWL4030_MADC, VIDEO_OMAP3, BATTERY_TWL4030_MADC, BACKLIGHT_PANDORA,
+    HDQ_MASTER_OMAP as modules; OMAP2_DSS_DSI (Closes: #835893, thanks to
+    Vagrant Cascadian)
 
  -- Ben Hutchings <ben@decadent.org.uk>  Sat, 03 Sep 2016 18:34:31 +0100
 
diff --git a/debian/config/armhf/config b/debian/config/armhf/config
index 8743a0307..107a8e8c9 100644
--- a/debian/config/armhf/config
+++ b/debian/config/armhf/config
@@ -126,6 +126,8 @@ CONFIG_ARM_THUMBEE=y
 ##
 ## file: arch/arm/plat-omap/Kconfig
 ##
+CONFIG_POWER_AVS_OMAP=y
+CONFIG_POWER_AVS_OMAP_CLASS3=y
 CONFIG_OMAP_RESET_CLOCKS=y
 CONFIG_OMAP_MUX=y
 # CONFIG_OMAP_MUX_DEBUG is not set
@@ -297,7 +299,9 @@ CONFIG_DRM_OMAP=m
 ##
 CONFIG_DISPLAY_ENCODER_TPD12S015=m
 CONFIG_DISPLAY_CONNECTOR_HDMI=m
+CONFIG_DISPLAY_CONNECTOR_ANALOG_TV=m
 CONFIG_DISPLAY_PANEL_SONY_ACX565AKM=m
+CONFIG_DISPLAY_PANEL_TPO_TD043MTEA1=m
 
 ##
 ## file: drivers/gpu/drm/omapdrm/dss/Kconfig
@@ -307,6 +311,7 @@ CONFIG_OMAP2_DSS_VENC=y
 CONFIG_OMAP4_DSS_HDMI=y
 CONFIG_OMAP5_DSS_HDMI=y
 CONFIG_OMAP2_DSS_SDI=y
+CONFIG_OMAP2_DSS_DSI=y
 
 ##
 ## file: drivers/gpu/drm/panel/Kconfig
@@ -370,6 +375,7 @@ CONFIG_OMAP_SSI=m
 CONFIG_SENSORS_G762=m
 CONFIG_SENSORS_GPIO_FAN=m
 CONFIG_SENSORS_PWM_FAN=m
+CONFIG_SENSORS_TWL4030_MADC=m
 
 ##
 ## file: drivers/hwspinlock/Kconfig
@@ -501,10 +507,12 @@ CONFIG_BCM2835_MBOX=y
 ##
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_MEDIA_CONTROLLER=y
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
 
 ##
 ## file: drivers/media/platform/Kconfig
 ##
+CONFIG_VIDEO_OMAP3=m
 CONFIG_VIDEO_TI_VPE=m
 
 ##
@@ -854,14 +862,17 @@ CONFIG_PINCTRL_WM8850=y
 ##
 CONFIG_BATTERY_SBS=m
 CONFIG_BATTERY_BQ27XXX=m
+CONFIG_BATTERY_TWL4030_MADC=m
 CONFIG_BATTERY_RX51=m
 CONFIG_CHARGER_ISP1704=m
+CONFIG_CHARGER_TWL4030=m
 CONFIG_CHARGER_BQ2415X=m
 CONFIG_AXP20X_POWER=m
 
 ##
 ## file: drivers/power/avs/Kconfig
 ##
+CONFIG_POWER_AVS=y
 CONFIG_ROCKCHIP_IODOMAIN=m
 
 ##
@@ -1135,6 +1146,7 @@ CONFIG_USB_MXS_PHY=m
 ## file: drivers/video/backlight/Kconfig
 ##
 CONFIG_BACKLIGHT_PWM=m
+CONFIG_BACKLIGHT_PANDORA=m
 CONFIG_BACKLIGHT_GPIO=m
 
 ##
@@ -1162,6 +1174,11 @@ CONFIG_FB_SIMPLE=y
 ##
 CONFIG_VIRTIO_MMIO=m
 
+##
+## file: drivers/w1/masters/Kconfig
+##
+CONFIG_HDQ_MASTER_OMAP=m
+
 ##
 ## file: drivers/watchdog/Kconfig
 ##