diff --git a/debian/changelog b/debian/changelog
index d3e4dddf8..81f45b2b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -464,6 +464,14 @@ linux (4.9.6-1) UNRELEASED; urgency=medium
   * [armhf,arm64] drm/vc4: Return -EINVAL on the overflow checks failing.
     (CVE-2017-5577)
   * [arm64] ptrace: Avoid ABI change in 4.9.6
+  * [arm64] Enable ARM64_ACPI_PARKING_PROTOCOL, ARCH_THUNDER, GPIO_PL061,
+    GPIO_XGENE, ARM_SMMU, ARM_SMMU_V3, PCI_HOST_THUNDER_PEM, and
+    PCI_HOST_THUNDER_ECAM; PINCTRL_AMD as built-in; SATA_AHCI_SEATTLE,
+    HW_RANDOM_XGENE, HW_RANDOM_CAVIUM, CPUFREQ_DT, K3_DMA, GPIO_XGENE_SB,
+    SENSORS_XGENE, I2C_THUNDERX, KEYBOARD_GPIO, TI_ST, THUNDER_NIC_PF,
+    THUNDER_NIC_VF (Closes: #852493), THUNDER_NIC_BGX, THUNDER_NIC_RGX,
+    MDIO_THUNDER, MDIO_XGENE, SPI_THUNDERX, and SND_SOC_APQ8016_SBC as
+    modules (thanks to Riku Voipio)
 
   [ Roger Shimizu ]
   * [armel] Add DT support of Buffalo Linkstation Live v3 (LS-CHL)
diff --git a/debian/config/arm64/config b/debian/config/arm64/config
index 27341c419..2f7eb8d40 100644
--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@@ -13,6 +13,7 @@ CONFIG_SECCOMP=y
 CONFIG_XEN=y
 CONFIG_RANDOMIZE_BASE=y
 CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
+CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y
 CONFIG_EFI_SECURE_BOOT_SECURELEVEL=y
 CONFIG_COMPAT=y
 
@@ -45,6 +46,7 @@ CONFIG_ARCH_MVEBU=y
 CONFIG_ARCH_QCOM=y
 CONFIG_ARCH_SEATTLE=y
 CONFIG_ARCH_TEGRA=y
+CONFIG_ARCH_THUNDER=y
 CONFIG_ARCH_VEXPRESS=y
 CONFIG_ARCH_XGENE=y
 
@@ -60,6 +62,7 @@ CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_AHCI_MVEBU=m
 CONFIG_AHCI_TEGRA=m
 CONFIG_AHCI_XGENE=m
+CONFIG_SATA_AHCI_SEATTLE=m
 
 ##
 ## file: drivers/bluetooth/Kconfig
@@ -79,7 +82,9 @@ CONFIG_TEGRA_ACONNECT=y
 CONFIG_HW_RANDOM_BCM2835=m
 CONFIG_HW_RANDOM_HISI=m
 CONFIG_HW_RANDOM_MSM=m
+CONFIG_HW_RANDOM_XGENE=m
 CONFIG_HW_RANDOM_MESON=m
+CONFIG_HW_RANDOM_CAVIUM=m
 
 ##
 ## file: drivers/char/ipmi/Kconfig
@@ -106,6 +111,11 @@ CONFIG_MSM_GCC_8916=y
 CONFIG_MSM_GCC_8996=y
 CONFIG_MSM_MMCC_8996=y
 
+##
+## file: drivers/cpufreq/Kconfig
+##
+CONFIG_CPUFREQ_DT=m
+
 ##
 ## file: drivers/cpuidle/Kconfig.arm
 ##
@@ -121,6 +131,7 @@ CONFIG_CRYPTO_DEV_QCE=m
 ##
 CONFIG_DMADEVICES=y
 CONFIG_DMA_BCM2835=y
+CONFIG_K3_DMA=m
 CONFIG_MV_XOR=y
 CONFIG_MV_XOR_V2=y
 CONFIG_TEGRA20_APB_DMA=y
@@ -157,6 +168,9 @@ CONFIG_RASPBERRYPI_FIRMWARE=y
 ## file: drivers/gpio/Kconfig
 ##
 CONFIG_GPIOLIB=y
+CONFIG_GPIO_PL061=y
+CONFIG_GPIO_XGENE=y
+CONFIG_GPIO_XGENE_SB=m
 CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_PCA953X_IRQ=y
 CONFIG_GPIO_MAX77620=y
@@ -206,6 +220,11 @@ CONFIG_DRM_VC4=m
 ##
 CONFIG_TEGRA_HOST1X=m
 
+##
+## file: drivers/hwmon/Kconfig
+##
+CONFIG_SENSORS_XGENE=m
+
 ##
 ## file: drivers/hwspinlock/Kconfig
 ##
@@ -225,6 +244,7 @@ CONFIG_I2C_MESON=m
 CONFIG_I2C_MV64XXX=m
 CONFIG_I2C_QUP=m
 CONFIG_I2C_TEGRA=m
+CONFIG_I2C_THUNDERX=m
 CONFIG_I2C_CROS_EC_TUNNEL=m
 CONFIG_I2C_XGENE_SLIMPRO=m
 
@@ -237,6 +257,7 @@ CONFIG_QCOM_SPMI_VADC=m
 ##
 ## file: drivers/input/keyboard/Kconfig
 ##
+CONFIG_KEYBOARD_GPIO=m
 CONFIG_KEYBOARD_TEGRA=m
 
 ##
@@ -251,6 +272,8 @@ CONFIG_INPUT_HISI_POWERKEY=m
 ## file: drivers/iommu/Kconfig
 ##
 CONFIG_TEGRA_IOMMU_SMMU=y
+CONFIG_ARM_SMMU=y
+CONFIG_ARM_SMMU_V3=y
 
 ##
 ## file: drivers/leds/Kconfig
@@ -286,6 +309,11 @@ CONFIG_MFD_SPMI_PMIC=m
 ##
 CONFIG_QCOM_COINCELL=m
 
+##
+## file: drivers/misc/ti-st/Kconfig
+##
+CONFIG_TI_ST=m
+
 ##
 ## file: drivers/mmc/Kconfig
 ##
@@ -343,6 +371,15 @@ CONFIG_AMD_XGBE=m
 ##
 CONFIG_NET_XGENE=m
 
+##
+## file: drivers/net/ethernet/cavium/Kconfig
+##
+CONFIG_NET_VENDOR_CAVIUM=y
+CONFIG_THUNDER_NIC_PF=m
+CONFIG_THUNDER_NIC_VF=m
+CONFIG_THUNDER_NIC_BGX=m
+CONFIG_THUNDER_NIC_RGX=m
+
 ##
 ## file: drivers/net/ethernet/dec/tulip/Kconfig
 ##
@@ -416,6 +453,8 @@ CONFIG_SKFP=m
 ## file: drivers/net/phy/Kconfig
 ##
 CONFIG_MDIO_HISI_FEMAC=m
+CONFIG_MDIO_THUNDER=m
+CONFIG_MDIO_XGENE=m
 
 ##
 ## file: drivers/net/wireless/ath/wcn36xx/Kconfig
@@ -465,6 +504,8 @@ CONFIG_PCI_HOST_GENERIC=y
 CONFIG_PCI_XGENE=y
 CONFIG_PCI_HISI=y
 CONFIG_PCIE_QCOM=y
+CONFIG_PCI_HOST_THUNDER_PEM=y
+CONFIG_PCI_HOST_THUNDER_ECAM=y
 CONFIG_PCIE_ARMADA_8K=y
 
 ##
@@ -484,6 +525,7 @@ CONFIG_PHY_TEGRA_XUSB=m
 ##
 ## file: drivers/pinctrl/Kconfig
 ##
+CONFIG_PINCTRL_AMD=y
 CONFIG_PINCTRL_SINGLE=y
 CONFIG_PINCTRL_MAX77620=y
 
@@ -607,6 +649,7 @@ CONFIG_SPI_QUP=m
 CONFIG_SPI_TEGRA114=m
 CONFIG_SPI_TEGRA20_SFLASH=m
 CONFIG_SPI_TEGRA20_SLINK=m
+CONFIG_SPI_THUNDERX=m
 
 ##
 ## file: drivers/spmi/Kconfig
@@ -769,6 +812,7 @@ CONFIG_SND_BCM2835_SOC_I2S=m
 ## file: sound/soc/qcom/Kconfig
 ##
 CONFIG_SND_SOC_QCOM=m
+CONFIG_SND_SOC_APQ8016_SBC=m
 
 ##
 ## file: sound/soc/tegra/Kconfig