diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index 60b969124f91..62cbcfc8f2f9 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -59,6 +59,7 @@ CONFIG_ARCH_BCM=y
 CONFIG_ARCH_BRCMSTB=y
 CONFIG_ARCH_HISI=y
 CONFIG_ARCH_QCOM=y
+CONFIG_ARCH_TEGRA=y
 CONFIG_ARM64_VA_BITS_39=y
 CONFIG_SCHED_MC=y
 CONFIG_NR_CPUS=32
@@ -69,6 +70,7 @@ CONFIG_ARMV8_DEPRECATED=y
 CONFIG_SWP_EMULATION=y
 CONFIG_CP15_BARRIER_EMULATION=y
 CONFIG_SETEND_EMULATION=y
+CONFIG_ARM64_PMEM=y
 # CONFIG_ARM64_BTI_KERNEL is not set
 CONFIG_RANDOMIZE_BASE=y
 # CONFIG_RANDOMIZE_MODULE_REGION_FULL is not set
@@ -94,6 +96,7 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 CONFIG_ARM_SCPI_CPUFREQ=y
 CONFIG_ARM_SCMI_CPUFREQ=y
+# CONFIG_ARM_TEGRA194_CPUFREQ is not set
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=y
 CONFIG_PTDUMP_STAGE2_DEBUGFS=y
@@ -425,11 +428,13 @@ CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_NR_UARTS=32
 CONFIG_SERIAL_8250_RUNTIME_UARTS=0
 CONFIG_SERIAL_8250_DW=y
+# CONFIG_SERIAL_8250_TEGRA is not set
 CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_SERIAL_SAMSUNG=y
 CONFIG_SERIAL_SAMSUNG_CONSOLE=y
+CONFIG_SERIAL_TEGRA_TCU=y
 CONFIG_SERIAL_QCOM_GENI=y
 CONFIG_SERIAL_QCOM_GENI_CONSOLE=y
 CONFIG_SERIAL_SPRD=y
@@ -446,6 +451,7 @@ CONFIG_HW_RANDOM_CCTRNG=m
 # CONFIG_DEVPORT is not set
 # CONFIG_I2C_HELPER_AUTO is not set
 # CONFIG_I2C_BRCMSTB is not set
+# CONFIG_I2C_TEGRA_BPMP is not set
 CONFIG_I3C=y
 CONFIG_SPI=y
 CONFIG_SPI_MEM=y
@@ -465,6 +471,8 @@ CONFIG_PTP_1588_CLOCK=m
 # CONFIG_PINCTRL_SUN50I_H616_R is not set
 # CONFIG_GPIO_BRCMSTB is not set
 CONFIG_GPIO_GENERIC_PLATFORM=y
+# CONFIG_GPIO_TEGRA is not set
+# CONFIG_GPIO_TEGRA186 is not set
 # CONFIG_POWER_RESET_BRCMSTB is not set
 CONFIG_POWER_RESET_HISI=y
 CONFIG_POWER_RESET_SYSCON=y
@@ -627,7 +635,6 @@ CONFIG_CLK_KUNIT_TEST=m
 CONFIG_CLK_GATE_KUNIT_TEST=m
 CONFIG_HWSPINLOCK=y
 # CONFIG_SUN50I_ERRATUM_UNKNOWN1 is not set
-CONFIG_MAILBOX=y
 CONFIG_IOMMU_IO_PGTABLE_ARMV7S=y
 CONFIG_PKVM_PVIOMMU=y
 CONFIG_REMOTEPROC=y
@@ -635,12 +642,14 @@ CONFIG_REMOTEPROC_CDEV=y
 CONFIG_RPMSG_CHAR=y
 CONFIG_SOC_BRCMSTB=y
 CONFIG_QCOM_GENI_SE=y
+CONFIG_ARCH_TEGRA_234_SOC=y
 # CONFIG_ARM_SCPI_POWER_DOMAIN is not set
 CONFIG_DEVFREQ_GOV_PERFORMANCE=y
 CONFIG_DEVFREQ_GOV_POWERSAVE=y
 CONFIG_DEVFREQ_GOV_USERSPACE=y
 CONFIG_DEVFREQ_GOV_PASSIVE=y
 CONFIG_PM_DEVFREQ_EVENT=y
+CONFIG_MEMORY=y
 CONFIG_IIO=y
 CONFIG_IIO_BUFFER=y
 CONFIG_IIO_TRIGGER=y
@@ -660,7 +669,6 @@ CONFIG_ANDROID_BINDER_IPC_RUST=m
 CONFIG_ANDROID_VENDOR_HOOKS=y
 CONFIG_ANDROID_DEBUG_KINFO=y
 CONFIG_LIBNVDIMM=y
-CONFIG_INTERCONNECT=y
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y