diff options
| -rw-r--r-- | config-arm-generic | 2 | ||||
| -rw-r--r-- | config-armv7 | 18 | ||||
| -rw-r--r-- | config-armv7-generic | 26 | ||||
| -rw-r--r-- | config-armv7-lpae | 6 | ||||
| -rw-r--r-- | kernel.spec | 6 |
5 files changed, 46 insertions, 12 deletions
diff --git a/config-arm-generic b/config-arm-generic index ce9d59d1c..8ea730c02 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -76,6 +76,7 @@ CONFIG_OF_PCI_IRQ=m CONFIG_OF_PCI=m # CONFIG_OF_SELFTEST is not set CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_THERMAL_OF=y # External Connectors CONFIG_EXTCON=m @@ -131,6 +132,7 @@ CONFIG_MFD_CORE=m CONFIG_SMC91X=m CONFIG_SMC911X=m +CONFIG_CPU_THERMAL=y CONFIG_THERMAL_GOV_USER_SPACE=y # CONFIG_CRYPTO_TEST is not set 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 diff --git a/config-armv7-generic b/config-armv7-generic index 3fb1b00d7..143cf06a1 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -69,7 +69,7 @@ CONFIG_EDAC_HIGHBANK_MC=m CONFIG_EDAC_HIGHBANK_L2=m CONFIG_SATA_HIGHBANK=m CONFIG_ARM_HIGHBANK_CPUFREQ=m -CONFIG_ARM_HIGHBANK_CPUIDLE=y +# CONFIG_ARM_HIGHBANK_CPUIDLE is not set # errata # v5/v6 @@ -276,6 +276,8 @@ CONFIG_GPIO_TPS65912=m CONFIG_LEDS_GPIO=m CONFIG_MDIO_BUS_MUX_GPIO=m CONFIG_MDIO_BUS_MUX_MMIOREG=m +CONFIG_INPUT_GPIO=m +CONFIG_INPUT_GPIO_BEEPER=m CONFIG_INPUT_GPIO_TILT_POLLED=m CONFIG_INPUT_MATRIXKMAP=m CONFIG_KEYBOARD_GPIO=m @@ -338,6 +340,22 @@ CONFIG_MTD_DATAFLASH=m CONFIG_MTD_DATAFLASH_WRITE_VERIFY=y CONFIG_MTD_DATAFLASH_OTP=y CONFIG_MTD_M25P80=m +CONFIG_MTD_NAND=m +CONFIG_MTD_NAND_CAFE=m +# CONFIG_MTD_NAND_DENALI is not set +CONFIG_MTD_NAND_DOCG4=m +CONFIG_MTD_NAND_ECC_SMC=y +CONFIG_MTD_NAND_FSMC=m +CONFIG_MTD_NAND_GPIO=m +CONFIG_MTD_NAND_MXC=m +CONFIG_MTD_NAND_NANDSIM=m +CONFIG_MTD_NAND_ORION=m +CONFIG_MTD_NAND_PLATFORM=m +CONFIG_MTD_NAND_PXA3xx=m +CONFIG_MTD_NAND_RICOH=m +CONFIG_MTD_NAND_TMIO=m +CONFIG_MTD_SPINAND_MT29F=m +CONFIG_MTD_SPINAND_ONDIEECC=y CONFIG_MTD_SST25L=m CONFIG_EEPROM_AT25=m CONFIG_EEPROM_93XX46=m @@ -535,6 +553,12 @@ CONFIG_UBIFS_FS_ZLIB=y # Sensors CONFIG_SENSORS_HTU21=m +# Chromebook +CONFIG_MFD_CROS_EC=m +CONFIG_MFD_CROS_EC_I2C=m +CONFIG_MFD_CROS_EC_SPI=m +CONFIG_KEYBOARD_CROS_EC=m + # Should be in generic CONFIG_BPF_JIT=y # CONFIG_NET_VENDOR_CIRRUS is not set diff --git a/config-armv7-lpae b/config-armv7-lpae index 1244aa8e7..beed9a81b 100644 --- a/config-armv7-lpae +++ b/config-armv7-lpae @@ -116,12 +116,6 @@ CONFIG_SAMSUNG_USB3PHY=m CONFIG_MMC_DW_EXYNOS=m CONFIG_RTC_DRV_S3C=m -# Chromebook -CONFIG_MFD_CROS_EC=m -CONFIG_MFD_CROS_EC_I2C=m -CONFIG_MFD_CROS_EC_SPI=m -CONFIG_KEYBOARD_CROS_EC=m - # Arndale/Origen CONFIG_MFD_MAX8997=y CONFIG_MFD_SEC_CORE=y diff --git a/kernel.spec b/kernel.spec index fad8ab052..98ca215fd 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2090,6 +2090,12 @@ fi # ||----w | # || || %changelog +* Sat Jan 25 2014 Peter Robinson <pbrobinson@fedoraproject.org> +- Initial ARM config updates for 3.14 +- Disable highbank cpuidle driver +- Enable mtd-nand drivers on ARM +- Update CPU thermal scaling options for ARM + * Fri Jan 24 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.14.0-0.rc0.git8.1 - Linux v3.13-5617-g3aacd62 |