nvidia: use kernel overlay features

Update all Kconfig files and Makefiles to rely on the kernel overlay
feature. In particular, don't include any Kconfig files or Makefiles
from other overlays. -I directives in CFLAGS are not yet cleaned up.

Bug 1978395

Change-Id: I425d37d55f8ea61fb3a082a1504f994ff30cec03
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1561187
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

157 files changed, 171 insertions, 89 deletions

diff --git a/arch/arm64/Kconfig.nvidia b/arch/arm64/Kconfig
index 81558a81b..81558a81b 100644
--- a/arch/arm64/Kconfig.nvidia
+++ b/arch/arm64/Kconfig
diff --git a/drivers/Kconfig b/drivers/Kconfig
new file mode 100644
index 000000000..edfd0ea6f
--- /dev/null
+++ b/drivers/Kconfig
@@ -0,0 +1,6 @@
+append_menu "Device Drivers"
+
+source "drivers/misc/tegra186-ahc/Kconfig"
+source "drivers/nvpmodel/Kconfig"
+
+endmenu
diff --git a/drivers/Makefile b/drivers/Makefile
new file mode 100644
index 000000000..c60307d97
--- /dev/null
+++ b/drivers/Makefile
@@ -0,0 +1,14 @@
+# Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms and conditions of the GNU General Public License,
+# version 2, as published by the Free Software Foundation.
+#
+# This program is distributed in the hope it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+
+subdir-ccflags-y += -Werror
+
+obj-$(CONFIG_NVPMODEL_EMC)      += nvpmodel/
diff --git a/drivers/Makefile.nvidia b/drivers/Makefile.nvidia
deleted file mode 100644
index 1b97a24fd..000000000
--- a/drivers/Makefile.nvidia
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms and conditions of the GNU General Public License,
-# version 2, as published by the Free Software Foundation.
-#
-# This program is distributed in the hope it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-# more details.
-
-subdir-ccflags-y += -Werror
-
-KBUILD_CFLAGS += -I$(srctree)/../nvidia/include
-
-obj-y += i2c/
-obj-y += media/
-obj-y += misc/
-obj-y += video/
-obj-y += platform/
-obj-$(CONFIG_CLK_SRC_TEGRA18_TIMER) += clocksource/
-obj-$(CONFIG_CRYPTO) += crypto/
-obj-y += dma/
-obj-y += spi/
-obj-$(CONFIG_CPU_FREQ)   += cpufreq/
-obj-y += pinctrl/
-obj-y += gpio/
-obj-y += watchdog/
-obj-y += reset/
-obj-$(CONFIG_THERMAL) += thermal/
-obj-y += net/
-obj-y += i2c/
-obj-$(CONFIG_CPU_IDLE) += cpuidle/
-obj-$(CONFIG_TEGRA186_AHC) += misc/tegra186-ahc/
-obj-y += tty/
-obj-y += input/
-obj-$(CONFIG_PADCTRL)           += padctrl/
-obj-$(CONFIG_NVPMODEL_EMC)      += nvpmodel/
-obj-$(CONFIG_REGULATOR)         += regulator/
diff --git a/drivers/ata/Kconfig.nvidia b/drivers/ata/Kconfig
index fd57a0458..fd57a0458 100644
--- a/drivers/ata/Kconfig.nvidia
+++ b/drivers/ata/Kconfig
diff --git a/drivers/ata/Makefile.nvidia b/drivers/ata/Makefile
index f2ad55db4..f2ad55db4 100644
--- a/drivers/ata/Makefile.nvidia
+++ b/drivers/ata/Makefile
diff --git a/drivers/ata/tegra/Makefile.nvidia b/drivers/ata/tegra/Makefile
index f8276eb50..f8276eb50 100644
--- a/drivers/ata/tegra/Makefile.nvidia
+++ b/drivers/ata/tegra/Makefile
diff --git a/drivers/clocksource/Kconfig.nvidia b/drivers/clocksource/Kconfig
index f2e4dde89..f2e4dde89 100644
--- a/drivers/clocksource/Kconfig.nvidia
+++ b/drivers/clocksource/Kconfig
diff --git a/drivers/clocksource/Makefile.nvidia b/drivers/clocksource/Makefile
index 7a169c183..7a169c183 100644
--- a/drivers/clocksource/Makefile.nvidia
+++ b/drivers/clocksource/Makefile
diff --git a/drivers/cpufreq/Makefile.nvidia b/drivers/cpufreq/Makefile
index 76d8d6f2a..76d8d6f2a 100644
--- a/drivers/cpufreq/Makefile.nvidia
+++ b/drivers/cpufreq/Makefile
diff --git a/drivers/cpuidle/Makefile.nvidia b/drivers/cpuidle/Makefile
index 24c000c34..24c000c34 100644
--- a/drivers/cpuidle/Makefile.nvidia
+++ b/drivers/cpuidle/Makefile
diff --git a/drivers/crypto/Kconfig.nvidia b/drivers/crypto/Kconfig
index 39ad143e6..c71a21cfc 100644
--- a/drivers/crypto/Kconfig.nvidia
+++ b/drivers/crypto/Kconfig
@@ -1,3 +1,4 @@
+if CRYPTO_HW
 
 config TEGRA_CRYPTO_DEV
         tristate "Device node to access tegra aes hardware"
@@ -35,3 +36,5 @@ config CRYPTO_DEV_TEGRA_VIRTUAL_SE_INTERFACE
         depends on ARCH_TEGRA_18x_SOC && CRYPTO_DEV_TEGRA_SE
         help
           This allows you to use Virtual SE interface for Tegra Crypto algorithms.
+
+endif
diff --git a/drivers/crypto/Makefile.nvidia b/drivers/crypto/Makefile
index 56bd62591..56bd62591 100644
--- a/drivers/crypto/Makefile.nvidia
+++ b/drivers/crypto/Makefile
diff --git a/drivers/dma/Kconfig.nvidia b/drivers/dma/Kconfig
index 90487df10..7d44c9284 100644
--- a/drivers/dma/Kconfig.nvidia
+++ b/drivers/dma/Kconfig
@@ -1,3 +1,5 @@
+if DMADEVICES
+
 config TEGRA186_GPC_DMA
         bool "NVIDIA Tegra186 GPC DMA support"
         depends on ARCH_TEGRA_18x_SOC
@@ -10,3 +12,4 @@ config TEGRA186_GPC_DMA
           This DMA controller transfers data from memory to peripheral fifo
           or vice versa. It also supports memory to memory data transfer.
 
+endif
diff --git a/drivers/dma/Makefile.nvidia b/drivers/dma/Makefile
index 3fb8c670c..3fb8c670c 100644
--- a/drivers/dma/Makefile.nvidia
+++ b/drivers/dma/Makefile
diff --git a/drivers/gpio/Kconfig.nvidia b/drivers/gpio/Kconfig
index 9ebf3f440..aced6473f 100644
--- a/drivers/gpio/Kconfig.nvidia
+++ b/drivers/gpio/Kconfig
@@ -1,5 +1,9 @@
+if GPIOLIB
+
 config GPIO_TEGRA186
         bool "NVIDIA Tegra186 GPIO support"
         select GPIO_SYSFS
         help
         Support for the NVIDIA Tegra186 GPIO controller driver.
+
+endif
diff --git a/drivers/gpio/Makefile.nvidia b/drivers/gpio/Makefile
index d1a1e6788..d1a1e6788 100644
--- a/drivers/gpio/Makefile.nvidia
+++ b/drivers/gpio/Makefile
diff --git a/drivers/gpu/drm/tegra/Makefile.nvidia b/drivers/gpu/drm/tegra/Makefile
index 98d4ee3c8..601d67886 100644
--- a/drivers/gpu/drm/tegra/Makefile.nvidia
+++ b/drivers/gpu/drm/tegra/Makefile
@@ -8,4 +8,6 @@ tegra-drm-t186-y = \
         nvjpg_t186.o \
         tsec_t186.o
 
+ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y)
 obj-$(CONFIG_TEGRA_HOST1X) += tegra-drm-t186.o
+endif
diff --git a/drivers/gpu/host1x/Makefile.nvidia b/drivers/gpu/host1x/Makefile
index 00744ed9f..0d61d12a6 100644
--- a/drivers/gpu/host1x/Makefile.nvidia
+++ b/drivers/gpu/host1x/Makefile
@@ -5,4 +5,4 @@ host1x-t186-y = \
         dev_t186.o \
         hw/host1x05.o
 
