From 86cd585a254a1fd8d45451bb69bdc85f0683d02c Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Tue, 20 Dec 2016 10:56:54 +0000
Subject: [PATCH] Update some ARM options, Enable some Qualcomm QDF2432 server
 platform options

---
 config-arm64         | 8 ++++++--
 config-armv7-generic | 3 +++
 config-generic       | 1 -
 kernel.spec          | 4 ++++
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/config-arm64 b/config-arm64
index f6ae174cd..8cca6201c 100644
--- a/config-arm64
+++ b/config-arm64
@@ -195,7 +195,6 @@ CONFIG_GPIO_MAX77620=m
 CONFIG_TEGRA_ACONNECT=m
 
 # AllWinner
-CONFIG_SUNXI_RSB=m
 CONFIG_AHCI_SUNXI=m
 CONFIG_NET_VENDOR_ALLWINNER=y
 CONFIG_SUN8I_EMAC=m
@@ -204,6 +203,9 @@ CONFIG_SUN8I_EMAC=m
 # CONFIG_KEYBOARD_SUN4I_LRADC is not set
 # CONFIG_TOUCHSCREEN_SUN4I is not set
 # CONFIG_SERIO_SUN4I_PS2 is not set
+CONFIG_SUNXI_RSB=y
+CONFIG_MFD_AC100=m
+CONFIG_RTC_DRV_AC100=m
 CONFIG_SUNXI_WATCHDOG=m
 CONFIG_MFD_SUN6I_PRCM=y
 CONFIG_IR_SUNXI=m
@@ -231,6 +233,7 @@ CONFIG_MFD_QCOM_RPM=m
 CONFIG_PINCTRL_MSM=y
 CONFIG_PINCTRL_MSM8916=y
 CONFIG_PINCTRL_MSM8996=y
+CONFIG_PINCTRL_QDF2XXX=y
 CONFIG_COMMON_CLK_QCOM=m
 # CONFIG_MSM_GCC_8916 is not set
 # CONFIG_MSM_LCC_8960 is not set
@@ -248,6 +251,8 @@ CONFIG_MSM_MMCC_8996=m
 CONFIG_REGULATOR_QCOM_RPM=m
 CONFIG_REGULATOR_QCOM_SMD_RPM=m
 CONFIG_QCOM_BAM_DMA=y
+CONFIG_QCOM_HIDMA=m
+CONFIG_QCOM_HIDMA_MGMT=m
 CONFIG_HWSPINLOCK_QCOM=m
 CONFIG_HW_RANDOM_MSM=m
 CONFIG_CRYPTO_DEV_QCE=m
@@ -285,7 +290,6 @@ CONFIG_QCOM_COINCELL=m
 # CONFIG_PINCTRL_MSM8960 is not set
 # CONFIG_PINCTRL_MDM9615 is not set
 # CONFIG_PINCTRL_MSM8X74 is not set
-# CONFIG_PINCTRL_QDF2XXX is not set
 # CONFIG_INPUT_PM8941_PWRKEY is not set
 # CONFIG_INPUT_REGULATOR_HAPTIC is not set
 # CONFIG_CHARGER_MANAGER is not set
diff --git a/config-armv7-generic b/config-armv7-generic
index 53576d218..869ee0659 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -239,6 +239,8 @@ CONFIG_SND_SUN4I_SPDIF=m
 CONFIG_SND_SUN4I_I2S=m
 CONFIG_SND_SOC_WM8978=m
 CONFIG_SUNXI_RSB=y
+CONFIG_MFD_AC100=m
+CONFIG_RTC_DRV_AC100=m
 CONFIG_NVMEM_SUNXI_SID=m
 
 # Exynos
@@ -340,6 +342,7 @@ CONFIG_SND_SAMSUNG_I2S=m
 CONFIG_SND_SAMSUNG_PCM=m
 CONFIG_SND_SAMSUNG_SPDIF=m
 CONFIG_EXYNOS_AUDSS_CLK_CON=m
+CONFIG_MFD_EXYNOS_LPASS=m
 # CONFIG_EXYNOS_IOMMU_DEBUG is not set
 # CONFIG_SAMSUNG_PM_DEBUG is not set
 # CONFIG_SAMSUNG_PM_CHECK is not set
diff --git a/config-generic b/config-generic
index 928bd6a3a..6574372b0 100644
--- a/config-generic
+++ b/config-generic
@@ -4565,7 +4565,6 @@ CONFIG_MFD_VIPERBOARD=m
 # CONFIG_MFD_WM8350 is not set
 # CONFIG_MFD_WM8400 is not set
 # CONFIG_MFD_WM8994 is not set
-# CONFIG_MFD_AC100 is not set
 # CONFIG_MFD_EXYNOS_LPASS is not set
 # CONFIG_TPS6507X is not set
 # CONFIG_TS4800_IRQ is not set
diff --git a/kernel.spec b/kernel.spec
index 59aedc644..0a11be54e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2170,6 +2170,10 @@ fi
 #
 # 
 %changelog
+* Tue Dec 20 2016 Peter Robinson <pbrobinson@fedoraproject.org>
+- Update some ARM options
+- Enable some Qualcomm QDF2432 server platform options
+
 * Thu Dec 15 2016 Laura Abbott <labbott@fedoraproject.org>
 - Linux v4.9 rebase