summaryrefslogtreecommitdiffstats
path: root/config-armv7
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2014-03-28 11:53:01 +0000
committerPeter Robinson <pbrobinson@gmail.com>2014-03-28 11:53:01 +0000
commit6e3b311e5a61ec18cf9eba47814e56145d7c706c (patch)
tree4648ed36c6762b98b5b0ac2a592a663dde5a89a1 /config-armv7
parent9a031d5070d9f8f5916c48637bd0c237cd52eaf9 (diff)
downloadkernel-6e3b311e5a61ec18cf9eba47814e56145d7c706c.tar.gz
kernel-6e3b311e5a61ec18cf9eba47814e56145d7c706c.tar.xz
kernel-6e3b311e5a61ec18cf9eba47814e56145d7c706c.zip
Enable Tegra 114/124 SoCs, Re-enable OMAP cpufreq, Re-enable CPSW PTP option
Diffstat (limited to 'config-armv7')
-rw-r--r--config-armv79
1 files changed, 5 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