-obj-$(CONFIG_TEGRA_HOST1X) += host1x-t186.o
+obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += host1x-t186.o
diff --git a/drivers/i2c/Makefile.nvidia b/drivers/i2c/Makefile
index 0717b752f..0717b752f 100644
--- a/drivers/i2c/Makefile.nvidia
+++ b/drivers/i2c/Makefile
diff --git a/drivers/i2c/busses/Kconfig.nvidia b/drivers/i2c/busses/Kconfig
index 309587723..f800b3cdd 100644
--- a/drivers/i2c/busses/Kconfig.nvidia
+++ b/drivers/i2c/busses/Kconfig
@@ -1,3 +1,4 @@
+append_menu "I2C Hardware Bus support"
 
 config I2C_TEGRA_VI
         tristate "NVIDIA Tegra internal VII2C controller"
@@ -35,3 +36,5 @@ config I2C_TEGRA_CAMRTC
           compatible with I2C bus driver. The real driver is embedded in the
           Camera RTCPU firmware, and this driver merely communicates with
           that real driver.
+
+endmenu
diff --git a/drivers/i2c/busses/Makefile.nvidia b/drivers/i2c/busses/Makefile
index 2b0356f7c..2b0356f7c 100644
--- a/drivers/i2c/busses/Makefile.nvidia
+++ b/drivers/i2c/busses/Makefile
diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig
new file mode 100644
index 000000000..aece33abc
--- /dev/null
+++ b/drivers/iio/Kconfig
@@ -0,0 +1,3 @@
+if IIO
+source "drivers/iio/generic/Kconfig"
+endif
diff --git a/drivers/iio/Makefile b/drivers/iio/Makefile
new file mode 100644
index 000000000..7d635afdb
--- /dev/null
+++ b/drivers/iio/Makefile
@@ -0,0 +1 @@
+obj-y += generic/
diff --git a/drivers/iio/accel/Kconfig.nvidia b/drivers/iio/accel/Kconfig
index 92695d973..9628f6a4a 100644
--- a/drivers/iio/accel/Kconfig.nvidia
+++ b/drivers/iio/accel/Kconfig
@@ -1,3 +1,5 @@
+append_menu "Accelerometers"
+
 #
 # Accelerometer drivers
 #
@@ -9,3 +11,5 @@ config NVS_AIS328DQ
         help
           Say yes here to build support for STMicroelectronics AIS328DQ
           accelerometer using NVS (NVidia Sensor framework).
+
+endmenu
diff --git a/drivers/iio/accel/Makefile.nvidia b/drivers/iio/accel/Makefile
index 498154b9d..498154b9d 100644
--- a/drivers/iio/accel/Makefile.nvidia
+++ b/drivers/iio/accel/Makefile
diff --git a/drivers/iio/generic/Kconfig.nvidia b/drivers/iio/generic/Kconfig
index 6d65b4856..6d65b4856 100644
--- a/drivers/iio/generic/Kconfig.nvidia
+++ b/drivers/iio/generic/Kconfig
diff --git a/drivers/iio/generic/Makefile.nvidia b/drivers/iio/generic/Makefile
index 32785cf7e..32785cf7e 100644
--- a/drivers/iio/generic/Makefile.nvidia
+++ b/drivers/iio/generic/Makefile
diff --git a/drivers/iio/gyro/Kconfig.nvidia b/drivers/iio/gyro/Kconfig
index 21f8c01b2..65f224e65 100644
--- a/drivers/iio/gyro/Kconfig.nvidia
+++ b/drivers/iio/gyro/Kconfig
@@ -1,3 +1,5 @@
+append_menu "Digital gyroscope sensors"
+
 #
 # Gyroscope drivers
 #
@@ -10,3 +12,4 @@ config NVS_A3G4250D
           Say yes here to build support for STMicroelectronics A3G4250D
           gyroscope using NVS (NVidia Sensor framework).
 
+endmenu
diff --git a/drivers/iio/gyro/Makefile.nvidia b/drivers/iio/gyro/Makefile
index e26bd0100..e26bd0100 100644
--- a/drivers/iio/gyro/Makefile.nvidia
+++ b/drivers/iio/gyro/Makefile
diff --git a/drivers/iio/imu/Kconfig b/drivers/iio/imu/Kconfig
new file mode 100644
index 000000000..cec1e70f8
--- /dev/null
+++ b/drivers/iio/imu/Kconfig
@@ -0,0 +1,3 @@
+append_menu "Inertial measurement units"
+source "drivers/iio/imu/nvi_mpu/Kconfig"
+endmenu
diff --git a/drivers/iio/imu/Makefile b/drivers/iio/imu/Makefile
new file mode 100644
index 000000000..88351dea7
--- /dev/null
+++ b/drivers/iio/imu/Makefile
@@ -0,0 +1 @@
+obj-y += nvi_mpu/
diff --git a/drivers/iio/imu/nvi_mpu/Kconfig.nvidia b/drivers/iio/imu/nvi_mpu/Kconfig
index ddf57b081..ddf57b081 100644
--- a/drivers/iio/imu/nvi_mpu/Kconfig.nvidia
+++ b/drivers/iio/imu/nvi_mpu/Kconfig
diff --git a/drivers/iio/imu/nvi_mpu/Makefile.nvidia b/drivers/iio/imu/nvi_mpu/Makefile
index 017080d26..017080d26 100644
--- a/drivers/iio/imu/nvi_mpu/Makefile.nvidia
+++ b/drivers/iio/imu/nvi_mpu/Makefile
diff --git a/drivers/iio/light/Kconfig.nvidia b/drivers/iio/light/Kconfig
index 532f71263..33da25260 100644
--- a/drivers/iio/light/Kconfig.nvidia
+++ b/drivers/iio/light/Kconfig
@@ -1,3 +1,5 @@
+append_menu "Light sensors"
+
 #
 # Light sensor drivers
 #
@@ -71,3 +73,5 @@ config NVS_MAX4400X
 
           The driver uses the NVS (NVidia Sensor) IIO, light and
           proximity framework.
+
+endmenu
diff --git a/drivers/iio/light/Makefile.nvidia b/drivers/iio/light/Makefile
index fcfcb34fd..fcfcb34fd 100644
--- a/drivers/iio/light/Makefile.nvidia
+++ b/drivers/iio/light/Makefile
diff --git a/drivers/iio/magnetometer/Kconfig.nvidia b/drivers/iio/magnetometer/Kconfig
index a1e37cce9..8cc26208c 100644
--- a/drivers/iio/magnetometer/Kconfig.nvidia
+++ b/drivers/iio/magnetometer/Kconfig
@@ -1,3 +1,5 @@
+append_menu "Magnetometer sensors"
+
 #
 # Magnetometer sensors
 #
@@ -14,3 +16,4 @@ config NVI_AK89XX
           To compile this driver as a module, choose M here: the module
           will be called nvi-ak89xx.
 
+endmenu
diff --git a/drivers/iio/magnetometer/Makefile.nvidia b/drivers/iio/magnetometer/Makefile
index e36bd6f4e..e36bd6f4e 100644
--- a/drivers/iio/magnetometer/Makefile.nvidia
+++ b/drivers/iio/magnetometer/Makefile
diff --git a/drivers/iio/pressure/Kconfig.nvidia b/drivers/iio/pressure/Kconfig
index 08e24a0e0..10b8c5652 100644
--- a/drivers/iio/pressure/Kconfig.nvidia
+++ b/drivers/iio/pressure/Kconfig
@@ -1,3 +1,5 @@
+append_menu "Pressure sensors"
+
 #
 # Pressure drivers
 #
@@ -13,3 +15,4 @@ config NVI_BMPX80
           To compile this driver as a module, choose M here: the module
           will be called nvi-bmpX80.
 
+endmenu
diff --git a/drivers/iio/pressure/Makefile.nvidia b/drivers/iio/pressure/Makefile
index 0cbc76179..0cbc76179 100644
--- a/drivers/iio/pressure/Makefile.nvidia
+++ b/drivers/iio/pressure/Makefile
diff --git a/drivers/iio/proximity/Kconfig.nvidia b/drivers/iio/proximity/Kconfig
index bc1526bad..b152dc2e3 100644
--- a/drivers/iio/proximity/Kconfig.nvidia
+++ b/drivers/iio/proximity/Kconfig
@@ -1,3 +1,5 @@
+menu "Proximity sensors"
+
 #
 # Proximity sensors
 #
