diff options
author | Peter Robinson <pbrobinson@gmail.com> | 2014-03-28 11:53:01 +0000 |
---|---|---|
committer | Peter Robinson <pbrobinson@gmail.com> | 2014-03-28 11:53:01 +0000 |
commit | 6e3b311e5a61ec18cf9eba47814e56145d7c706c (patch) | |
tree | 4648ed36c6762b98b5b0ac2a592a663dde5a89a1 | |
parent | 9a031d5070d9f8f5916c48637bd0c237cd52eaf9 (diff) | |
download | kernel-6e3b311e5a61ec18cf9eba47814e56145d7c706c.tar.gz kernel-6e3b311e5a61ec18cf9eba47814e56145d7c706c.tar.xz kernel-6e3b311e5a61ec18cf9eba47814e56145d7c706c.zip |
Enable Tegra 114/124 SoCs, Re-enable OMAP cpufreq, Re-enable CPSW PTP option
-rw-r--r-- | config-armv7 | 9 | ||||
-rw-r--r-- | kernel.spec | 5 |
2 files changed, 10 insertions, 4 deletions
diff --git a/config-armv7 b/config-armv7 index ef3ab60d6..d609bc65d 100644 --- a/config-armv7 +++ b/config-armv7 @@ -185,7 +185,7 @@ CONFIG_POWER_AVS=y CONFIG_POWER_AVS_OMAP=y CONFIG_POWER_AVS_OMAP_CLASS3=y -# CONFIG_ARM_OMAP2PLUS_CPUFREQ is not set +CONFIG_ARM_OMAP2PLUS_CPUFREQ=y CONFIG_PWM_TIECAP=m CONFIG_PWM_TIEHRPWM=m @@ -307,7 +307,7 @@ CONFIG_TI_DAVINCI_EMAC=m CONFIG_TI_DAVINCI_MDIO=m CONFIG_TI_CPSW=m CONFIG_TI_CPSW_PHY_SEL=y -# CONFIG_TI_CPTS is not set +CONFIG_TI_CPTS=y # Needed for BBone White CONFIG_REGULATOR_TPS65217=y CONFIG_TI_EMIF=m @@ -498,8 +498,8 @@ CONFIG_IIO_ST_SENSORS_CORE=m # tegra CONFIG_ARCH_TEGRA_2x_SOC=y CONFIG_ARCH_TEGRA_3x_SOC=y -# CONFIG_ARCH_TEGRA_114_SOC is not set -# CONFIG_ARCH_TEGRA_124_SOC is not set +CONFIG_ARCH_TEGRA_114_SOC=y +CONFIG_ARCH_TEGRA_124_SOC=y CONFIG_ARM_TEGRA_CPUFREQ=y CONFIG_TEGRA20_MC=y CONFIG_TEGRA30_MC=y @@ -513,6 +513,7 @@ CONFIG_TEGRA_IOMMU_SMMU=y CONFIG_MMC_SDHCI_TEGRA=m CONFIG_I2C_TEGRA=m +CONFIG_I2C_MUX_PCA954x=m CONFIG_TEGRA_SYSTEM_DMA=y CONFIG_TEGRA_EMC_SCALING_ENABLE=y diff --git a/kernel.spec b/kernel.spec index 458ec0baf..e72e5b193 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2068,6 +2068,11 @@ fi # ||----w | # || || %changelog +* Fri Mar 28 2014 Peter Robinson <pbrobinson@fedoraproject.org> +- Enable Tegra 114/124 SoCs +- Re-enable OMAP cpufreq +- Re-enable CPSW PTP option + * Thu Mar 27 2014 Josh Boyer <jwboyer@fedoraproject.org> - Switch to CONFIG_TRANSPARENT_HUGEPAGE_MADVISE instead of always on |