diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2014-01-25 15:46:21 +0000 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2014-01-25 15:46:21 +0000 |
| commit | 7430c1fa4d84b53c1ee59493bd6b938739e58f78 (patch) | |
| tree | fdcb66c93930aa2712928f1e0c15495546f27281 /config-armv7 | |
| parent | 6fc2a346183696cd30401672f2d4238ba534336d (diff) | |
| download | kernel-7430c1fa4d84b53c1ee59493bd6b938739e58f78.tar.gz kernel-7430c1fa4d84b53c1ee59493bd6b938739e58f78.tar.xz kernel-7430c1fa4d84b53c1ee59493bd6b938739e58f78.zip | |
- Initial ARM config updates for 3.14
- Disable highbank cpuidle driver
- Enable mtd-nand drivers on ARM
- Update CPU thermal scaling options for ARM
Diffstat (limited to 'config-armv7')
| -rw-r--r-- | config-armv7 | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/config-armv7 b/config-armv7 index 0dab8afcb..0aa7e59e8 100644 --- a/config-armv7 +++ b/config-armv7 @@ -44,6 +44,7 @@ CONFIG_RTC_DRV_MV=m CONFIG_MVNETA=m CONFIG_GPIO_MVEBU=y CONFIG_MVEBU_CLK_CORE=y +CONFIG_MVEBU_CLK_COREDIV=y CONFIG_MVEBU_CLK_GATING=y CONFIG_MMC_MVSDIO=m CONFIG_SPI_ORION=m @@ -124,7 +125,6 @@ CONFIG_TWL6040_CORE=y CONFIG_CLK_TWL6040=m CONFIG_OMAP_INTERCONNECT=m CONFIG_MFD_OMAP_USB_HOST=y -CONFIG_MTD_ONENAND_OMAP2=m CONFIG_HDQ_MASTER_OMAP=m CONFIG_REGULATOR_TWL4030=y CONFIG_BACKLIGHT_PANDORA=m @@ -160,7 +160,9 @@ CONFIG_WILINK_PLATFORM_DATA=y CONFIG_MFD_WL1273_CORE=m CONFIG_NFC_WILINK=m +CONFIG_MTD_ONENAND_OMAP2=m 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 @@ -326,12 +328,12 @@ CONFIG_MDIO_SUN4I=m CONFIG_NET_VENDOR_ALLWINNER=y CONFIG_SUN4I_EMAC=m CONFIG_EEPROM_SUNXI_SID=m -# CONFIG_RTC_DRV_SUNXI is not set +CONFIG_RTC_DRV_SUNXI=m # i.MX CONFIG_MXC_IRQ_PRIOR=y # CONFIG_MXC_DEBUG_BOARD is not set -# CONFIG_SOC_IMX50 is not set +CONFIG_SOC_IMX50=y CONFIG_SOC_IMX53=y CONFIG_SOC_IMX6Q=y CONFIG_SOC_IMX6SL=y @@ -342,6 +344,7 @@ CONFIG_ARM_IMX6Q_CPUFREQ=m CONFIG_IMX_THERMAL=m CONFIG_PATA_IMX=m CONFIG_PCI_IMX6=y +# CONFIG_USB_EHCI_MXC is not set CONFIG_USB_CHIPIDEA=m CONFIG_USB_CHIPIDEA_UDC=y CONFIG_USB_CHIPIDEA_HOST=y @@ -350,13 +353,18 @@ CONFIG_USB_FSL_USB2=m CONFIG_NET_VENDOR_FREESCALE=y CONFIG_FEC=m CONFIG_KEYBOARD_IMX=m +CONFIG_KEYBOARD_STMPE=m +CONFIG_TOUCHSCREEN_STMPE=m CONFIG_SERIAL_IMX=y CONFIG_SERIAL_IMX_CONSOLE=y CONFIG_PINCTRL_IMX6SL=y CONFIG_I2C_IMX=m +CONFIG_STMPE_I2C=y CONFIG_SPI_IMX=m +CONFIG_STMPE_SPI=y CONFIG_MFD_MC13783=m CONFIG_MFD_MC13XXX_SPI=m +CONFIG_MFD_STMPE=y CONFIG_W1_MASTER_MXC=m CONFIG_IMX_WEIM=y CONFIG_IMX2_WDT=m @@ -377,7 +385,6 @@ CONFIG_SND_SOC_IMX_WM8962=m CONFIG_SND_SOC_IMX_MC13783=m CONFIG_SND_SOC_IMX_SPDIF=m -CONFIG_USB_EHCI_MXC=m CONFIG_USB_IMX21_HCD=m CONFIG_USB_MXS_PHY=m CONFIG_MMC_DW_SOCFPGA=m @@ -426,6 +433,7 @@ CONFIG_INPUT_DA9052_ONKEY=m CONFIG_INPUT_DA9055_ONKEY=m CONFIG_GPIO_DA9052=m CONFIG_GPIO_DA9055=m +CONFIG_GPIO_STMPE=y CONFIG_BATTERY_DA9052=m CONFIG_SENSORS_DA9052_ADC=m CONFIG_SENSORS_DA9055=m @@ -533,6 +541,7 @@ CONFIG_RTC_DRV_TEGRA=m CONFIG_SND_SOC_TEGRA=m CONFIG_SND_SOC_TEGRA_ALC5632=m +CONFIG_SND_SOC_TEGRA_MAX98090=m CONFIG_SND_SOC_TEGRA_RT5640=m CONFIG_SND_SOC_TEGRA_TRIMSLICE=m CONFIG_SND_SOC_TEGRA_WM8753=m @@ -541,7 +550,6 @@ CONFIG_SND_SOC_TEGRA_WM9712=m CONFIG_SND_SOC_TEGRA20_AC97=m CONFIG_SND_SOC_TEGRA30_AHUB=m CONFIG_SND_SOC_TEGRA30_I2S=m -# CONFIG_SND_SOC_TEGRA_MAX98090 is not set # bool only, upstream aiming for modular in 3.14 # https://lkml.org/lkml/2013/11/18/47 |