@@ -11,3 +13,4 @@ config NVS_IQS2X3
           The driver uses the NVS (NVidia Sensor) IIO and proximity
           framework.
 
+endmenu
diff --git a/drivers/iio/proximity/Makefile.nvidia b/drivers/iio/proximity/Makefile
index 194d2594d..194d2594d 100644
--- a/drivers/iio/proximity/Makefile.nvidia
+++ b/drivers/iio/proximity/Makefile
diff --git a/drivers/input/Makefile.nvidia b/drivers/input/Makefile
index 51db8266c..51db8266c 100644
--- a/drivers/input/Makefile.nvidia
+++ b/drivers/input/Makefile
diff --git a/drivers/input/touchscreen/Kconfig.nvidia b/drivers/input/touchscreen/Kconfig
index 7a76f9d2b..fb5033c8f 100644
--- a/drivers/input/touchscreen/Kconfig.nvidia
+++ b/drivers/input/touchscreen/Kconfig
@@ -1,3 +1,5 @@
+if INPUT_TOUCHSCREEN
+
 config TOUCHSCREEN_NVIDIA_ATMEL_MXT
         tristate "NVIDIA Atmel mXT I2C Touchscreen"
         depends on I2C
@@ -38,3 +40,5 @@ config TOUCHSCREEN_RM31080A
 
           To compile this driver as a module, choose M here: the
           module will be called RAYDIUM_31080A.
+
+endif
diff --git a/drivers/input/touchscreen/Makefile.nvidia b/drivers/input/touchscreen/Makefile
index bb3b1a6e5..bb3b1a6e5 100644
--- a/drivers/input/touchscreen/Makefile.nvidia
+++ b/drivers/input/touchscreen/Makefile
diff --git a/drivers/media/Makefile.nvidia b/drivers/media/Makefile
index 9c93f0c06..9c93f0c06 100644
--- a/drivers/media/Makefile.nvidia
+++ b/drivers/media/Makefile
diff --git a/drivers/media/i2c/Kconfig.nvidia b/drivers/media/i2c/Kconfig
index 46f106c52..ee842dc62 100644
--- a/drivers/media/i2c/Kconfig.nvidia
+++ b/drivers/media/i2c/Kconfig
@@ -1,3 +1,7 @@
+if VIDEO_V4L2
+
+menu "NVIDIA overlay Encoders, decoders, sensors and other helper chips"
+        visible if !MEDIA_SUBDRV_AUTOSELECT || COMPILE_TEST
 
 config VIDEO_IMX185
         tristate "IMX185 camera sensor support"
@@ -94,3 +98,7 @@ config VIDEO_TC358840
 
           To compile this driver as a module, choose M here: the
           module will be called tc358840.
+
+endmenu
+
+endif
diff --git a/drivers/media/i2c/Makefile.nvidia b/drivers/media/i2c/Makefile
index f1f14864f..f1f14864f 100644
--- a/drivers/media/i2c/Makefile.nvidia
+++ b/drivers/media/i2c/Makefile
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
new file mode 100644
index 000000000..09e97cf1f
--- /dev/null
+++ b/drivers/media/platform/Kconfig
@@ -0,0 +1,3 @@
+menu "NVIDIA overlay V4L platform devices"
+source "drivers/media/platform/tegra/Kconfig"
+endmenu
diff --git a/drivers/media/platform/Makefile.nvidia b/drivers/media/platform/Makefile
index 3d50fea2a..3d50fea2a 100644
--- a/drivers/media/platform/Makefile.nvidia
+++ b/drivers/media/platform/Makefile
diff --git a/drivers/media/platform/tegra/Kconfig.nvidia b/drivers/media/platform/tegra/Kconfig
index 3eeef2916..9075bc727 100644
--- a/drivers/media/platform/tegra/Kconfig.nvidia
+++ b/drivers/media/platform/tegra/Kconfig
@@ -1,5 +1,4 @@
-
-source "../nvidia/drivers/media/platform/tegra/mipical/Kconfig.nvidia"
+source "drivers/media/platform/tegra/mipical/Kconfig"
 
 config VIDEO_CAMERA
         tristate "generic camera device support"
diff --git a/drivers/media/platform/tegra/Makefile.nvidia b/drivers/media/platform/tegra/Makefile
index 4a8a01c5e..4a8a01c5e 100644
--- a/drivers/media/platform/tegra/Makefile.nvidia
+++ b/drivers/media/platform/tegra/Makefile
diff --git a/drivers/media/platform/tegra/camera/Makefile.nvidia b/drivers/media/platform/tegra/camera/Makefile
index 292550a26..292550a26 100644
--- a/drivers/media/platform/tegra/camera/Makefile.nvidia
+++ b/drivers/media/platform/tegra/camera/Makefile
diff --git a/drivers/media/platform/tegra/camera/csi/Makefile.nvidia b/drivers/media/platform/tegra/camera/csi/Makefile
index 7fcd48c53..7fcd48c53 100644
--- a/drivers/media/platform/tegra/camera/csi/Makefile.nvidia
+++ b/drivers/media/platform/tegra/camera/csi/Makefile
diff --git a/drivers/media/platform/tegra/camera/vi/Makefile.nvidia b/drivers/media/platform/tegra/camera/vi/Makefile
index 77884f3dd..77884f3dd 100644
--- a/drivers/media/platform/tegra/camera/vi/Makefile.nvidia
+++ b/drivers/media/platform/tegra/camera/vi/Makefile
diff --git a/drivers/media/platform/tegra/isc/Makefile.nvidia b/drivers/media/platform/tegra/isc/Makefile
index 359d479df..359d479df 100644
--- a/drivers/media/platform/tegra/isc/Makefile.nvidia
+++ b/drivers/media/platform/tegra/isc/Makefile
diff --git a/drivers/media/platform/tegra/mipical/Kconfig.nvidia b/drivers/media/platform/tegra/mipical/Kconfig
index e00659b2b..e00659b2b 100644
--- a/drivers/media/platform/tegra/mipical/Kconfig.nvidia
+++ b/drivers/media/platform/tegra/mipical/Kconfig
diff --git a/drivers/media/platform/tegra/mipical/Makefile.nvidia b/drivers/media/platform/tegra/mipical/Makefile
index ffd996e09..ffd996e09 100644
--- a/drivers/media/platform/tegra/mipical/Makefile.nvidia
+++ b/drivers/media/platform/tegra/mipical/Makefile
diff --git a/drivers/media/platform/tegra/tpg/Makefile.nvidia b/drivers/media/platform/tegra/tpg/Makefile
index 3a94af88b..3a94af88b 100644
--- a/drivers/media/platform/tegra/tpg/Makefile.nvidia
+++ b/drivers/media/platform/tegra/tpg/Makefile
diff --git a/drivers/media/platform/tegra/vi/Makefile.nvidia b/drivers/media/platform/tegra/vi/Makefile
index da13dd5dc..da13dd5dc 100644
--- a/drivers/media/platform/tegra/vi/Makefile.nvidia
+++ b/drivers/media/platform/tegra/vi/Makefile
diff --git a/drivers/media/spi/Kconfig.nvidia b/drivers/media/spi/Kconfig
index bf401f57a..bf401f57a 100644
--- a/drivers/media/spi/Kconfig.nvidia
+++ b/drivers/media/spi/Kconfig
diff --git a/drivers/media/spi/Makefile.nvidia b/drivers/media/spi/Makefile
index 54ae95255..54ae95255 100644
--- a/drivers/media/spi/Makefile.nvidia
+++ b/drivers/media/spi/Makefile
diff --git a/drivers/misc/Kconfig.nvidia b/drivers/misc/Kconfig
index 23a631dd2..a43cd3ffe 100644
--- a/drivers/misc/Kconfig.nvidia
+++ b/drivers/misc/Kconfig
@@ -1,3 +1,5 @@
+append_menu "Misc devices"
+
 config MODS
         tristate "NVIDIA MODS driver"
         select OF_DYNAMIC
