Update armv7/aarch64 config options

7 files changed, 43 insertions, 24 deletions

diff --git a/config-arm-generic b/config-arm-generic
index 4310fa17a..32b83a160 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -94,6 +94,7 @@ CONFIG_OF_NET=y
 CONFIG_OF_PCI_IRQ=m
 CONFIG_OF_PCI=m
 CONFIG_OF_RESERVED_MEM=y
+CONFIG_OF_RESOLVE=y
 CONFIG_PATA_OF_PLATFORM=m
 # CONFIG_OF_SELFTEST is not set
 CONFIG_SERIAL_OF_PLATFORM=y
diff --git a/config-arm64 b/config-arm64
index bff77a21b..aaec288f0 100644
--- a/config-arm64
+++ b/config-arm64
@@ -70,6 +70,7 @@ CONFIG_EFI_VARS=y
 CONFIG_EFIVAR_FS=y
 CONFIG_EFI_VARS_PSTORE=y
 CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+CONFIG_RTC_DRV_EFI=y
 
 CONFIG_ARM64_CRYPTO=y
 CONFIG_CRYPTO_SHA1_ARM64_CE=m
@@ -83,6 +84,7 @@ CONFIG_CRYPTO_DEV_CCP=y
 CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
 
+CONFIG_ARM64_CPUIDLE=y
 
 # APM Xgene
 CONFIG_POWER_RESET_XGENE=y
@@ -92,7 +94,6 @@ CONFIG_AHCI_XGENE=y
 CONFIG_PHY_XGENE=y
 CONFIG_NET_XGENE=y
 CONFIG_RTC_DRV_XGENE=m
-CONFIG_RTC_DRV_EFI=y
 CONFIG_HW_RANDOM_XGENE=m
 CONFIG_GPIO_XGENE=y
 
@@ -123,7 +124,6 @@ CONFIG_NET_SB1000=y
 CONFIG_SBSAUART_TTY=y
 CONFIG_I2C_SCMI=m
 CONFIG_SENSORS_ACPI_POWER=m
-CONFIG_IMX_THERMAL=m
 CONFIG_PWM_LPSS=m
 CONFIG_ACPI=y
 CONFIG_ACPI_PROCFS_POWER=y
@@ -138,6 +138,6 @@ CONFIG_ACPI_CUSTOM_METHOD=m
 
 CONFIG_BPF_JIT=y
 
-CONFIG_AMD_XGBE=y
-CONFIG_AMD_XGBE_PHY=y
+CONFIG_AMD_XGBE=m
+CONFIG_AMD_XGBE_PHY=m
 # CONFIG_AMD_XGBE_DCB is not set
diff --git a/config-armv7 b/config-armv7
index abb02c1ea..3a03936e7 100644
--- a/config-armv7
+++ b/config-armv7
@@ -186,9 +186,7 @@ CONFIG_INPUT_TWL6040_VIBRA=m
 CONFIG_KEYBOARD_OMAP4=m
 CONFIG_KEYBOARD_TWL4030=m
 
-# OMAP thermal temp. Can likely be built as module but doesn't autoload so build in to ensure performance on PandaES
-CONFIG_TI_SOC_THERMAL=y
-CONFIG_TI_THERMAL=y
+# OMAP thermal temp.
 CONFIG_OMAP4_THERMAL=y
 CONFIG_OMAP5_THERMAL=y
 
@@ -323,9 +321,12 @@ CONFIG_ARCH_MSM8974=y
 CONFIG_SERIAL_MSM=y
 CONFIG_SERIAL_MSM_CONSOLE=y
 CONFIG_PINCTRL_APQ8064=m
+CONFIG_PINCTRL_APQ8084=m
 CONFIG_PINCTRL_IPQ8064=m
 CONFIG_PINCTRL_MSM8960=m
 CONFIG_COMMON_CLK_QCOM=m
+CONFIG_MFD_QCOM_RPM=m
+CONFIG_REGULATOR_QCOM_RPM=m
 CONFIG_APQ_GCC_8084=m
 CONFIG_APQ_MMCC_8084=m
 CONFIG_IPQ_GCC_806X=m
@@ -341,10 +342,12 @@ CONFIG_GPIO_MSM_V2=m
 CONFIG_POWER_RESET_MSM=y
 CONFIG_USB_MSM_OTG=m
 CONFIG_MMC_SDHCI_MSM=m
