From ed41b6358069f3834e1e17999baabcf083e30afd Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Sat, 28 Jan 2017 01:40:45 +0000
Subject: [PATCH] [arm64] Enable more Meson drivers

As requested in #852132 for 4.10.
---
 debian/changelog           |  2 ++
 debian/config/arm64/config | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 40d29be6d..3e8538e2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ linux (4.10~rc5-1~exp1) UNRELEASED; urgency=medium
     (Closes: #852620).  This breaks (e)glibc versions < 2.14 and dietlibc
     versions < 0.33.  It can be reverted using the kernel parameter:
     vsyscall=emulate
+  * [arm64] Enable DRM_MESON, MMC_MESON_GX, DWMAC_MESON, MESON_GXL_PHY,
+    PHY_MESON8B_USB2, MESON_WATCHDOG as modules
 
  -- Ben Hutchings <ben@decadent.org.uk>  Tue, 24 Jan 2017 19:08:03 +0000
 
diff --git a/debian/config/arm64/config b/debian/config/arm64/config
index 2f7eb8d40..f67e3f9ce 100644
--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@@ -190,6 +190,11 @@ CONFIG_DRM_I2C_ADV7511=m
 ##
 CONFIG_DRM_HISI_KIRIN=m
 
+##
+## file: drivers/gpu/drm/meson/Kconfig
+##
+CONFIG_DRM_MESON=m
+
 ##
 ## file: drivers/gpu/drm/msm/Kconfig
 ##
@@ -327,6 +332,7 @@ CONFIG_MMC_QCOM_DML=m
 CONFIG_MMC_SDHCI_PLTFM=m
 CONFIG_MMC_SDHCI_TEGRA=m
 CONFIG_MMC_SDHCI_IPROC=m
+CONFIG_MMC_MESON_GX=m
 CONFIG_MMC_SDHCI_MSM=m
 CONFIG_MMC_SPI=m
 CONFIG_MMC_DW=m
@@ -442,6 +448,7 @@ CONFIG_STMMAC_ETH=m
 CONFIG_STMMAC_PLATFORM=m
 CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_IPQ806X=m
+CONFIG_DWMAC_MESON=m
 
 ##
 ## file: drivers/net/fddi/Kconfig
@@ -455,6 +462,7 @@ CONFIG_SKFP=m
 CONFIG_MDIO_HISI_FEMAC=m
 CONFIG_MDIO_THUNDER=m
 CONFIG_MDIO_XGENE=m
+CONFIG_MESON_GXL_PHY=m
 
 ##
 ## file: drivers/net/wireless/ath/wcn36xx/Kconfig
@@ -516,6 +524,7 @@ CONFIG_PHY_QCOM_APQ8064_SATA=m
 CONFIG_PHY_QCOM_IPQ806X_SATA=m
 CONFIG_PHY_XGENE=m
 CONFIG_PHY_QCOM_UFS=m
+CONFIG_PHY_MESON8B_USB2=m
 
 ##
 ## file: drivers/phy/tegra/Kconfig
@@ -781,6 +790,7 @@ CONFIG_VIRTIO_MMIO=m
 CONFIG_TEGRA_WATCHDOG=m
 CONFIG_QCOM_WDT=m
 CONFIG_MESON_GXBB_WATCHDOG=m
+CONFIG_MESON_WATCHDOG=m
 CONFIG_BCM2835_WDT=m
 
 ##