ARM config updates for 3.16

5 files changed, 43 insertions, 37 deletions

diff --git a/config-arm-generic b/config-arm-generic
index 561bbcf7..e823dcc3 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -2,6 +2,7 @@ CONFIG_KUSER_HELPERS=y
 # CONFIG_ASYMMETRIC_KEY_TYPE is not set
 CONFIG_COMMON_CLK=y
 CONFIG_EARLY_PRINTK=y
+CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST=y
 CONFIG_FB_SSD1307=m
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_NFS_FS=y
@@ -29,7 +30,6 @@ CONFIG_INPUT_PWM_BEEPER=m
 CONFIG_ARM_SP805_WATCHDOG=m
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
-# CONFIG_ARM_DT_BL_CPUFREQ is not set
 CONFIG_NR_CPUS=8
 
 CONFIG_SWIOTLB=y
@@ -55,7 +55,6 @@ CONFIG_FB_ARMCLCD=y
 
 # ARM VExpress
 CONFIG_ARCH_VEXPRESS=y
-CONFIG_VEXPRESS_CONFIG=y
 CONFIG_MFD_VEXPRESS_SYSREG=y
 CONFIG_VEXPRESS_SYSCFG=y
 CONFIG_COMMON_CLK_VERSATILE=y
@@ -66,6 +65,12 @@ CONFIG_POWER_RESET_VEXPRESS=y
 CONFIG_REGULATOR_VEXPRESS=m
 CONFIG_SENSORS_VEXPRESS=m
 CONFIG_CLKSRC_VERSATILE=y
+# CONFIG_ARM_CHARLCD is not set
+
+# Power/Thermal/Cpufreq
+CONFIG_GENERIC_CPUFREQ_CPU0=m
+# CONFIG_ARM_DT_BL_CPUFREQ is not set
+# CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set
 
 # Device tree
 CONFIG_DTC=y
@@ -241,7 +246,6 @@ CONFIG_CMA_AREAS=7
 
 # serial
 # CONFIG_SERIAL_SH_SCI is not set
-# CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST is not set
 
 # drm
 # CONFIG_DRM_VMWGFX is not set
diff --git a/config-arm64 b/config-arm64
index 77c5bdcd..fece9ccd 100644
--- a/config-arm64
+++ b/config-arm64
@@ -67,28 +67,6 @@ CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_VM_EVENT_COUNTERS=y
 
-# not arm64
-# CONFIG_GPIO_ADNP is not set
-# CONFIG_GPIO_MCP23S08 is not set
-# CONFIG_MDIO_BUS_MUX_GPIO is not set
-# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-
-
-# busted build for various reasons
-#  uses pci_* for some reason to allocate DMA buffers
-# CONFIG_DVB_B2C2_FLEXCOP_USB is not set
-#  weird include chain resulting in missing u64 type
-# CONFIG_USB_SPEEDTOUCH is not set
-#  dma issues in headers
-# CONFIG_PARPORT_PC is not set
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_POWER_RESET_XGENE=y
-CONFIG_COMMON_CLK_XGENE=y
-
-CONFIG_AHCI_XGENE=m
-CONFIG_PHY_XGENE=m
-CONFIG_RTC_DRV_XGENE=m
-
 CONFIG_EFI=y
 CONFIG_EFI_VARS=y
 CONFIG_EFIVAR_FS=y
@@ -104,5 +82,25 @@ CONFIG_CRYPTO_AES_ARM64_CE_CCM=m
 CONFIG_CRYPTO_AES_ARM64_CE_BLK=m
 CONFIG_CRYPTO_AES_ARM64_NEON_BLK=m
 
-# CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set
-# CONFIG_GENERIC_CPUFREQ_CPU0 is not set
+# APM Xgene
+CONFIG_POWER_RESET_XGENE=y
+CONFIG_COMMON_CLK_XGENE=y
+
+CONFIG_AHCI_XGENE=m
+CONFIG_PHY_XGENE=m
+CONFIG_RTC_DRV_XGENE=m
+
+# not arm64
+# CONFIG_GPIO_ADNP is not set
+# CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+
+# busted build for various reasons
+#  uses pci_* for some reason to allocate DMA buffers
+# CONFIG_DVB_B2C2_FLEXCOP_USB is not set
+#  weird include chain resulting in missing u64 type
+# CONFIG_USB_SPEEDTOUCH is not set
+#  dma issues in headers
+# CONFIG_PARPORT_PC is not set
+# CONFIG_VGA_CONSOLE is not set
diff --git a/config-armv7 b/config-armv7
index a048d69e..c02e37d8 100644
--- a/config-armv7
+++ b/config-armv7
@@ -56,7 +56,7 @@ CONFIG_USB_MV_UDC=m
 CONFIG_MVEBU_MBUS=y
 CONFIG_USB_XHCI_MVEBU=m
 CONFIG_PHY_MVEBU_SATA=y
-# CONFIG_AHCI_MVEBU is not set
+CONFIG_AHCI_MVEBU=m
 CONFIG_ARMADA_THERMAL=m
 CONFIG_DOVE_THERMAL=m
 CONFIG_DRM_ARMADA=m
@@ -64,6 +64,7 @@ CONFIG_ORION_WATCHDOG=m
 CONFIG_SND_KIRKWOOD_SOC=m
 CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
 CONFIG_USB_EHCI_HCD_ORION=m
+CONFIG_MMC_SDHCI_PXAV3=m
 # CONFIG_CACHE_FEROCEON_L2 is not set
 # CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
 
