diff options
| author | Nicolas Chauvet <kwizart@gmail.com> | 2014-06-04 23:37:32 +0200 |
|---|---|---|
| committer | Nicolas Chauvet <kwizart@gmail.com> | 2014-07-07 16:20:07 +0200 |
| commit | bb94e837aae36b6a0dc73a9a53de6d4dcbe5a6ee (patch) | |
| tree | d180737e8545fe9ee88cfd4febb499779ca09f19 | |
| parent | 93e94ca67374231e4bcf31844a7a62a033a8528c (diff) | |
| download | kernel-bb94e837aae36b6a0dc73a9a53de6d4dcbe5a6ee.tar.gz kernel-bb94e837aae36b6a0dc73a9a53de6d4dcbe5a6ee.tar.xz kernel-bb94e837aae36b6a0dc73a9a53de6d4dcbe5a6ee.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 e032333b..4c8160a3 100644 --- a/config-armv7 +++ b/config-armv7 @@ -567,7 +567,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 @@ -610,7 +611,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 be7822bd..ff755716 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -628,7 +628,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 |