summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2019-02-15 16:48:30 +0100
committerArnd Bergmann <arnd@arndb.de>2019-02-15 16:48:42 +0100
commit94e4d309ea724a96a4757db81f6bcc8d3a432afb (patch)
tree246beed4c36e26d32b4b866f99b1961e8dfabfd7
parentae4dbf8ced417277294e82178da563471ba61566 (diff)
parentbc72bed682a9502f5c8f5adf15107aef6237895e (diff)
downloadlinux-94e4d309ea724a96a4757db81f6bcc8d3a432afb.tar.bz2
Merge tag 'tegra-for-5.1-arm64-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/defconfig
arm64: tegra: Default configuration changes for v5.1-rc1 Enables the TCU driver to be built into the kernel, so that the TCU can be used as debug serial on Jetson Xavier. This also enables the MAX8973 regulator driver that is required for CPU frequency scaling on Tegra210. * tag 'tegra-for-5.1-arm64-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: arm64: defconfig: Enable Tegra TCU arm64: defconfig: Enable MAX8973 regulator Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--arch/arm64/configs/defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index fca14eea5956..28070ad3b223 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -323,6 +323,7 @@ CONFIG_SERIAL_MESON_CONSOLE=y
CONFIG_SERIAL_SAMSUNG=y
CONFIG_SERIAL_SAMSUNG_CONSOLE=y
CONFIG_SERIAL_TEGRA=y
+CONFIG_SERIAL_TEGRA_TCU=y
CONFIG_SERIAL_IMX=y
CONFIG_SERIAL_IMX_CONSOLE=y
CONFIG_SERIAL_SH_SCI=y
@@ -449,6 +450,7 @@ CONFIG_REGULATOR_GPIO=y
CONFIG_REGULATOR_HI6421V530=y
CONFIG_REGULATOR_HI655X=y
CONFIG_REGULATOR_MAX77620=y
+CONFIG_REGULATOR_MAX8973=y
CONFIG_REGULATOR_PFUZE100=y
CONFIG_REGULATOR_PWM=y
CONFIG_REGULATOR_QCOM_RPMH=y