@@ -75,4 +77,9 @@ config TEGRA_SKIN
           features like rail power, rail current, backlight brightness. The
           driver estimates multiple hotspot temperatures based on OF configuration.
 
-trysource "../nvidia/drivers/misc/nvs-dfsh/Kconfig.nvidia"
+source "drivers/misc/nvs-dfsh/Kconfig"
+source "drivers/misc/nvs/Kconfig"
+source "drivers/misc/nvs-aonsh/Kconfig"
+source "drivers/misc/tegra-profiler/Kconfig"
+
+endmenu
diff --git a/drivers/misc/Makefile.nvidia b/drivers/misc/Makefile
index a0fc051bf..cb57e0334 100644
--- a/drivers/misc/Makefile.nvidia
+++ b/drivers/misc/Makefile
@@ -1,4 +1,7 @@
 obj-$(CONFIG_MODS) += mods/
+obj-y += nvs/
+obj-y += nvs-aonsh/
+obj-$(CONFIG_TEGRA_PROFILER) += tegra-profiler/
 
 obj-$(CONFIG_NVS_DFSH) += nvs-dfsh/
 obj-$(CONFIG_SAF775x_HWDEP) += saf775x/
@@ -9,3 +12,4 @@ obj-$(CONFIG_THERM_EST)		+= therm_est.o
 obj-$(CONFIG_FAN_THERM_EST)     += therm_fan_est.o
 obj-$(CONFIG_EQOS_APE_HWDEP) += eqos_ape/
 obj-$(CONFIG_TEGRA_SKIN)        += tegra-skin.o
+obj-$(CONFIG_TEGRA186_AHC) += tegra186-ahc/
diff --git a/drivers/misc/eqos_ape/Makefile.nvidia b/drivers/misc/eqos_ape/Makefile
index 7d7872042..7d7872042 100644
--- a/drivers/misc/eqos_ape/Makefile.nvidia
+++ b/drivers/misc/eqos_ape/Makefile
diff --git a/drivers/misc/eqos_ape/eqos_ape_ioctl.h b/drivers/misc/eqos_ape/eqos_ape_ioctl.h
index faafa916e..b82232902 100644
--- a/drivers/misc/eqos_ape/eqos_ape_ioctl.h
+++ b/drivers/misc/eqos_ape/eqos_ape_ioctl.h
@@ -25,7 +25,7 @@
 #include <linux/cdev.h>
 #include <linux/fs.h>
 
