From 8106bebc5021c5819230a13268f695cce4c41593 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@hellion.org.uk>
Date: Sat, 23 Jan 2016 08:32:44 +0000
Subject: [PATCH] [arm64] Enabled support for QCOM platforms, options
 recommended by Martin Michlmayr

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

diff --git a/debian/changelog b/debian/changelog
index cbed815c9..97c115dff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ linux (4.4-1~exp2) UNRELEASED; urgency=medium
     - config: enable PCI generic host bridge by default
     - config: enable CRYPTO_CRC32_ARM64 by default
 
+  [ Ian Campbell ]
+  * [arm64] Enabled support for QCOM platforms, options recommended by Martin
+    Michlmayr. (Closes: #812386)
+
  -- Ian Campbell <ijc@debian.org>  Sat, 23 Jan 2016 08:23:05 +0000
 
 linux (4.4-1~exp1) experimental; urgency=medium
diff --git a/debian/config/arm64/config b/debian/config/arm64/config
index 64a50e13c..2435140f6 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_QCOM=y
 CONFIG_ARCH_SEATTLE=y
 CONFIG_ARCH_VEXPRESS=y
 CONFIG_ARCH_XGENE=y
@@ -34,6 +35,11 @@ CONFIG_ARCH_XGENE=y
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_AHCI_XGENE=m
 
+##
+## file: drivers/char/hw_random/Kconfig
+##
+CONFIG_HW_RANDOM_MSM=m
+
 ##
 ## file: drivers/clk/Kconfig
 ##
@@ -44,11 +50,51 @@ CONFIG_COMMON_CLK_XGENE=y
 ##
 CONFIG_ARM_CPUIDLE=y
 
+##
+## file: drivers/crypto/Kconfig
+##
+CONFIG_CRYPTO_DEV_QCE=m
+
+##
+## file: drivers/dma/Kconfig
+##
+CONFIG_DMADEVICES=y
+CONFIG_QCOM_BAM_DMA=m
+
+##
+## file: drivers/extcon/Kconfig
+##
+CONFIG_EXTCON=m
+
 ##
 ## file: drivers/gpio/Kconfig
 ##
 CONFIG_GPIOLIB=y
 
+##
+## file: drivers/gpu/drm/Kconfig
+##
+CONFIG_DRM=m
+
+##
+## file: drivers/gpu/drm/msm/Kconfig
+##
+CONFIG_DRM_MSM=m
+CONFIG_DRM_MSM_DSI=y
+CONFIG_DRM_MSM_DSI_PLL=y
+CONFIG_DRM_MSM_DSI_28NM_PHY=y
+CONFIG_DRM_MSM_DSI_20NM_PHY=y
+
+##
+## file: drivers/hwspinlock/Kconfig
+##
+CONFIG_HWSPINLOCK_QCOM=m
+
+##
+## file: drivers/i2c/busses/Kconfig
+##
+CONFIG_I2C_QUP=m
+
 ##
 ## file: drivers/input/misc/Kconfig
 ##
@@ -64,6 +110,7 @@ CONFIG_MMC=y
 ## file: drivers/mmc/host/Kconfig
 ##
 CONFIG_MMC_ARMMMCI=m
+CONFIG_MMC_QCOM_DML=m
 CONFIG_MMC_SPI=m
 
 ##
@@ -148,6 +195,14 @@ CONFIG_SMC91X=m
 CONFIG_EPIC100=m
 CONFIG_SMSC911X=m
 
+##
+## file: drivers/net/ethernet/stmicro/stmmac/Kconfig
+##
+CONFIG_STMMAC_ETH=m
+CONFIG_STMMAC_PLATFORM=m
+CONFIG_DWMAC_GENERIC=m
+CONFIG_DWMAC_IPQ806X=m
+
 ##
 ## file: drivers/net/fddi/Kconfig
 ##
@@ -163,16 +218,24 @@ CONFIG_PCI_XGENE=y
 ##
 ## file: drivers/phy/Kconfig
 ##
+CONFIG_PHY_QCOM_APQ8064_SATA=m
+CONFIG_PHY_QCOM_IPQ806X_SATA=m
 CONFIG_PHY_XGENE=m
 
 ##
 ## file: drivers/power/reset/Kconfig
 ##
+CONFIG_POWER_RESET_MSM=y
 CONFIG_POWER_RESET_VEXPRESS=y
 CONFIG_POWER_RESET_XGENE=y
 CONFIG_POWER_RESET_SYSCON=y
 CONFIG_POWER_RESET_SYSCON_POWEROFF=y
 
+##
+## file: drivers/reset/Kconfig
+##
+CONFIG_RESET_CONTROLLER=y
+
 ##
 ## file: drivers/rtc/Kconfig
 ##
@@ -184,6 +247,19 @@ CONFIG_RTC_DRV_XGENE=y
 ##
 CONFIG_SCSI_DMX3191D=m
 
+##
+## file: drivers/soc/qcom/Kconfig
+##
+CONFIG_QCOM_GSBI=m
+CONFIG_QCOM_SMEM=m
+CONFIG_QCOM_SMD=m
+CONFIG_QCOM_SMD_RPM=m
+
+##
+## file: drivers/spi/Kconfig
+##
+CONFIG_SPI_QUP=m
+
 ##
 ## file: drivers/tty/serial/Kconfig
 ##
@@ -191,6 +267,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_MSM=y
+CONFIG_SERIAL_MSM_CONSOLE=y
 CONFIG_SERIAL_OF_PLATFORM=y
 
 ##
@@ -206,6 +284,11 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_8250_DW=y
 # CONFIG_SERIAL_8250_EM is not set
 
+##
+## file: drivers/usb/gadget/Kconfig
+##
+CONFIG_USB_GADGET=m
+
 ##
 ## file: drivers/usb/host/Kconfig
 ##
@@ -217,13 +300,41 @@ CONFIG_USB_EHCI_HCD_PLATFORM=m
 CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_OHCI_HCD_PLATFORM=m
 
+##
+## file: drivers/usb/phy/Kconfig
+##
+CONFIG_USB_MSM_OTG=m
+CONFIG_USB_QCOM_8X16_PHY=m
+
 ##
 ## file: drivers/virtio/Kconfig
 ##
 CONFIG_VIRTIO_MMIO=m
 
+##
+## file: drivers/watchdog/Kconfig
+##
+CONFIG_QCOM_WDT=m
+
 ##
 ## file: fs/pstore/Kconfig
 ##
 CONFIG_PSTORE=y
 
+##
+## file: sound/soc/Kconfig
+##
+CONFIG_SND_SOC=m
+
+##
+## file: sound/soc/qcom/Kconfig
+##
+CONFIG_SND_SOC_QCOM=m
+
+##
+## file: unknown
+##
+CONFIG_HWSPINLOCK=m
+CONFIG_PINCTRL=y
+CONFIG_USB_PHY=y
+