From b180599ae57027f239fe796f561b55fc872bd81c Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@debian.org>
Date: Sun, 13 Mar 2016 17:53:22 +0000
Subject: [PATCH] [arm64] Enable ARCH_HISI (Hisilicon) (Closes: #812540)

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

diff --git a/debian/changelog b/debian/changelog
index 7ff5a270f..9590c51a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
 linux (4.4.4-3) UNRELEASED; urgency=medium
 
+  [ Ben Hutchings ]
   * [x86] drm/i915: Fix oops caused by fbdev initialization failure
 
+  [ Ian Campbell ]
+  * [arm64] Enable ARCH_HISI (Hisilicon) and the set of currently available
+    drivers (Power, Thermal, MMC) (Closes: #812540)
+
  -- Ben Hutchings <ben@decadent.org.uk>  Sat, 12 Mar 2016 14:08:10 +0000
 
 linux (4.4.4-2) unstable; urgency=medium
diff --git a/debian/config/arm64/config b/debian/config/arm64/config
index e68bf9668..ddfea304a 100644
--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@@ -24,6 +24,7 @@ CONFIG_CRYPTO_CRC32_ARM64=y
 ##
 ## file: arch/arm64/Kconfig.platforms
 ##
+CONFIG_ARCH_HISI=y
 CONFIG_ARCH_QCOM=y
 CONFIG_ARCH_SEATTLE=y
 CONFIG_ARCH_VEXPRESS=y
@@ -98,6 +99,7 @@ CONFIG_HWSPINLOCK_QCOM=m
 ##
 ## file: drivers/i2c/busses/Kconfig
 ##
+CONFIG_I2C_DESIGNWARE_PLATFORM=m
 CONFIG_I2C_QUP=m
 
 ##
@@ -122,6 +124,8 @@ CONFIG_MMC=y
 CONFIG_MMC_ARMMMCI=m
 CONFIG_MMC_QCOM_DML=m
 CONFIG_MMC_SPI=m
+CONFIG_MMC_DW=m
+CONFIG_MMC_DW_K3=m
 
 ##
 ## file: drivers/net/ethernet/Kconfig
@@ -240,6 +244,7 @@ CONFIG_PHY_XGENE=m
 ##
 ## file: drivers/power/reset/Kconfig
 ##
+CONFIG_POWER_RESET_HISI=y
 CONFIG_POWER_RESET_MSM=y
 CONFIG_POWER_RESET_VEXPRESS=y
 CONFIG_POWER_RESET_XGENE=y
@@ -283,6 +288,11 @@ CONFIG_QCOM_SMD_RPM=m
 ##
 CONFIG_SPI_QUP=m
 
+##
+## file: drivers/thermal/Kconfig
+##
+CONFIG_HISI_THERMAL=m
+
 ##
 ## file: drivers/tty/serial/Kconfig
 ##