From: Arnd Bergmann Date: Fri, 15 Feb 2019 15:48:30 +0000 (+0100) Subject: Merge tag 'tegra-for-5.1-arm64-defconfig' of git://git.kernel.org/pub/scm/linux/kerne... X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=94e4d309ea724a96a4757db81f6bcc8d3a432afb;p=android-x86%2Fkernel.git Merge tag 'tegra-for-5.1-arm64-defconfig' of git://git./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 --- 94e4d309ea724a96a4757db81f6bcc8d3a432afb diff --cc arch/arm64/configs/defconfig index fca14eea5956,ad8f3dea0a74..28070ad3b223 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@@ -323,8 -319,7 +323,9 @@@ CONFIG_SERIAL_MESON_CONSOLE= 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 CONFIG_SERIAL_MSM=y CONFIG_SERIAL_MSM_CONSOLE=y @@@ -449,7 -438,7 +450,8 @@@ CONFIG_REGULATOR_GPIO= 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 CONFIG_REGULATOR_QCOM_SMD_RPM=y