@@ -183,7 +184,6 @@ CONFIG_MTD_NAND_OMAP2=m
 CONFIG_MTD_NAND_OMAP_BCH=y
 CONFIG_SPI_OMAP24XX=m
 CONFIG_MFD_TI_SSP=m
-CONFIG_SPI_TI_SSP=m
 CONFIG_SPI_TI_QSPI=m
 
 CONFIG_INPUT_TWL4030_PWRBUTTON=m
@@ -355,11 +355,10 @@ CONFIG_SOC_IMX50=y
 CONFIG_SOC_IMX53=y
 CONFIG_SOC_IMX6Q=y
 CONFIG_SOC_IMX6SL=y
-# CONFIG_SOC_IMX6SX is not set
+CONFIG_SOC_IMX6SX=y
 # CONFIG_SOC_VF610 is not set
 CONFIG_MACH_IMX51_DT=y
 # CONFIG_MACH_MX51_BABBAGE is not set
-# CONFIG_MACH_EUKREA_CPUIMX51SD is not set
 CONFIG_ARM_IMX6Q_CPUFREQ=m
 CONFIG_IMX_THERMAL=m
 CONFIG_PATA_IMX=m
@@ -395,6 +394,8 @@ CONFIG_RTC_DRV_SNVS=m
 # CONFIG_FB_IMX is not set
 
 CONFIG_SND_IMX_SOC=m
+CONFIG_SND_SOC_FSL_ESAI=m
+CONFIG_SND_SOC_FSL_SAI=m
 CONFIG_SND_SOC_FSL_SPDIF=m
 CONFIG_SND_SOC_FSL_SSI=m
 CONFIG_SND_SOC_FSL_UTILS=m
@@ -407,6 +408,7 @@ CONFIG_SND_SOC_IMX_WM8962=m
 CONFIG_SND_SOC_IMX_MC13783=m
 CONFIG_SND_SOC_IMX_SPDIF=m
 CONFIG_SND_SOC_EUKREA_TLV320=m
+CONFIG_SND_SOC_TVL320AIC32X4=m
 
 CONFIG_USB_IMX21_HCD=m
 CONFIG_USB_MXS_PHY=m
@@ -577,7 +579,6 @@ CONFIG_MFD_TPS80031=y
 CONFIG_KEYBOARD_NVEC=y
 CONFIG_SERIO_NVEC_PS2=y
 CONFIG_NVEC_POWER=y
-CONFIG_POWER_SUPPLY=y
 CONFIG_NVEC_LEDS=y
 CONFIG_NVEC_PAZ00=y
 CONFIG_MFD_TPS6586X=y
@@ -616,11 +617,12 @@ CONFIG_XILINX_EMACLITE=m
 CONFIG_GPIO_XILINX=y
 CONFIG_I2C_XILINX=m
 CONFIG_SPI_XILINX=m
+CONFIG_SPI_CADENCE=m
 CONFIG_MMC_SDHCI_OF_ARASAN=m
 CONFIG_I2C_CADENCE=m
 CONFIG_XILINX_WATCHDOG=m
 CONFIG_XILINX_XADC=m
-# CONFIG_XILINX_VDMA is not set
+CONFIG_XILINX_VDMA=m
 CONFIG_SND_SOC_ADI=m
 CONFIG_SND_SOC_ADI_AXI_I2S=m
 CONFIG_SND_SOC_ADI_AXI_SPDIF=m
diff --git a/config-armv7-generic b/config-armv7-generic
index 07f8d8f0..4199415d 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -128,8 +128,7 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 
-# CONFIG_PCI_HOST_GENERIC is not set
-# CONFIG_BRCMSTB_GISB_ARB is not set
+CONFIG_PCI_HOST_GENERIC=y
 
 # Root as NFS, different from mainline
 CONFIG_ROOT_NFS=y
@@ -187,7 +186,7 @@ CONFIG_SPI_SUN6I=m
 CONFIG_MMC_SUNXI=m
 CONFIG_GPIO_PCA953X=m
 CONFIG_POWER_RESET_SUN6I=y
-# CONFIG_TOUCHSCREEN_SUN4I is not set
+CONFIG_TOUCHSCREEN_SUN4I=m
 
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=m
@@ -664,7 +663,6 @@ CONFIG_BPF_JIT=y
 # CONFIG_EZX_PCAP is not set
 
 # Needs work/investigation
-# CONFIG_ARM_CHARLCD is not set
 # CONFIG_MTD_AFS_PARTS is not set
 # CONFIG_IP_PNP_RARP is not set
 # CONFIG_DEPRECATED_PARAM_STRUCT is not set
@@ -680,6 +678,7 @@ CONFIG_BPF_JIT=y
 # CONFIG_SPI_FSL_DSPI is not set
 # CONFIG_FB_XILINX is not set
 # CONFIG_USB_S3C_HSOTG is not set
+# CONFIG_BRCMSTB_GISB_ARB is not set
 
 # these modules all fail with missing __bad_udelay
 # http://www.spinics.net/lists/arm/msg15615.html provides some background
diff --git a/kernel.spec b/kernel.spec
index 6c6eb267..0b1fa5e8 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2224,6 +2224,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Mon Jun 16 2014 Peter Robinson <pbrobinson@fedoraproject.org>
+- ARM config updates for 3.16
+
 * Sat Jun 14 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.16.0-0.rc0.git11.1
 - Linux v3.15-9930-g0e04c641b199
 - Enable CONFIG_RCU_NOCB_CPU(_ALL) (rbhz 1109113)