-#include <eqos_ape_global.h>
+#include "eqos_ape_global.h"
 
 struct eqos_ape_cmd {
         int ppm;
diff --git a/drivers/misc/mods/Makefile.nvidia b/drivers/misc/mods/Makefile
index 95ea29169..95ea29169 100644
--- a/drivers/misc/mods/Makefile.nvidia
+++ b/drivers/misc/mods/Makefile
diff --git a/drivers/misc/nvs-aonsh/Kconfig.nvidia b/drivers/misc/nvs-aonsh/Kconfig
index cbe5c85be..cbe5c85be 100644
--- a/drivers/misc/nvs-aonsh/Kconfig.nvidia
+++ b/drivers/misc/nvs-aonsh/Kconfig
diff --git a/drivers/misc/nvs-aonsh/Makefile.nvidia b/drivers/misc/nvs-aonsh/Makefile
index c1c78be2a..c1c78be2a 100644
--- a/drivers/misc/nvs-aonsh/Makefile.nvidia
+++ b/drivers/misc/nvs-aonsh/Makefile
diff --git a/drivers/misc/nvs-aonsh/nvs_aon_shub.c b/drivers/misc/nvs-aonsh/nvs_aon_shub.c
index 82ac8b46e..819a01616 100644
--- a/drivers/misc/nvs-aonsh/nvs_aon_shub.c
+++ b/drivers/misc/nvs-aonsh/nvs_aon_shub.c
@@ -63,7 +63,7 @@
 #include <asm/io.h>
 #include <asm/arch_timer.h>
 
-#include <aon-shub-messages.h>
+#include "aon-shub-messages.h"
 
 #define READJUST_TS_SAMPLES (100)
 
diff --git a/drivers/misc/nvs-dfsh/Kconfig.nvidia b/drivers/misc/nvs-dfsh/Kconfig
index e14aa86a8..e14aa86a8 100644
--- a/drivers/misc/nvs-dfsh/Kconfig.nvidia
+++ b/drivers/misc/nvs-dfsh/Kconfig
diff --git a/drivers/misc/nvs-dfsh/Makefile.nvidia b/drivers/misc/nvs-dfsh/Makefile
index 36ae32f38..36ae32f38 100644
--- a/drivers/misc/nvs-dfsh/Makefile.nvidia
+++ b/drivers/misc/nvs-dfsh/Makefile
diff --git a/drivers/misc/nvs/Kconfig.nvidia b/drivers/misc/nvs/Kconfig
index e22cfe44a..e22cfe44a 100644
--- a/drivers/misc/nvs/Kconfig.nvidia
+++ b/drivers/misc/nvs/Kconfig
diff --git a/drivers/misc/nvs/Makefile.nvidia b/drivers/misc/nvs/Makefile
index 19b17dfb5..19b17dfb5 100644
--- a/drivers/misc/nvs/Makefile.nvidia
+++ b/drivers/misc/nvs/Makefile
diff --git a/drivers/misc/saf775x/Makefile.nvidia b/drivers/misc/saf775x/Makefile
index 65839e9f6..65839e9f6 100644
--- a/drivers/misc/saf775x/Makefile.nvidia
+++ b/drivers/misc/saf775x/Makefile
diff --git a/drivers/misc/tegra-cec/Kconfig.nvidia b/drivers/misc/tegra-cec/Kconfig
index 074f74300..f7fe81c12 100644
--- a/drivers/misc/tegra-cec/Kconfig.nvidia
+++ b/drivers/misc/tegra-cec/Kconfig
@@ -1,6 +1,9 @@
+if ARCH_TEGRA
+
 config TEGRA_CEC_SUPPORT
         bool "Tegra CEC support"
         depends on TEGRA_DC
         ---help---
          Enables HDMI-CEC driver for Tegra SoC.
 
+endif
diff --git a/drivers/misc/tegra-profiler/Kconfig.nvidia b/drivers/misc/tegra-profiler/Kconfig
index c320906d3..c320906d3 100644
--- a/drivers/misc/tegra-profiler/Kconfig.nvidia
+++ b/drivers/misc/tegra-profiler/Kconfig
diff --git a/drivers/misc/tegra-profiler/Makefile.nvidia b/drivers/misc/tegra-profiler/Makefile
index 5abff8d1f..5abff8d1f 100644
--- a/drivers/misc/tegra-profiler/Makefile.nvidia
+++ b/drivers/misc/tegra-profiler/Makefile
diff --git a/drivers/misc/tegra186-ahc/Kconfig.nvidia b/drivers/misc/tegra186-ahc/Kconfig
index 017125c29..017125c29 100644
--- a/drivers/misc/tegra186-ahc/Kconfig.nvidia
+++ b/drivers/misc/tegra186-ahc/Kconfig
diff --git a/drivers/misc/tegra186-ahc/Makefile.nvidia b/drivers/misc/tegra186-ahc/Makefile
index 8e7279353..8e7279353 100644
--- a/drivers/misc/tegra186-ahc/Makefile.nvidia
+++ b/drivers/misc/tegra186-ahc/Makefile
diff --git a/drivers/net/Makefile.nvidia b/drivers/net/Makefile
index fdedda760..fdedda760 100644
--- a/drivers/net/Makefile.nvidia
+++ b/drivers/net/Makefile
diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
new file mode 100644
index 000000000..71ebba10b
--- /dev/null
+++ b/drivers/net/can/Kconfig
@@ -0,0 +1,5 @@
+if CAN_DEV
+source "drivers/net/can/mttcan/native/Kconfig"
+source "drivers/net/can/mttcan/ivc/Kconfig"
+source "drivers/net/can/nvsec/Kconfig"
+endif
diff --git a/drivers/net/can/Kconfig.nvidia b/drivers/net/can/Kconfig.nvidia
deleted file mode 100644
index 2dfd58d9e..000000000
--- a/drivers/net/can/Kconfig.nvidia
+++ /dev/null
@@ -1,3 +0,0 @@
-trysource "../nvidia/drivers/net/can/mttcan/native/Kconfig.nvidia"
-trysource "../nvidia/drivers/net/can/mttcan/ivc/Kconfig.nvidia"
-trysource "../nvidia/drivers/net/can/nvsec/Kconfig.nvidia"
diff --git a/drivers/net/can/Makefile.nvidia b/drivers/net/can/Makefile
index ba6577458..ba6577458 100644
--- a/drivers/net/can/Makefile.nvidia
+++ b/drivers/net/can/Makefile
diff --git a/drivers/net/can/mttcan/Makefile.nvidia b/drivers/net/can/mttcan/Makefile
index 8459c62cc..8459c62cc 100644
--- a/drivers/net/can/mttcan/Makefile.nvidia
+++ b/drivers/net/can/mttcan/Makefile
diff --git a/drivers/net/can/mttcan/ivc/Kconfig.nvidia b/drivers/net/can/mttcan/ivc/Kconfig
index a73619fd7..a73619fd7 100644
--- a/drivers/net/can/mttcan/ivc/Kconfig.nvidia
+++ b/drivers/net/can/mttcan/ivc/Kconfig
diff --git a/drivers/net/can/mttcan/ivc/Makefile.nvidia b/drivers/net/can/mttcan/ivc/Makefile
index 4ce03181d..4ce03181d 100644
--- a/drivers/net/can/mttcan/ivc/Makefile.nvidia
+++ b/drivers/net/can/mttcan/ivc/Makefile
diff --git a/drivers/net/can/mttcan/native/Kconfig.nvidia b/drivers/net/can/mttcan/native/Kconfig
index 28e8730ab..28e8730ab 100644
--- a/drivers/net/can/mttcan/native/Kconfig.nvidia
+++ b/drivers/net/can/mttcan/native/Kconfig
diff --git a/drivers/net/can/mttcan/native/Makefile.nvidia b/drivers/net/can/mttcan/native/Makefile
index 502d57b2c..b642dce42 100644
--- a/drivers/net/can/mttcan/native/Makefile.nvidia
+++ b/drivers/net/can/mttcan/native/Makefile
@@ -21,4 +21,4 @@ mttcan-y = m_ttcan_linux.o m_ttcan_sys.o ../hal/m_ttcan.o
 mttcan-y += ../hal/m_ttcan_intr.o ../hal/m_ttcan_list.o  ../hal/m_ttcan_ram.o
 mttcan-y += ../hal/m_ttcan_tt.o
 
-ccflags-y += -I$(src)/../include
+ccflags-y += -I$(overlay)/drivers/net/can/mttcan/include
diff --git a/drivers/net/can/nvsec/Kconfig.nvidia b/drivers/net/can/nvsec/Kconfig
index a0a50568b..a0a50568b 100644
--- a/drivers/net/can/nvsec/Kconfig.nvidia
+++ b/drivers/net/can/nvsec/Kconfig
diff --git a/drivers/net/can/nvsec/Makefile.nvidia b/drivers/net/can/nvsec/Makefile
index 9d6ab7a6b..9d6ab7a6b 100644
--- a/drivers/net/can/nvsec/Makefile.nvidia
+++ b/drivers/net/can/nvsec/Makefile
diff --git a/drivers/nvpmodel/Kconfig.nvidia b/drivers/nvpmodel/Kconfig
index 9a559af7d..9a559af7d 100644
--- a/drivers/nvpmodel/Kconfig.nvidia
+++ b/drivers/nvpmodel/Kconfig
diff --git a/drivers/nvpmodel/Makefile.nvidia b/drivers/nvpmodel/Makefile
index f7bf6edee..f7bf6edee 100644
--- a/drivers/nvpmodel/Makefile.nvidia
+++ b/drivers/nvpmodel/Makefile
diff --git a/drivers/padctrl/Kconfig.nvidia b/drivers/padctrl/Kconfig
index b81b1b169..5696fec65 100644
--- a/drivers/padctrl/Kconfig.nvidia
+++ b/drivers/padctrl/Kconfig
@@ -1,4 +1,5 @@
 if PADCTRL
+
 config PADCTRL_GENERIC_TEGRA_IO_PAD
         bool "Generic Tegra IO Pad control driver"
         depends on ARCH_TEGRA
@@ -7,4 +8,5 @@ config PADCTRL_GENERIC_TEGRA_IO_PAD
 
           Tegra IO Pad padctrl driver which controls the IO pad
           configuration for 1.2V, 1.8V and 3.3V.
+
 endif
diff --git a/drivers/padctrl/Makefile.nvidia b/drivers/padctrl/Makefile
index b7a726230..b7a726230 100644
--- a/drivers/padctrl/Makefile.nvidia
+++ b/drivers/padctrl/Makefile
diff --git a/drivers/pinctrl/Kconfig.nvidia b/drivers/pinctrl/Kconfig
index 325875a27..4261010aa 100644
--- a/drivers/pinctrl/Kconfig.nvidia
+++ b/drivers/pinctrl/Kconfig
@@ -1,3 +1,5 @@
+append_menu "Pin controllers"
+
 config PINCTRL_TEGRA186
         bool "NVIDIA Tegra186 Pinmux support"
         select PINCTRL_TEGRA
@@ -17,3 +19,5 @@ config PINCTRL_TEGRA186_DPAUX
         depends on ARCH_TEGRA_18x_SOC
         select PINCONF
         select PINMUX
+
+endmenu
diff --git a/drivers/pinctrl/Makefile.nvidia b/drivers/pinctrl/Makefile
index d7f607883..d7f607883 100644
--- a/drivers/pinctrl/Makefile.nvidia
+++ b/drivers/pinctrl/Makefile
diff --git a/drivers/platform/Makefile.nvidia b/drivers/platform/Makefile
index 3d50fea2a..3d50fea2a 100644
--- a/drivers/platform/Makefile.nvidia
+++ b/drivers/platform/Makefile
diff --git a/drivers/platform/tegra/Kconfig.nvidia b/drivers/platform/tegra/Kconfig
index 82f5fd03d..7dfd2a00d 100644
--- a/drivers/platform/tegra/Kconfig.nvidia
+++ b/drivers/platform/tegra/Kconfig
@@ -130,3 +130,5 @@ config TEGRA_SAFETY_SCE
           This enables communication between CCPLEX and SCE over IVC channel.
           This also provides a userspace command response interface as
           character device which will be used by other safety modules.
+
+source "drivers/platform/tegra/nvadsp/Kconfig"
diff --git a/drivers/platform/tegra/Makefile.nvidia b/drivers/platform/tegra/Makefile
index 90eab4ba1..944691b82 100644
--- a/drivers/platform/tegra/Makefile.nvidia
+++ b/drivers/platform/tegra/Makefile
@@ -43,3 +43,5 @@ obj-$(CONFIG_DENVER_DEBUG)+= denver-hardwood.o
 obj-$(CONFIG_DENVER_MCA) += denver_mca.o
 obj-$(CONFIG_TEGRA_SAFETY_SCE) += tegra-safety.o
 tegra-safety-objs += tegra-safety-ivc.o tegra-safety-dev.o
+
+obj-$(CONFIG_TEGRA_NVADSP) += nvadsp/
diff --git a/drivers/platform/tegra/nvadsp/Kconfig.nvidia b/drivers/platform/tegra/nvadsp/Kconfig
index 4f3fa7004..4f3fa7004 100644
--- a/drivers/platform/tegra/nvadsp/Kconfig.nvidia
+++ b/drivers/platform/tegra/nvadsp/Kconfig
diff --git a/drivers/platform/tegra/nvadsp/Makefile.nvidia b/drivers/platform/tegra/nvadsp/Makefile
index 87c8cd37d..87c8cd37d 100644
--- a/drivers/platform/tegra/nvadsp/Makefile.nvidia
+++ b/drivers/platform/tegra/nvadsp/Makefile
diff --git a/drivers/platform/tegra/powergate/Makefile.nvidia b/drivers/platform/tegra/powergate/Makefile
index b89051683..b89051683 100644
--- a/drivers/platform/tegra/powergate/Makefile.nvidia
+++ b/drivers/platform/tegra/powergate/Makefile
diff --git a/drivers/platform/tegra/rtcpu/Makefile.nvidia b/drivers/platform/tegra/rtcpu/Makefile
index 0b37f13b7..0b37f13b7 100644
--- a/drivers/platform/tegra/rtcpu/Makefile.nvidia
+++ b/drivers/platform/tegra/rtcpu/Makefile
diff --git a/drivers/regulator/Kconfig.nvidia b/drivers/regulator/Kconfig
index 321ed2c9e..11a01543c 100644
--- a/drivers/regulator/Kconfig.nvidia
+++ b/drivers/regulator/Kconfig
@@ -7,5 +7,5 @@ config REGULATOR_PMIC_OTP
           without any actual implementation. This should be used if it
           is required to use the PMCI OTP configuration and do not want
           to register PMIC.
-endif
 
+endif
diff --git a/drivers/regulator/Makefile.nvidia b/drivers/regulator/Makefile
index 9dbd02bf5..9dbd02bf5 100644
--- a/drivers/regulator/Makefile.nvidia
+++ b/drivers/regulator/Makefile
diff --git a/drivers/reset/Makefile.nvidia b/drivers/reset/Makefile
index 94a640234..94a640234 100644
--- a/drivers/reset/Makefile.nvidia
+++ b/drivers/reset/Makefile
diff --git a/drivers/reset/tegra/Makefile.nvidia b/drivers/reset/tegra/Makefile
index eec4279fc..eec4279fc 100644
--- a/drivers/reset/tegra/Makefile.nvidia
+++ b/drivers/reset/tegra/Makefile
diff --git a/drivers/scsi/ufs/Kconfig.nvidia b/drivers/scsi/ufs/Kconfig
index b81d09153..b81d09153 100644
--- a/drivers/scsi/ufs/Kconfig.nvidia
+++ b/drivers/scsi/ufs/Kconfig
diff --git a/drivers/scsi/ufs/Makefile.nvidia b/drivers/scsi/ufs/Makefile
index 025f7075f..025f7075f 100644
--- a/drivers/scsi/ufs/Makefile.nvidia
+++ b/drivers/scsi/ufs/Makefile
diff --git a/drivers/spi/Kconfig.nvidia b/drivers/spi/Kconfig
index 4d43f6557..f0209f956 100644
--- a/drivers/spi/Kconfig.nvidia
+++ b/drivers/spi/Kconfig
@@ -1,6 +1,12 @@
+if SPI
+if SPI_MASTER
+
 config SPI_TEGRA186_AON
         bool "Tegra18x AON SPI proxy driver"
         depends on ARCH_TEGRA_18x_SOC
         default y
         select TEGRA_IVC
         select TEGRA_HSP
+
+endif
+endif
diff --git a/drivers/spi/Makefile.nvidia b/drivers/spi/Makefile
index 5c671030f..5c671030f 100644
--- a/drivers/spi/Makefile.nvidia
+++ b/drivers/spi/Makefile
diff --git a/drivers/staging/iio/meter/Kconfig.nvidia b/drivers/staging/iio/meter/Kconfig
index 2f57c55ba..f8221d3d1 100644
--- a/drivers/staging/iio/meter/Kconfig.nvidia
+++ b/drivers/staging/iio/meter/Kconfig
@@ -1,3 +1,5 @@
+append_menu "Active energy metering IC"
+
 config INA219
         tristate "TI INA219 bidirectional current/power monitor"
         depends on I2C
@@ -21,3 +23,5 @@ config INA3221
           TI INA3221 is Triple-Channel, High-Side Measurement, Shunt and Bus
           Voltage Monitor with I2C Interface
           Say Y here if you have INA3221 hooked to a I2C bus.
+
+endmenu
diff --git a/drivers/staging/iio/meter/Makefile.nvidia b/drivers/staging/iio/meter/Makefile
index 85557f4c9..85557f4c9 100644
--- a/drivers/staging/iio/meter/Makefile.nvidia
+++ b/drivers/staging/iio/meter/Makefile
diff --git a/drivers/thermal/Makefile.nvidia b/drivers/thermal/Makefile
index 0c48740ad..0c48740ad 100644
--- a/drivers/thermal/Makefile.nvidia
+++ b/drivers/thermal/Makefile
diff --git a/drivers/thermal/tegra/Kconfig.nvidia b/drivers/thermal/tegra/Kconfig
index db9f4bc7f..dfcd3c3b6 100644
--- a/drivers/thermal/tegra/Kconfig.nvidia
+++ b/drivers/thermal/tegra/Kconfig
@@ -1,3 +1,5 @@
+append_menu "NVIDIA Tegra thermal drivers"
+
 config TEGRA_AOTAG
         bool "Tegra Always-On-Thermal-Alert-Generator"
         help
@@ -26,3 +28,5 @@ config TEGRA_DFLL_CAPS
         help
           This config enables a cooling device that enforces VF limits on the
           cpu DFLL clock.
+
+endmenu
diff --git a/drivers/thermal/tegra/Makefile.nvidia b/drivers/thermal/tegra/Makefile
index 5338fddc9..5338fddc9 100644
--- a/drivers/thermal/tegra/Makefile.nvidia
+++ b/drivers/thermal/tegra/Makefile
diff --git a/drivers/tty/Makefile.nvidia b/drivers/tty/Makefile
index dd3b9b662..dd3b9b662 100644
--- a/drivers/tty/Makefile.nvidia
+++ b/drivers/tty/Makefile
diff --git a/drivers/tty/serial/Kconfig.nvidia b/drivers/tty/serial/Kconfig
index f82bf9d27..0175aac45 100644
--- a/drivers/tty/serial/Kconfig.nvidia
+++ b/drivers/tty/serial/Kconfig
@@ -1,3 +1,5 @@
+if TTY
+
 config TEGRA_COMBINED_UART
         bool "Tegra combined UART"
         depends on ARCH_TEGRA_18x_SOC
@@ -22,3 +24,5 @@ config TEGRA_HV_COMM
 
           To compile this driver as a module, choose M here: the
           module will be called tegra_hv_comm.
+
+endif
diff --git a/drivers/tty/serial/Makefile.nvidia b/drivers/tty/serial/Makefile
index b83ebcb0e..b83ebcb0e 100644
--- a/drivers/tty/serial/Makefile.nvidia
+++ b/drivers/tty/serial/Makefile
diff --git a/drivers/video/Makefile.nvidia b/drivers/video/Makefile
index 200a62c22..200a62c22 100644
--- a/drivers/video/Makefile.nvidia
+++ b/drivers/video/Makefile
diff --git a/drivers/video/backlight/Kconfig.nvidia b/drivers/video/backlight/Kconfig
index 41ea86b56..4e1bdee5a 100644
--- a/drivers/video/backlight/Kconfig.nvidia
+++ b/drivers/video/backlight/Kconfig
@@ -16,4 +16,3 @@ config BACKLIGHT_DS1050
 endif # BACKLIGHT_CLASS_DEVICE
 
 endif # BACKLIGHT_LCD_SUPPORT
-
diff --git a/drivers/video/backlight/Makefile.nvidia b/drivers/video/backlight/Makefile
index 72e7f845e..72e7f845e 100644
--- a/drivers/video/backlight/Makefile.nvidia
+++ b/drivers/video/backlight/Makefile
diff --git a/drivers/video/tegra/Kconfig.nvidia b/drivers/video/tegra/Kconfig
index 3e42f0181..5a938037d 100644
--- a/drivers/video/tegra/Kconfig.nvidia
+++ b/drivers/video/tegra/Kconfig
@@ -1,3 +1,5 @@
+if ARCH_TEGRA
+
 config TEGRA_GRHOST
         tristate "Tegra graphics host driver"
         help
@@ -337,5 +339,8 @@ config TEGRA_DC_FAKE_PANEL_SUPPORT
           automated testing. should not be enabled
           for production.
 
-trysource "../nvidia/drivers/misc/tegra-cec/Kconfig.nvidia"
-trysource "../t19x/drivers/video/tegra/host/Kconfig.t19x"
+source "drivers/misc/tegra-cec/Kconfig"
+source "drivers/video/tegra/host/Kconfig"
+source "drivers/video/tegra/nvmap/Kconfig"
+
+endif
diff --git a/drivers/video/tegra/Makefile.nvidia b/drivers/video/tegra/Makefile
index 999b3eabd..999b3eabd 100644
--- a/drivers/video/tegra/Makefile.nvidia
+++ b/drivers/video/tegra/Makefile
diff --git a/drivers/video/tegra/camera/Makefile b/drivers/video/tegra/camera/Makefile
index f4b9dcd1d..2c4d58e48 100644
--- a/drivers/video/tegra/camera/Makefile
+++ b/drivers/video/tegra/camera/Makefile
@@ -1,8 +1,5 @@
 GCOV_PROFILE := y
-ccflags-y += -Idrivers/media/platform/tegra/vi
-ccflags-y += -I../nvidia/drivers/video/tegra/host
-ccflags-y += -Idrivers/video/tegra/host
-ccflags-y += -Idrivers/media/platform/tegra/
+ccflags-y += -I$(overlay)/drivers/video/tegra/host
 
 ifdef CONFIG_TEGRA_CAMERA_PLATFORM
 obj-y += tegra_camera_platform.o
diff --git a/drivers/video/tegra/camera/Makefile.nvidia b/drivers/video/tegra/camera/Makefile.nvidia
deleted file mode 100644
index 9e5a3b4e9..000000000
--- a/drivers/video/tegra/camera/Makefile.nvidia
+++ /dev/null
@@ -1,7 +0,0 @@
-GCOV_PROFILE := y
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host
-ccflags-y += -I$(srctree)/drivers/video/tegra/host
-ccflags-y += -I$(srctree)/../nvidia/drivers/media/platform/tegra
-
-obj-y += tegra_camera_platform.o
-obj-y += tegra_camera_dev_mfi.o
diff --git a/drivers/video/tegra/dc/Makefile b/drivers/video/tegra/dc/Makefile
index afe85a47f..217053ce1 100644
--- a/drivers/video/tegra/dc/Makefile
+++ b/drivers/video/tegra/dc/Makefile
@@ -1,9 +1,9 @@
 GCOV_PROFILE := y
 subdir-ccflags-y := -Werror
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host
-ifeq ($(CONFIG_TEGRA_NVDISPLAY),y)
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/dc
-ccflags-y += -I$(srctree)/../nvidia/drivers/platform/tegra
+ccflags-y += -I$(overlay)/drivers/video/tegra/host
+ifneq ($(CONFIG_TEGRA_NVDISPLAY),y)
+ccflags-y += -I$(overlay)/drivers/video/tegra/dc
+ccflags-y += -I$(overlay)/drivers/platform/tegra
 endif
 ccflags-y += -I$(srctree)/arch/arm/mach-tegra
 obj-y += dc_common.o dc.o mode.o clock.o window.o dc_client.o
@@ -24,7 +24,7 @@ obj-$(CONFIG_TEGRA_LVDS2FPDL_DS90UB947) += ds90ub947-q1.o
 obj-$(CONFIG_TEGRA_DS90UH948Q_DESER)    += ds90uh948q_deser.o
 obj-$(CONFIG_TEGRA_EDP2LVDS_PS8625) += ps8625_edp2lvds.o
 ccflags-y +=-DCOMMON_MIPICAL_SUPPORTED\
-        -I$(srctree)/../nvidia/drivers/media/platform/tegra
+        -I$(overlay)/drivers/media/platform/tegra
 
 ifneq ($(CONFIG_TEGRA_NVDISPLAY),y)
 obj-$(CONFIG_TEGRA_HDMIHDCP) += hdmihdcp.o
@@ -69,3 +69,4 @@ obj-$(CONFIG_TEGRA_HDMIVRR) += hdmivrr.o
 obj-y += panel/
 obj-$(CONFIG_TEGRA_CEC_SUPPORT) += ../../../misc/tegra-cec/
 obj-y += crc.o
+obj-$(CONFIG_TEGRA_NVDISPLAY) += nvdisp/
diff --git a/drivers/video/tegra/dc/Makefile.nvidia b/drivers/video/tegra/dc/Makefile.nvidia
deleted file mode 100644
index 783c0cb0d..000000000
--- a/drivers/video/tegra/dc/Makefile.nvidia
+++ /dev/null
@@ -1,2 +0,0 @@
-GCOV_PROFILE := y
-obj-$(CONFIG_TEGRA_NVDISPLAY) += nvdisp/
diff --git a/drivers/video/tegra/dc/nvdisp/Makefile.nvidia b/drivers/video/tegra/dc/nvdisp/Makefile
index 741e73aff..741e73aff 100644
--- a/drivers/video/tegra/dc/nvdisp/Makefile.nvidia
+++ b/drivers/video/tegra/dc/nvdisp/Makefile
diff --git a/drivers/video/tegra/host/Makefile.nvidia b/drivers/video/tegra/host/Makefile
index a02696d24..807d3c30c 100644
--- a/drivers/video/tegra/host/Makefile.nvidia
+++ b/drivers/video/tegra/host/Makefile
@@ -36,13 +36,9 @@ ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y)
 obj-$(CONFIG_TEGRA_GRHOST) += iommu_context_dev.o
 
 obj-$(CONFIG_TEGRA_GRHOST) += t186/
