From f1d6a10e4d450bf0796c01bd8e5818615fee4c53 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Tue, 24 Jan 2017 04:04:56 +0000
Subject: [PATCH] [arm64] Enable ARCH_MESON and related drivers (Closes:
 #852132)

---
 debian/changelog           | 1 +
 debian/config/arm64/config | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index eac9504b8..2fc385eea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -352,6 +352,7 @@ linux (4.9.5-1) UNRELEASED; urgency=medium
   * linux-image: Increase minimum version of initramfs-tools (Closes: #808038)
   * [x86] linux-cpupower: Add turbostat and x86_energy_perf_policy commands
     (Closes: #778249)
+  * [arm64] Enable ARCH_MESON and related drivers (Closes: #852132)
 
   [ Salvatore Bonaccorso ]
   * tmpfs: clear S_ISGID when setting posix ACLs (CVE-2017-5551)
diff --git a/debian/config/arm64/config b/debian/config/arm64/config
index f87157346..a68422b78 100644
--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@@ -40,6 +40,7 @@ CONFIG_KVM=y
 ##
 CONFIG_ARCH_BCM2835=y
 CONFIG_ARCH_HISI=y
+CONFIG_ARCH_MESON=y
 CONFIG_ARCH_MVEBU=y
 CONFIG_ARCH_QCOM=y
 CONFIG_ARCH_SEATTLE=y
@@ -78,6 +79,7 @@ CONFIG_TEGRA_ACONNECT=y
 CONFIG_HW_RANDOM_BCM2835=m
 CONFIG_HW_RANDOM_HISI=m
 CONFIG_HW_RANDOM_MSM=m
+CONFIG_HW_RANDOM_MESON=m
 
 ##
 ## file: drivers/char/ipmi/Kconfig
@@ -219,6 +221,7 @@ CONFIG_I2C=y
 ##
 CONFIG_I2C_BCM2835=m
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
+CONFIG_I2C_MESON=m
 CONFIG_I2C_MV64XXX=m
 CONFIG_I2C_QUP=m
 CONFIG_I2C_TEGRA=m
@@ -518,6 +521,7 @@ CONFIG_CHARGER_QCOM_SMBB=m
 ##
 CONFIG_PWM=y
 CONFIG_PWM_BCM2835=m
+CONFIG_PWM_MESON=m
 CONFIG_PWM_TEGRA=m
 
 ##
@@ -543,6 +547,7 @@ CONFIG_QCOM_Q6V5_PIL=m
 ## file: drivers/reset/Kconfig
 ##
 CONFIG_RESET_CONTROLLER=y
+CONFIG_RESET_MESON=y
 
 ##
 ## file: drivers/reset/hisilicon/Kconfig
@@ -597,6 +602,7 @@ CONFIG_ARCH_TEGRA_210_SOC=y
 ##
 CONFIG_SPI_BCM2835=m
 CONFIG_SPI_BCM2835AUX=m
+CONFIG_SPI_MESON_SPIFC=m
 CONFIG_SPI_QUP=m
 CONFIG_SPI_TEGRA114=m
 CONFIG_SPI_TEGRA20_SFLASH=m
@@ -633,6 +639,8 @@ CONFIG_SERIAL_AMBA_PL010=y
 CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_SERIAL_MESON=y
+CONFIG_SERIAL_MESON_CONSOLE=y
 CONFIG_SERIAL_TEGRA=y
 CONFIG_SERIAL_MSM=y
 CONFIG_SERIAL_MSM_CONSOLE=y
@@ -724,6 +732,7 @@ CONFIG_VIRTIO_MMIO=m
 ##
 CONFIG_TEGRA_WATCHDOG=m
 CONFIG_QCOM_WDT=m
+CONFIG_MESON_GXBB_WATCHDOG=m
 CONFIG_BCM2835_WDT=m
 
 ##