diff options
| author | Nicolas Chauvet <kwizart@gmail.com> | 2014-06-04 23:37:32 +0200 |
|---|---|---|
| committer | Nicolas Chauvet <kwizart@gmail.com> | 2014-08-09 22:11:35 +0200 |
| commit | ae6a4b55a63b3b3789ea2cb380869b4294eaabc2 (patch) | |
| tree | fbcc786c552a66ef14986baf1985e27248ee0d1c | |
| parent | d0a8037e18de131b10aeba4940c03b2fb074f826 (diff) | |
| download | kernel-ae6a4b55a63b3b3789ea2cb380869b4294eaabc2.tar.gz kernel-ae6a4b55a63b3b3789ea2cb380869b4294eaabc2.tar.xz kernel-ae6a4b55a63b3b3789ea2cb380869b4294eaabc2.zip | |
Add TPS6586x RTC/Regulator as builtin
Conflicts:
config-armv7
| -rw-r--r-- | config-armv7 | 5 | ||||
| -rw-r--r-- | config-armv7-generic | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/config-armv7 b/config-armv7 index b1b420f8..b6837ee0 100644 --- a/config-armv7 +++ b/config-armv7 @@ -576,7 +576,8 @@ CONFIG_TEGRA_IOMMU_GART=y CONFIG_TEGRA_IOMMU_SMMU=y CONFIG_MMC_SDHCI_TEGRA=m CONFIG_TEGRA_WATCHDOG=m -CONFIG_I2C_TEGRA=m +CONFIG_I2C_TEGRA=y + CONFIG_TEGRA_SYSTEM_DMA=y CONFIG_TEGRA_EMC_SCALING_ENABLE=y CONFIG_TEGRA_AHB=y @@ -619,7 +620,7 @@ CONFIG_NVEC_LEDS=y CONFIG_NVEC_PAZ00=y CONFIG_MFD_TPS6586X=y CONFIG_GPIO_TPS6586X=y -CONFIG_RTC_DRV_TPS6586X=m +CONFIG_RTC_DRV_TPS6586X=y # Jetson TK1 CONFIG_PINCTRL_AS3722=y diff --git a/config-armv7-generic b/config-armv7-generic index 58abbb67..7d27d063 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -641,7 +641,7 @@ CONFIG_REGULATOR_TPS6507X=m CONFIG_REGULATOR_TPS65090=m CONFIG_REGULATOR_TPS65217=m CONFIG_REGULATOR_TPS6524X=m -CONFIG_REGULATOR_TPS6586X=m +CONFIG_REGULATOR_TPS6586X=y CONFIG_REGULATOR_TPS65910=m CONFIG_REGULATOR_TPS65912=m CONFIG_REGULATOR_TPS80031=m |