-obj-$(CONFIG_TEGRA_GRHOST_NVCSI) += nvcsi/
-endif
-
-ifeq ($(CONFIG_TEGRA_T19X_GRHOST),y)
-obj-$(CONFIG_TEGRA_GRHOST) += $(call tegra-path,t19x/,drivers/video/tegra/host/)
 endif
 
+obj-$(CONFIG_TEGRA_GRHOST_NVCSI) += nvcsi/
 obj-$(CONFIG_TEGRA_GRHOST_SYNC) += nvhost_sync.o
 obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += vi/
 obj-$(CONFIG_TEGRA_GRHOST_VHOST) += vhost/
diff --git a/drivers/video/tegra/host/flcn/Makefile.nvidia b/drivers/video/tegra/host/flcn/Makefile
index 7f88f693c..7f88f693c 100644
--- a/drivers/video/tegra/host/flcn/Makefile.nvidia
+++ b/drivers/video/tegra/host/flcn/Makefile
diff --git a/drivers/video/tegra/host/host1x/Makefile.nvidia b/drivers/video/tegra/host/host1x/Makefile
index fad713355..fad713355 100644
--- a/drivers/video/tegra/host/host1x/Makefile.nvidia
+++ b/drivers/video/tegra/host/host1x/Makefile
diff --git a/drivers/video/tegra/host/isp/Makefile.nvidia b/drivers/video/tegra/host/isp/Makefile
index 5936983bf..5936983bf 100644
--- a/drivers/video/tegra/host/isp/Makefile.nvidia
+++ b/drivers/video/tegra/host/isp/Makefile
diff --git a/drivers/video/tegra/host/nvcsi/Makefile.nvidia b/drivers/video/tegra/host/nvcsi/Makefile
index b8d2b1a6e..b8d2b1a6e 100644
--- a/drivers/video/tegra/host/nvcsi/Makefile.nvidia
+++ b/drivers/video/tegra/host/nvcsi/Makefile
diff --git a/drivers/video/tegra/host/nvdec/Makefile.nvidia b/drivers/video/tegra/host/nvdec/Makefile
index 8536b0486..8536b0486 100644
--- a/drivers/video/tegra/host/nvdec/Makefile.nvidia
+++ b/drivers/video/tegra/host/nvdec/Makefile
diff --git a/drivers/video/tegra/host/t124/Makefile.nvidia b/drivers/video/tegra/host/t124/Makefile
index 196033dfe..196033dfe 100644
--- a/drivers/video/tegra/host/t124/Makefile.nvidia
+++ b/drivers/video/tegra/host/t124/Makefile
diff --git a/drivers/video/tegra/host/t186/Makefile.nvidia b/drivers/video/tegra/host/t186/Makefile
index c6dcdb995..c6dcdb995 100644
--- a/drivers/video/tegra/host/t186/Makefile.nvidia
+++ b/drivers/video/tegra/host/t186/Makefile
diff --git a/drivers/video/tegra/host/t210/Makefile.nvidia b/drivers/video/tegra/host/t210/Makefile
index cbf9b6afd..cbf9b6afd 100644
--- a/drivers/video/tegra/host/t210/Makefile.nvidia
+++ b/drivers/video/tegra/host/t210/Makefile
diff --git a/drivers/video/tegra/host/tsec/Makefile.nvidia b/drivers/video/tegra/host/tsec/Makefile
index b9412a05b..b9412a05b 100644
--- a/drivers/video/tegra/host/tsec/Makefile.nvidia
+++ b/drivers/video/tegra/host/tsec/Makefile
diff --git a/drivers/video/tegra/host/vhost/Makefile.nvidia b/drivers/video/tegra/host/vhost/Makefile
index fc0079ad9..fc0079ad9 100644
--- a/drivers/video/tegra/host/vhost/Makefile.nvidia
+++ b/drivers/video/tegra/host/vhost/Makefile
diff --git a/drivers/video/tegra/host/vi/Makefile.nvidia b/drivers/video/tegra/host/vi/Makefile
index d07f74cbe..d07f74cbe 100644
--- a/drivers/video/tegra/host/vi/Makefile.nvidia
+++ b/drivers/video/tegra/host/vi/Makefile
diff --git a/drivers/video/tegra/nvmap/Kconfig.nvidia b/drivers/video/tegra/nvmap/Kconfig
index 753139e9e..753139e9e 100644
--- a/drivers/video/tegra/nvmap/Kconfig.nvidia
+++ b/drivers/video/tegra/nvmap/Kconfig
diff --git a/drivers/video/tegra/nvmap/Makefile.nvidia b/drivers/video/tegra/nvmap/Makefile
index 1f2f78f8a..d68b9bd5a 100644
--- a/drivers/video/tegra/nvmap/Makefile.nvidia
+++ b/drivers/video/tegra/nvmap/Makefile
@@ -27,9 +27,3 @@ obj-$(CONFIG_NVMAP_PAGE_POOLS) += nvmap_pp.o
 ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y)
 obj-y += nvmap_cache_nvmap_t18x.o
 endif
