diff options
| -rw-r--r-- | config-arm-generic | 23 | ||||
| -rw-r--r-- | config-arm64 | 2 | ||||
| -rw-r--r-- | config-armv7 | 7 | ||||
| -rw-r--r-- | config-armv7-generic | 22 | ||||
| -rw-r--r-- | kernel.spec | 8 |
5 files changed, 35 insertions, 27 deletions
diff --git a/config-arm-generic b/config-arm-generic index 1f023e553..37823e355 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -43,6 +43,7 @@ CONFIG_HAVE_PERF_USER_STACK_DUMP=y # ARM AMBA generic HW CONFIG_ARM_AMBA=y # CONFIG_TEGRA_AHB is not set +CONFIG_KERNEL_MODE_NEON=y CONFIG_ARM_CCI=y CONFIG_ARM_CCN=y CONFIG_ARM_DMA_USE_IOMMU=y @@ -76,9 +77,15 @@ CONFIG_CLKSRC_VERSATILE=y CONFIG_POWER_RESET_VERSATILE=y # CONFIG_ARM_CHARLCD is not set -# Power/Thermal/Cpufreq +# Power management / thermal / cpu scaling +# CONFIG_ARM_CPUIDLE is not set # CONFIG_ARM_DT_BL_CPUFREQ is not set # CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set +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 + # Device tree CONFIG_DTC=y @@ -108,6 +115,20 @@ CONFIG_THERMAL_OF=y # CONFIG_MDIO_BUS_MUX_GPIO is not set # CONFIG_MDIO_BUS_MUX_MMIOREG is not set +# Mailbox +CONFIG_MAILBOX=y +CONFIG_ARM_MHU=m +# CONFIG_PL320_MBOX is not set + +# HW crypto and rng +CONFIG_ARM_CRYPTO=y +CONFIG_CRYPTO_AES_ARM=m +# CONFIG_CRYPTO_AES_ARM_BS is not set +CONFIG_CRYPTO_SHA1_ARM=m +CONFIG_CRYPTO_SHA256_ARM=m +CONFIG_CRYPTO_SHA1_ARM_NEON=m +CONFIG_CRYPTO_SHA512_ARM_NEON=m + # USB CONFIG_USB_OHCI_HCD_PLATFORM=m CONFIG_USB_EHCI_HCD_PLATFORM=m diff --git a/config-arm64 b/config-arm64 index 1a32da9f3..52417b654 100644 --- a/config-arm64 +++ b/config-arm64 @@ -95,8 +95,6 @@ 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 CONFIG_COMMON_CLK_XGENE=y diff --git a/config-armv7 b/config-armv7 index 52e0ef4c7..36723f7ff 100644 --- a/config-armv7 +++ b/config-armv7 @@ -209,7 +209,10 @@ CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m CONFIG_SND_OMAP_SOC_RX51=m CONFIG_SND_SOC_TLV320AIC23=m +CONFIG_SND_SOC_TLV320AIC23_I2C=m +CONFIG_SND_SOC_TLV320AIC23_SPI=m CONFIG_SND_SOC_TLV320AIC3X=m +CONFIG_SND_SOC_TLV320AIC31XX=m CONFIG_SND_SOC_TPA6130A2=m CONFIG_SND_SOC_TWL4030=m CONFIG_SND_SOC_TWL6040=m @@ -322,6 +325,10 @@ CONFIG_QCOM_SPMI_IADC=m CONFIG_QCOM_SPMI_VADC=m CONFIG_INPUT_PM8941_PWRKEY=m CONFIG_LEDS_PM8941_WLED=m +CONFIG_SND_SOC_QCOM=m +CONFIG_SND_SOC_LPASS_CPU=m +CONFIG_SND_SOC_LPASS_PLATFORM=m +CONFIG_SND_SOC_STORM=m # i.MX # CONFIG_MXC_DEBUG_BOARD is not set diff --git a/config-armv7-generic b/config-armv7-generic index e321d8a1f..98812599d 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -14,7 +14,6 @@ CONFIG_VFP=y CONFIG_VFPv3=y CONFIG_NEON=y CONFIG_IWMMXT=y -CONFIG_KERNEL_MODE_NEON=y CONFIG_ARM_UNWIND=y CONFIG_ARM_THUMB=y @@ -46,7 +45,6 @@ CONFIG_IOMMU_IO_PGTABLE_LPAE=y # CONFIG_HVC_DCC is not set # CONFIG_XIP_KERNEL is not set # CONFIG_ARM_VIRT_EXT is not set -# CONFIG_ARM_CPUIDLE is not set # Platforms enabled/disabled globally on ARMv7 CONFIG_ARCH_EXYNOS=y @@ -117,11 +115,6 @@ CONFIG_RCU_FANOUT=32 CONFIG_CHECKPOINT_RESTORE=y # 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 @@ -606,29 +599,15 @@ CONFIG_I2C_DESIGNWARE_PLATFORM=m CONFIG_I2C_MV64XXX=m # HW crypto and rng -CONFIG_ARM_CRYPTO=y -CONFIG_CRYPTO_SHA1_ARM=m -CONFIG_CRYPTO_AES_ARM=m -# CONFIG_CRYPTO_AES_ARM_BS is not set -CONFIG_CRYPTO_SHA1_ARM_NEON=m -CONFIG_CRYPTO_SHA512_ARM_NEON=m # CONFIG_CRYPTO_SHA1_ARM_CE is not set # CONFIG_CRYPTO_SHA2_ARM_CE is not set -CONFIG_CRYPTO_SHA256_ARM=m # CONFIG_CRYPTO_AES_ARM_CE is not set # CONFIG_CRYPTO_GHASH_ARM_CE is not set - # DMA CONFIG_TI_PRIV_EDMA=y CONFIG_TI_EDMA=y -# Watchdog - -# Mailbox -CONFIG_MAILBOX=y -# CONFIG_ARM_MHU is not set - # MTD # CONFIG_MG_DISK is not set CONFIG_MTD_DATAFLASH=m @@ -661,7 +640,6 @@ CONFIG_EEPROM_93XX46=m # Sound CONFIG_SND_ARM=y CONFIG_SND_SOC_AC97_BUS=y -# CONFIG_SND_SOC_QCOM is not set # Displays CONFIG_BACKLIGHT_TPS65217=m diff --git a/kernel.spec b/kernel.spec index 8adb7c25c..73a6968e4 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1188,8 +1188,8 @@ ApplyPatch lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch # PPC # ARM64 -ApplyPatch net-amd-Add-xgbe-a0-driver.patch -ApplyPatch amd-xgbe-phy-a0-Add-support-for-XGBE-PHY-on-A0.patch +# ApplyPatch net-amd-Add-xgbe-a0-driver.patch +# ApplyPatch amd-xgbe-phy-a0-Add-support-for-XGBE-PHY-on-A0.patch ApplyPatch arm64-avoid-needing-console-to-enable-serial-console.patch ApplyPatch usb-make-xhci-platform-driver-use-64-bit-or-32-bit-D.patch @@ -2187,6 +2187,10 @@ fi # # %changelog +* Wed Apr 22 2015 Peter Robinson <pbrobinson@fedoraproject.org> +- Inital ARM updates for 4.1 +- Temporarily disable AMD ARM64 xgbe-a0 driver + * Wed Apr 22 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc0.git12.1 - Linux v4.0-9804-gdb4fd9c5d072 |