From 96bde369484e18dc31424f49d6162e02e0e4b170 Mon Sep 17 00:00:00 2001
From: Martin Michlmayr <tbm@cyrius.com>
Date: Mon, 29 Aug 2016 21:20:48 -0700
Subject: [PATCH] [arm64] Enable more HISI options

---
 debian/changelog           |  4 ++++
 debian/config/arm64/config | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e2d14346e..7ec5e6adb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,10 @@ linux (4.8~rc3-1~exp1) UNRELEASED; urgency=medium
       BCM2835_WDT, SND_BCM2835_SOC_I2S, MMC_SDHCI_IPROC, HW_RANDOM_BCM2835
       as modules
   * [arm64] Enable USB_DWC2 and USB_DWC3.
+  * [arm64] Enable more HISI options: MFD_HI655X_PMIC, REGULATOR_HI655X,
+    STUB_CLK_HI6220, HI6220_MBOX, COMMON_RESET_HI6220, PHY_HI6220_USB,
+    HW_RANDOM_HISI, DRM_HISI_KIRIN, INPUT_HISI_POWERKEY, PCI_HISI,
+    SPI_HISI_SFC, SCSI_HISI_SAS (Closes: #821027).
 
   [ Ben Hutchings ]
   * Update config for 4.8:
diff --git a/debian/config/arm64/config b/debian/config/arm64/config
index 7cecf103a..4d98490eb 100644
--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@@ -53,6 +53,7 @@ CONFIG_TEGRA_ACONNECT=y
 ## file: drivers/char/hw_random/Kconfig
 ##
 CONFIG_HW_RANDOM_BCM2835=m
+CONFIG_HW_RANDOM_HISI=m
 CONFIG_HW_RANDOM_MSM=m
 
 ##
@@ -60,6 +61,11 @@ CONFIG_HW_RANDOM_MSM=m
 ##
 CONFIG_COMMON_CLK_XGENE=y
 
+##
+## file: drivers/clk/hisilicon/Kconfig
+##
+CONFIG_STUB_CLK_HI6220=y
+
 ##
 ## file: drivers/clk/qcom/Kconfig
 ##
@@ -122,6 +128,11 @@ CONFIG_DRM=m
 ##
 CONFIG_DRM_I2C_ADV7511=m
 
+##
+## file: drivers/gpu/drm/hisilicon/kirin/Kconfig
+##
+CONFIG_DRM_HISI_KIRIN=m
+
 ##
 ## file: drivers/gpu/drm/msm/Kconfig
 ##
@@ -188,6 +199,7 @@ CONFIG_KEYBOARD_TEGRA=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_PM8941_PWRKEY=m
 CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_HISI_POWERKEY=m
 
 ##
 ## file: drivers/iommu/Kconfig
@@ -202,7 +214,9 @@ CONFIG_LEDS_GPIO=m
 ##
 ## file: drivers/mailbox/Kconfig
 ##
+CONFIG_MAILBOX=y
 CONFIG_BCM2835_MBOX=y
+CONFIG_HI6220_MBOX=y
 
 ##
 ## file: drivers/memory/tegra/Kconfig
@@ -215,6 +229,7 @@ CONFIG_TEGRA_MC=y
 CONFIG_MFD_CROS_EC=y
 CONFIG_MFD_CROS_EC_I2C=m
 CONFIG_MFD_CROS_EC_SPI=m
+CONFIG_MFD_HI655X_PMIC=m
 CONFIG_MFD_MAX77620=y
 CONFIG_MFD_QCOM_RPM=m
 CONFIG_MFD_SPMI_PMIC=m
@@ -242,6 +257,11 @@ CONFIG_MMC_SPI=m
 CONFIG_MMC_DW=m
 CONFIG_MMC_DW_K3=m
 
+##
+## file: drivers/mtd/spi-nor/Kconfig
+##
+CONFIG_SPI_HISI_SFC=m
+
 ##
 ## file: drivers/net/ethernet/Kconfig
 ##
@@ -349,11 +369,13 @@ CONFIG_QCOM_QFPROM=m
 ##
 CONFIG_PCI_HOST_GENERIC=y
 CONFIG_PCI_XGENE=y
+CONFIG_PCI_HISI=y
 CONFIG_PCIE_QCOM=y
 
 ##
 ## file: drivers/phy/Kconfig
 ##
+CONFIG_PHY_HI6220_USB=m
 CONFIG_PHY_QCOM_APQ8064_SATA=m
 CONFIG_PHY_QCOM_IPQ806X_SATA=m
 CONFIG_PHY_XGENE=m
@@ -410,6 +432,7 @@ CONFIG_PWM_TEGRA=m
 ##
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
+CONFIG_REGULATOR_HI655X=m
 CONFIG_REGULATOR_MAX77620=m
 CONFIG_REGULATOR_PWM=m
 CONFIG_REGULATOR_QCOM_RPM=m
@@ -426,6 +449,11 @@ CONFIG_QCOM_Q6V5_PIL=m
 ##
 CONFIG_RESET_CONTROLLER=y
 
+##
+## file: drivers/reset/hisilicon/Kconfig
+##
+CONFIG_COMMON_RESET_HI6220=m
+
 ##
 ## file: drivers/rtc/Kconfig
 ##
@@ -441,6 +469,11 @@ CONFIG_RTC_DRV_XGENE=y
 ##
 CONFIG_SCSI_DMX3191D=m
 
+##
+## file: drivers/scsi/hisi_sas/Kconfig
+##
+CONFIG_SCSI_HISI_SAS=m
+
 ##
 ## file: drivers/soc/bcm/Kconfig
 ##