-
-ifeq ($(CONFIG_ARCH_TEGRA_19x_SOC),y)
-ifneq ($(wildcard $(srctree)/../t19x/drivers/video/tegra/nvmap/Makefile),)
-obj-y += $(call tegra-path,t19x/,drivers/video/tegra/nvmap/)
-endif
-endif
diff --git a/drivers/watchdog/Kconfig.nvidia b/drivers/watchdog/Kconfig
index 7647e324a..031707dbd 100644
--- a/drivers/watchdog/Kconfig.nvidia
+++ b/drivers/watchdog/Kconfig
@@ -1,3 +1,5 @@
+if WATCHDOG
+
 config TEGRA18X_WATCHDOG
         tristate "Tegra T18x watchdog"
         depends on ARCH_TEGRA_18x_SOC
@@ -18,3 +20,4 @@ config TEGRA_HV_WATCHDOG
           To compile this driver as a module, choose M here: the
           module will be called tegra_hv_wdt.
 
+endif
diff --git a/drivers/watchdog/Makefile.nvidia b/drivers/watchdog/Makefile
index 16abc7edb..16abc7edb 100644
--- a/drivers/watchdog/Makefile.nvidia
+++ b/drivers/watchdog/Makefile
diff --git a/sound/pci/Kconfig.nvidia b/sound/pci/Kconfig.nvidia
deleted file mode 100644
index 8360f7de1..000000000
--- a/sound/pci/Kconfig.nvidia
+++ /dev/null
@@ -1 +0,0 @@
-trysource "../nvidia/sound/pci/hda/Kconfig.nvidia"
diff --git a/sound/pci/Makefile.nvidia b/sound/pci/Makefile
index 531dfd86e..531dfd86e 100644
--- a/sound/pci/Makefile.nvidia
+++ b/sound/pci/Makefile
diff --git a/sound/pci/hda/Kconfig.nvidia b/sound/pci/hda/Kconfig
index f6f30e7db..76a302d41 100644
--- a/sound/pci/hda/Kconfig.nvidia
+++ b/sound/pci/hda/Kconfig
@@ -1,3 +1,5 @@
+append_menu "HD-Audio"
+
 config SND_HDA_TEGRA
         tristate "NVIDIA Tegra HD Audio"
         depends on ARCH_TEGRA ||  ARCH_TEGRA_18x_SOC
