summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-armv713
-rw-r--r--kernel.spec3
2 files changed, 11 insertions, 5 deletions
diff --git a/config-armv7 b/config-armv7
index 0ce26bb51..5339d7606 100644
--- a/config-armv7
+++ b/config-armv7
@@ -562,7 +562,6 @@ CONFIG_TEGRA_IOMMU_SMMU=y
CONFIG_MMC_SDHCI_TEGRA=m
CONFIG_TEGRA_WATCHDOG=m
CONFIG_I2C_TEGRA=m
-
CONFIG_TEGRA_SYSTEM_DMA=y
CONFIG_TEGRA_EMC_SCALING_ENABLE=y
CONFIG_TEGRA_AHB=y
@@ -570,7 +569,7 @@ CONFIG_TEGRA20_APB_DMA=y
CONFIG_SPI_TEGRA114=m
CONFIG_SPI_TEGRA20_SFLASH=m
CONFIG_SPI_TEGRA20_SLINK=m
-
+CONFIG_PWM_TEGRA=m
CONFIG_MFD_MAX8907=m
CONFIG_KEYBOARD_TEGRA=m
CONFIG_PINCTRL_TEGRA=y
@@ -578,6 +577,7 @@ CONFIG_PINCTRL_TEGRA20=y
CONFIG_PINCTRL_TEGRA30=y
CONFIG_USB_EHCI_TEGRA=m
CONFIG_RTC_DRV_TEGRA=m
+CONFIG_CRYPTO_DEV_TEGRA_AES=m
CONFIG_SND_SOC_TEGRA=m
CONFIG_SND_SOC_TEGRA_ALC5632=m
@@ -606,7 +606,12 @@ CONFIG_MFD_TPS6586X=y
CONFIG_GPIO_TPS6586X=y
CONFIG_RTC_DRV_TPS6586X=m
-CONFIG_PWM_TEGRA=m
+# Jetson TK1
+CONFIG_PINCTRL_AS3722=y
+CONFIG_POWER_RESET_AS3722=y
+CONFIG_MFD_AS3722=y
+CONFIG_REGULATOR_AS3722=m
+CONFIG_RTC_DRV_AS3722=y
CONFIG_TEGRA_HOST1X=m
CONFIG_TEGRA_HOST1X_FIREWALL=y
@@ -619,8 +624,6 @@ CONFIG_DRM_PANEL_SIMPLE=m
CONFIG_DRM_PANEL_LD9040=m
CONFIG_DRM_PANEL_S6E8AA0=m
-CONFIG_CRYPTO_DEV_TEGRA_AES=m
-
# OLPC XO
CONFIG_SERIO_OLPC_APSP=m
diff --git a/kernel.spec b/kernel.spec
index ff745436a..3f9785e92 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2220,6 +2220,9 @@ fi
# ||----w |
# || ||
%changelog
+* Thu Jun 19 2014 Peter Robinson <pbrobinson@fedoraproject.org>
+- Add missing bits for NVIDIA Jetson TK1 (thanks Stephen Warren)
+
* Wed Jun 18 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.16.0-0.rc1.git2.1
- Linux v3.16-rc1-17-ge99cfa2d0634