+CONFIG_MMC_QCOM_DML=m
 CONFIG_QCOM_BAM_DMA=m
 CONFIG_QCOM_GSBI=m
 CONFIG_PHY_QCOM_APQ8064_SATA=m
 CONFIG_PHY_QCOM_IPQ806X_SATA=m
+CONFIG_USB_DWC3_QCOM=m
 CONFIG_CRYPTO_DEV_QCE=m
 CONFIG_MSM_IOMMU=y
 CONFIG_DRM_MSM=m
@@ -401,6 +404,7 @@ CONFIG_RTC_DRV_SNVS=m
 # CONFIG_FB_IMX is not set
 
 CONFIG_SND_IMX_SOC=m
+CONFIG_SND_SOC_FSL_ASOC_CARD=m
 CONFIG_SND_SOC_FSL_ASRC=m
 CONFIG_SND_SOC_FSL_ESAI=m
 CONFIG_SND_SOC_FSL_SAI=m
@@ -409,14 +413,21 @@ CONFIG_SND_SOC_FSL_SSI=m
 CONFIG_SND_SOC_FSL_UTILS=m
 CONFIG_SND_SOC_IMX_SSI=m
 CONFIG_SND_SOC_IMX_AUDMUX=m
+CONFIG_SND_SOC_IMX_ES8328=m
 CONFIG_SND_SOC_IMX_PCM_FIQ=m
 CONFIG_SND_SOC_IMX_PCM_DMA=m
 CONFIG_SND_SOC_IMX_SGTL5000=m
 CONFIG_SND_SOC_IMX_WM8962=m
 CONFIG_SND_SOC_IMX_MC13783=m
 CONFIG_SND_SOC_IMX_SPDIF=m
+CONFIG_SND_SOC_CS42XX8_I2C=m
+CONFIG_SND_SOC_ES8328=m
+CONFIG_SND_SOC_ES8328_I2C=m
+CONFIG_SND_SOC_ES8328_SPI=m
 CONFIG_SND_SOC_EUKREA_TLV320=m
+CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_SOC_WM8731=m
+CONFIG_SND_SOC_WM8962=m
 
 CONFIG_USB_IMX21_HCD=m
 CONFIG_USB_MXS_PHY=m
@@ -488,7 +499,12 @@ CONFIG_SPI_ROCKCHIP=m
 CONFIG_SND_SOC_ROCKCHIP=m
 CONFIG_PWM_ROCKCHIP=m
 CONFIG_ROCKCHIP_SARADC=m
-# CONFIG_ROCKCHIP_IODOMAIN is not set
+CONFIG_ROCKCHIP_IODOMAIN=m
+CONFIG_MMC_DW_ROCKCHIP=m
+CONFIG_EMAC_ROCKCHIP=m
+CONFIG_MFD_RK808=m
+CONFIG_COMMON_CLK_RK808=m
+CONFIG_REGULATOR_RK808=m
 
 # ST Ericsson
 CONFIG_MACH_HREFV60=y
@@ -575,7 +591,6 @@ CONFIG_RTC_DRV_TPS6586X=m
 CONFIG_SERIO_OLPC_APSP=m
 
 # Zynq-7xxx
-# likely needs usb still
 CONFIG_SERIAL_UARTLITE=y
 CONFIG_SERIAL_UARTLITE_CONSOLE=y
 CONFIG_SERIAL_XILINX_PS_UART=y
@@ -586,8 +601,7 @@ CONFIG_LATTICE_ECP3_CONFIG=m
 CONFIG_NET_VENDOR_XILINX=y
 CONFIG_XILINX_EMACLITE=m
 CONFIG_GPIO_XILINX=y
-# Broken
-# CONFIG_GPIO_ZYNQ is not set
+CONFIG_GPIO_ZYNQ=m
 CONFIG_I2C_XILINX=m
 CONFIG_SPI_XILINX=m
 CONFIG_SPI_CADENCE=m
@@ -603,7 +617,8 @@ CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
 CONFIG_GS_FPGABOOT=m
-# CONFIG_PCIE_XILINX is not set
+CONFIG_USB_GADGET_XILINX=m
+CONFIG_PCIE_XILINX=y
 
 # Multi function devices
 CONFIG_MFD_88PM800=m
