summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-arm-generic2
-rw-r--r--config-armv7-generic7
-rw-r--r--config-armv7-lpae2
-rw-r--r--kernel.spec3
4 files changed, 10 insertions, 4 deletions
diff --git a/config-arm-generic b/config-arm-generic
index 035e5c424..e533137e4 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -172,7 +172,6 @@ CONFIG_SND_HDA_TEGRA=m
# CONFIG_ARM_TEGRA20_CPUFREQ is not set
# CONFIG_MFD_NVEC is not set
-# CONFIG_TEGRA20_APB_DMA is not set
# Virt
CONFIG_PARAVIRT=y
@@ -442,7 +441,6 @@ CONFIG_VFIO_AMBA=m
# CONFIG_CADENCE_WATCHDOG is not set
# CONFIG_DRM_ARMADA is not set
-# CONFIG_DRM_TEGRA is not set
# CONFIG_SHMOBILE_IOMMU is not set
# CONFIG_COMMON_CLK_SI570 is not set
diff --git a/config-armv7-generic b/config-armv7-generic
index b3904423c..f042deef9 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -378,6 +378,13 @@ CONFIG_AD525X_DPOT=m
CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=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
+
# TI Generic
CONFIG_TI_SOC_THERMAL=m
CONFIG_TI_THERMAL=y
diff --git a/config-armv7-lpae b/config-armv7-lpae
index 828b13a87..4baa10c9b 100644
--- a/config-armv7-lpae
+++ b/config-armv7-lpae
@@ -71,7 +71,6 @@ CONFIG_GPIO_SYSCON=m
# CONFIG_SPI_TEGRA20_SFLASH is not set
# CONFIG_SPI_TEGRA20_SLINK is not set
# CONFIG_MFD_MAX8907 is not set
-# CONFIG_MFD_NVEC is not set
# CONFIG_SND_SOC_TEGRA_ALC5632 is not set
# CONFIG_SND_SOC_TEGRA_TRIMSLICE is not set
# CONFIG_SND_SOC_TEGRA_WM8753 is not set
@@ -80,5 +79,4 @@ CONFIG_GPIO_SYSCON=m
# CONFIG_SND_SOC_TEGRA20_AC97 is not set
# CONFIG_SND_SOC_TEGRA20_DAS is not set
# CONFIG_SND_SOC_TEGRA20_SPDIF is not set
-# CONFIG_SND_SOC_TEGRA_RT5677 is not set
# CONFIG_DRM_OMAP is not set
diff --git a/kernel.spec b/kernel.spec
index 8fd7f9143..487e68fdc 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2162,6 +2162,9 @@ fi
#
#
%changelog
+* Wed Mar 23 2016 Peter Robinson <pbrobinson@fedoraproject.org>
+- Fix Tegra Jetson TK1
+
* Tue Mar 22 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc0.git20.1
- Linux v4.5-11312-g01cde1538e1d
- nfs, overlayfs, fuse, xen, i2c, target, pci, sound, iommu merges