@@ -13,3 +15,4 @@ config SND_HDA_TEGRA
           To compile this driver as a module, choose M here: the module
           will be called snd-hda-tegra.
 
+endmenu
diff --git a/sound/pci/hda/Makefile.nvidia b/sound/pci/hda/Makefile
index e21ce3fac..e21ce3fac 100644
--- a/sound/pci/hda/Makefile.nvidia
+++ b/sound/pci/hda/Makefile
diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
new file mode 100644
index 000000000..bc5f8efc5
--- /dev/null
+++ b/sound/soc/Kconfig
@@ -0,0 +1,6 @@
+if SND_SOC
+
+source "sound/soc/tegra-alt/Kconfig"
+source "sound/soc/tegra-virt-alt/Kconfig"
+
+endif
diff --git a/sound/soc/Kconfig.nvidia b/sound/soc/Kconfig.nvidia
deleted file mode 100644
index 58e46d04b..000000000
--- a/sound/soc/Kconfig.nvidia
+++ /dev/null
@@ -1,2 +0,0 @@
-trysource "../nvidia/sound/soc/tegra-alt/Kconfig.nvidia"
-trysource "../nvidia/sound/soc/tegra-virt-alt/Kconfig.nvidia"
diff --git a/sound/soc/Makefile.nvidia b/sound/soc/Makefile
index 3170b8e84..3170b8e84 100644
--- a/sound/soc/Makefile.nvidia
+++ b/sound/soc/Makefile
diff --git a/sound/soc/tegra-alt/Kconfig.nvidia b/sound/soc/tegra-alt/Kconfig
index 6000cd38c..92ce7ae14 100644
--- a/sound/soc/tegra-alt/Kconfig.nvidia
+++ b/sound/soc/tegra-alt/Kconfig
@@ -1,3 +1,5 @@
+if SND_SOC
+
 config SND_SOC_TEGRA_ALT_186
         def_bool y
         depends on SND_SOC_TEGRA_ALT
@@ -302,3 +304,5 @@ config SND_SOC_TEGRA_T210REF_P2382_ALT
         select SND_SOC_TEGRA_ASOC_MACHINE_ALT
         help
           Say Y or M here
+
+endif
diff --git a/sound/soc/tegra-alt/Makefile.nvidia b/sound/soc/tegra-alt/Makefile
index 3594cef93..3594cef93 100644
--- a/sound/soc/tegra-alt/Makefile.nvidia
+++ b/sound/soc/tegra-alt/Makefile
diff --git a/sound/soc/tegra-virt-alt/Kconfig.nvidia b/sound/soc/tegra-virt-alt/Kconfig
index 6a9a348a6..70314480f 100644
--- a/sound/soc/tegra-virt-alt/Kconfig.nvidia
+++ b/sound/soc/tegra-virt-alt/Kconfig
@@ -1,3 +1,5 @@
+if SND_SOC
+
 config SND_SOC_TEGRA_VIRT_IVC_COMM_DEFS
         tristate "IVC client for Tegra virt audio"
         depends on TEGRA_HV_MANAGER
@@ -25,3 +27,5 @@ config SND_SOC_TEGRA_VIRT_T210REF_PCM
           The pcm driver exposes a number of playback and capture pcm interfaces. It uses
           the native pcm driver for dma interface and ivc communication module for ivc.
           The number of interfaces exposed is configurable via device tree.
+
+endif
diff --git a/sound/soc/tegra-virt-alt/Makefile.nvidia b/sound/soc/tegra-virt-alt/Makefile
index 8379a5b28..8484e331a 100644
--- a/sound/soc/tegra-virt-alt/Makefile.nvidia
+++ b/sound/soc/tegra-virt-alt/Makefile
@@ -1,10 +1,10 @@
 GCOV_PROFILE := y
 
 subdir-ccflags-y := -Werror
-ccflags-y += -I$(src)/../tegra-alt
-ccflags-y += -I$(src)/../tegra-alt/include/
-ccflags-y += -I$(src)/../tegra-alt/machine_drivers/
-ccflags-y += -I$(src)/../codecs
+ccflags-y += -I$(overlay)/$(src)/../tegra-alt
+ccflags-y += -I$(overlay)/$(src)/../tegra-alt/include/
+ccflags-y += -I$(overlay)/$(src)/../tegra-alt/machine_drivers/
+ccflags-y += -I$(overlay)/$(src)/../codecs
 
 # Tegra platform Support
 snd-soc-tegra-virt-alt-ivc-objs := tegra_virt_alt_ivc.o