diff --git a/config-armv7-generic b/config-armv7-generic
index 1097bb1f4..42f3ea901 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -113,11 +113,17 @@ CONFIG_SCHED_SMT=y
 
 CONFIG_RCU_FANOUT=32
 
+# Power management / thermal / cpu scaling
 CONFIG_CPU_IDLE=y
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_CPU_IDLE_GOV_MENU=y
 # CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
 
+CONFIG_PM_OPP=y
+CONFIG_ARM_CPU_SUSPEND=y
+CONFIG_ARM_PSCI=y
+CONFIG_THERMAL=y
+CONFIG_CPUFREQ_DT=y
 # CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set
 
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
@@ -337,6 +343,10 @@ CONFIG_MFD_AS3722=y
 CONFIG_REGULATOR_AS3722=m
 CONFIG_RTC_DRV_AS3722=y
 
+# TI Generic
+CONFIG_TI_SOC_THERMAL=m
+CONFIG_TI_THERMAL=y
+
 # DRM panels
 CONFIG_DRM_PANEL=y
 CONFIG_DRM_PANEL_SIMPLE=m
@@ -351,11 +361,6 @@ CONFIG_REGMAP_SPMI=m
 CONFIG_REGMAP_MMIO=m
 CONFIG_REGMAP_IRQ=y
 
-# Power management
-CONFIG_PM_OPP=y
-CONFIG_ARM_CPU_SUSPEND=y
-CONFIG_GENERIC_CPUFREQ_CPU0=m
-
 # usb
 CONFIG_USB_OHCI_HCD_PLATFORM=m
 CONFIG_USB_EHCI_HCD_PLATFORM=m
@@ -508,10 +513,6 @@ CONFIG_EDAC_LEGACY_SYSFS=y
 
 # Watchdog
 
-# Thermal / powersaving
-CONFIG_THERMAL=y
-CONFIG_ARM_PSCI=y
-
 # Mailbox
 CONFIG_MAILBOX=y
 
@@ -707,6 +708,7 @@ CONFIG_REGULATOR_ISL9305=m
 CONFIG_REGULATOR_MAX77802=m
 CONFIG_REGULATOR_PWM=m
 
+CONFIG_POWER_AVS=y
 CONFIG_CHARGER_MANAGER=y
 CONFIG_CHARGER_BQ2415X=m
 CONFIG_CHARGER_BQ24190=m
@@ -756,6 +758,7 @@ CONFIG_TOUCHSCREEN_TSC2005=m
 
 CONFIG_LEDS_DAC124S085=m
 CONFIG_LEDS_PWM=m
+CONFIG_LEDS_SYSCON=y
 CONFIG_BMP085_SPI=m
 
 CONFIG_SRAM=y
diff --git a/config-armv7-lpae b/config-armv7-lpae
index 935abd805..b08f4daa1 100644
--- a/config-armv7-lpae
+++ b/config-armv7-lpae
@@ -62,7 +62,6 @@ CONFIG_POWER_RESET_KEYSTONE=y
 CONFIG_DAVINCI_WATCHDOG=m
 CONFIG_SPI_DAVINCI=m
 CONFIG_TI_DAVINCI_MDIO=m
-# CONFIG_TI_SOC_THERMAL is not set
 CONFIG_KEYSTONE_IRQ=m
 CONFIG_PCI_KEYSTONE=y
 
diff --git a/config-generic b/config-generic
index e3a3eba8a..b91f2d210 100644
--- a/config-generic
+++ b/config-generic
@@ -3928,8 +3928,6 @@ CONFIG_USB_PHY=y
 # CONFIG_PHY_ST_SPEAR1340_MIPHY is not set
 # CONFIG_AM335X_PHY_USB is not set
 # CONFIG_SAMSUNG_USBPHY is not set
-# CONFIG_SAMSUNG_USB2PHY is not set
-# CONFIG_SAMSUNG_USB3PHY is not set
 # CONFIG_BCM_KONA_USB2_PHY is not set
 # CONFIG_USB_RCAR_PHY is not set
 CONFIG_USB_ATM=m
diff --git a/kernel.spec b/kernel.spec
index a446daeb2..a0d859b65 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2214,6 +2214,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Mon Oct 13 2014 Peter Robinson <pbrobinson@fedoraproject.org>
+- Update armv7/aarch64 config options
+
 * Mon Oct 13 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc0.git6.1
 - Linux v3.17-7872-g5ff0b9e1a1da