diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2014-06-16 13:25:03 +0100 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2014-06-16 13:25:03 +0100 |
| commit | b6e474380fd815ef2452ebb214438b749e57dfa8 (patch) | |
| tree | 790141ab5250a3c403a45cdc86af0386a5d42a0c /config-armv7 | |
| parent | 79d682febc2f96bbedb0e430773276dc48cefdc4 (diff) | |
| download | kernel-b6e474380fd815ef2452ebb214438b749e57dfa8.tar.gz kernel-b6e474380fd815ef2452ebb214438b749e57dfa8.tar.xz kernel-b6e474380fd815ef2452ebb214438b749e57dfa8.zip | |
ARM config updates for 3.16
Diffstat (limited to 'config-armv7')
| -rw-r--r-- | config-armv7 | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/config-armv7 b/config-armv7 index a048d69e8..c02e37d8a 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 |