30 files changed, 72 insertions, 79 deletions
diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile
index 56bd62591..8994bf0de 100644
--- a/drivers/crypto/Makefile
+++ b/drivers/crypto/Makefile
@@ -1,8 +1,8 @@
 GCOV_PROFILE := y
 ccflags-y += -I$(srctree)/drivers/video/tegra/host
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host
+ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/host
-ccflags-y += -I$(srctree)/../nvidia/include
+ccflags-y += -I$(srctree.nvidia)/include
 ccflags-y += -I$(srctree)/include
 obj-$(CONFIG_TEGRA_CRYPTO_DEV) += tegra-cryptodev.o
 obj-$(CONFIG_CRYPTO_DEV_TEGRA_SE) += tegra-se.o
diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile
index 3fb8c670c..1b1698f33 100644
--- a/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@ -4,6 +4,6 @@ ccflags-$(CONFIG_DMADEVICES_VDEBUG) += -DVERBOSE_DEBUG
 ccflags-y += -Werror
 ccflags-$(CONFIG_DMADEVICES) += -I$(srctree)/drivers/dma
 ccflags-$(CONFIG_DMADEVICES) += -I$(srctree)
-ccflags-$(CONFIG_DMADEVICES) += -I$(srctree)/../nvidia
+ccflags-$(CONFIG_DMADEVICES) += -I$(srctree.nvidia)
 obj-$(CONFIG_TEGRA186_GPC_DMA) += tegra186-gpc-dma.o
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index d1a1e6788..643375cb0 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -1,3 +1,3 @@
 ccflags-y += -Werror
-ccflags-y += -I$(srctree)/../nvidia/include
+ccflags-y += -I$(srctree.nvidia)/include
 obj-$(CONFIG_GPIO_TEGRA186)  += gpio-tegra186.o
diff --git a/drivers/gpu/drm/tegra/Makefile b/drivers/gpu/drm/tegra/Makefile
index 601d67886..2156322fe 100644
--- a/drivers/gpu/drm/tegra/Makefile
+++ b/drivers/gpu/drm/tegra/Makefile
@@ -1,5 +1,5 @@
 ccflags-y += -Idrivers/gpu/drm/tegra
-ccflags-y += -I../nvidia/drivers/gpu/drm/tegra
+ccflags-y += -I$(srctree.nvidia)/drivers/gpu/drm/tegra
 tegra-drm-t186-y = \
        vic_t186.o \
diff --git a/drivers/gpu/host1x/Makefile b/drivers/gpu/host1x/Makefile
index 0d61d12a6..87be3871c 100644
--- a/drivers/gpu/host1x/Makefile
+++ b/drivers/gpu/host1x/Makefile
@@ -1,5 +1,5 @@
 ccflags-y += -Idrivers/gpu/host1x
-ccflags-y += -I../nvidia/drivers/gpu/host1x
+ccflags-y += -I$(srctree.nvidia)/drivers/gpu/host1x
 host1x-t186-y = \
        dev_t186.o \
diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
index 2b0356f7c..a034b59a9 100644
--- a/drivers/i2c/busses/Makefile
+++ b/drivers/i2c/busses/Makefile
@@ -1,6 +1,6 @@
 obj-$(CONFIG_I2C_TEGRA_VI)      += i2c-tegra-vi.o
 #CFLAGS_i2c-bpmp-tegra.o                 = -Werror
-ccflags-y += -I$(srctree)/../nvidia/include
+ccflags-y += -I$(srctree.nvidia)/include
 obj-$(CONFIG_I2C_BPMP_TEGRA)     += i2c-bpmp-tegra.o
 obj-$(CONFIG_TEGRA_I2CSLV_T186)  += i2c-t18x-slave.o i2c-t18x-client.o
 obj-$(CONFIG_I2C_TEGRA_CAMRTC) += i2c-ivc-single.o i2c-ivc-multi.o i2c-rtcpu.o i2c-rtcpu-clk-config.o
diff --git a/drivers/media/platform/tegra/camera/Makefile b/drivers/media/platform/tegra/camera/Makefile
index 292550a26..7ae957dd3 100644
--- a/drivers/media/platform/tegra/camera/Makefile
+++ b/drivers/media/platform/tegra/camera/Makefile
@@ -1,9 +1,8 @@
 GCOV_PROFILE := y
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host
+ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/host
-ccflags-y += -I$(srctree)/../nvhost/drivers/video/tegra/host
 ccflags-y += -I$(srctree)/drivers/video/tegra/host
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/camera
+ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/camera
-ccflags-y += -I$(srctree)/../nvidia/drivers/media/platform/tegra
+ccflags-y += -I$(srctree.nvidia)/drivers/media/platform/tegra
 ccflags-y += -Werror
 obj-y += vi/
diff --git a/drivers/media/platform/tegra/camera/csi/Makefile b/drivers/media/platform/tegra/camera/csi/Makefile
index 7fcd48c53..549900c6b 100644
--- a/drivers/media/platform/tegra/camera/csi/Makefile
+++ b/drivers/media/platform/tegra/camera/csi/Makefile
@@ -1,8 +1,8 @@
 GCOV_PROFILE := y
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host
+ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/host
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/camera
+ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/camera
-ccflags-y += -I$(srctree)/../nvidia/drivers/media/platform/tegra
+ccflags-y += -I$(srctree.nvidia)/drivers/media/platform/tegra
-ccflags-y += -I$(srctree)/../nvidia/include
+ccflags-y += -I$(srctree.nvidia)/include
 ccflags-y += -Werror
 obj-y += csi.o csi2_fops.o csi4_fops.o
diff --git a/drivers/media/platform/tegra/camera/vi/Makefile b/drivers/media/platform/tegra/camera/vi/Makefile
index 77884f3dd..6f12d9eb7 100644
--- a/drivers/media/platform/tegra/camera/vi/Makefile
+++ b/drivers/media/platform/tegra/camera/vi/Makefile
@@ -1,11 +1,11 @@
 GCOV_PROFILE := y
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host
+ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/host
 ccflags-y += -I$(srctree)/drivers/video/tegra/host
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/camera
+ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/camera
-ccflags-y += -I$(srctree)/../nvidia/drivers/media/platform/tegra
+ccflags-y += -I$(srctree.nvidia)/drivers/media/platform/tegra
-ccflags-y += -I$(srctree)/../nvidia/include
+ccflags-y += -I$(srctree.nvidia)/include
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host/
+ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/host/
-ccflags-y += -I$(srctree)/../nvidia/include
+ccflags-y += -I$(srctree.nvidia)/include
 ccflags-y += -Werror
 ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y)
@@ -13,13 +13,13 @@ obj-y += mc_common.o core.o channel.o graph.o vi2_fops.o vi4_fops.o
 endif
 ifeq ($(CONFIG_ARCH_TEGRA_19x_SOC),y)
-ccflags-y += -I$(srctree)/../t19x/drivers/video/tegra/host
+ccflags-y += -I$(srctree.t19x)/drivers/video/tegra/host
 endif
 obj-$(CONFIG_TEGRA_CAMERA_RTCPU) += capture.o
 obj-$(CONFIG_TEGRA_CAMERA_RTCPU) += capture_vi_channel.o
 ifeq ($(CONFIG_ARCH_TEGRA_210_SOC),y)
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host/
+ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/host/
 obj-y += mc_common.o core.o channel.o graph.o vi2_fops.o
 endif
diff --git a/drivers/media/platform/tegra/tpg/Makefile b/drivers/media/platform/tegra/tpg/Makefile
index 3a94af88b..e1f799ff0 100644
--- a/drivers/media/platform/tegra/tpg/Makefile
+++ b/drivers/media/platform/tegra/tpg/Makefile
@@ -1,7 +1,7 @@
 GCOV_PROFILE := y
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host
+ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/host
-ccflags-y += -I$(srctree)/../nvidia/drivers/media/platform/tegra
+ccflags-y += -I$(srctree.nvidia)/drivers/media/platform/tegra
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host
+ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/host
 ccflags-y += -Werror
 ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y)
diff --git a/drivers/media/platform/tegra/vi/Makefile b/drivers/media/platform/tegra/vi/Makefile
index da13dd5dc..59edcf072 100644
--- a/drivers/media/platform/tegra/vi/Makefile
+++ b/drivers/media/platform/tegra/vi/Makefile
@@ -1,9 +1,7 @@
 GCOV_PROFILE := y
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host
+ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/host
-ccflags-y += -I$(srctree)/drivers/video/tegra/host
+ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/camera
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host/
+ccflags-y += -I$(srctree.nvidia)/drivers/media/platform/tegra
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/camera
-ccflags-y += -I$(srctree)/../nvidia/drivers/media/platform/tegra
 ccflags-y += -Werror
 nvhost-vi-objs += vi.o
diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
index d7f607883..1424ac232 100644
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@ -4,8 +4,8 @@ ccflags-y += -Werror
 ccflags-y += -I$(srctree)/drivers/pinctrl
 ccflags-y += -I$(srctree)/drivers/pinctrl/tegra
 ccflags-y += -I$(srctree)/drivers/video/tegra/host
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host
+ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/host
-ccflags-y += -I$(srctree)/../nvidia/include
+ccflags-y += -I$(srctree.nvidia)/include
 obj-$(CONFIG_PINCTRL_TEGRA186)  += pinctrl-tegra186.o
 obj-$(CONFIG_PINCTRL_TEGRA186_PADCTL) += pinctrl-tegra186-padctl.o
diff --git a/drivers/platform/tegra/Makefile b/drivers/platform/tegra/Makefile
index 944691b82..066ac02dd 100644
--- a/drivers/platform/tegra/Makefile
+++ b/drivers/platform/tegra/Makefile
@@ -1,9 +1,9 @@
 KBUILD_CFLAGS += -I$(srctree)/arch/arm/mach-tegra \
                 -I$(srctree)/arch/arm/mach-tegra/include/ \
                 -I$(srctree)/drivers/platform/tegra/ \
-                 -I$(srctree)/../nvidia/drivers/platform/tegra/rtcpu \
+                 -I$(srctree.nvidia)/drivers/platform/tegra/rtcpu \
-                 -I$(srctree)/../nvidia/drivers/video/tegra/dc/ \
+                 -I$(srctree.nvidia)/drivers/video/tegra/dc/ \
-                 -I$(srctree)/../nvidia/drivers/video/tegra/dc/panel/
+                 -I$(srctree.nvidia)/drivers/video/tegra/dc/panel/
 ccflags-y += -Werror
 obj-$(CONFIG_TEGRA_MC) += mc/
diff --git a/drivers/platform/tegra/rtcpu/Makefile b/drivers/platform/tegra/rtcpu/Makefile
index 0b37f13b7..e16a325a2 100644
--- a/drivers/platform/tegra/rtcpu/Makefile
+++ b/drivers/platform/tegra/rtcpu/Makefile
@@ -1,9 +1,8 @@
 ccflags-y := -Werror
 ccflags-y += -I$(srctree)/include
-ccflags-y += -I$(srctree)/../nvhost
 ccflags-y += -I$(srctree)
-ccflags-y += -I$(srctree)/../nvidia
+ccflags-y += -I$(srctree.nvidia)
-ccflags-y += -I$(srctree)/../nvidia/drivers/platform/tegra/rtcpu
+ccflags-y += -I$(srctree.nvidia)/drivers/platform/tegra/rtcpu
 obj-y += debug.o
 obj-y += tegra-sysfs-mbox.o
diff --git a/drivers/video/tegra/dc/ext/Makefile b/drivers/video/tegra/dc/ext/Makefile
index 463b91e4d..55785bc8b 100644
--- a/drivers/video/tegra/dc/ext/Makefile
+++ b/drivers/video/tegra/dc/ext/Makefile
@@ -1,5 +1,5 @@
 GCOV_PROFILE := y
-EXTRA_CFLAGS += -I../nvidia/drivers/video/tegra/host
+EXTRA_CFLAGS += -I$(srctree.nvidia)/drivers/video/tegra/host
 EXTRA_CFLAGS += -Idrivers/video/tegra/host
 ccflags-y += -I$(srctree)/arch/arm/mach-tegra/include/mach
 obj-y += dev.o
diff --git a/drivers/video/tegra/dc/nvdisp/Makefile b/drivers/video/tegra/dc/nvdisp/Makefile
index 741e73aff..b5ad2ff2a 100644
--- a/drivers/video/tegra/dc/nvdisp/Makefile
+++ b/drivers/video/tegra/dc/nvdisp/Makefile
@@ -1,12 +1,10 @@
 GCOV_PROFILE := y
 subdir-ccflags-y := -Werror
 ccflags-y += -Idrivers/video/tegra
-ccflags-y += -I../nvidia/drivers/video/tegra/dc
+ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/dc
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/dc
+ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/dc/panel
-ccflags-y += -I../nvidia/drivers/video/tegra/dc/panel
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/dc/panel
 ifeq ($(CONFIG_ARCH_TEGRA_19x_SOC),y)
-    ccflags-y += -I$(srctree)/../t19x/drivers/video/tegra/dc
+    ccflags-y += -I$(srctree.t19x)/drivers/video/tegra/dc
 endif
 obj-y += nvdisp.o
diff --git a/drivers/video/tegra/host/Makefile b/drivers/video/tegra/host/Makefile
index 807d3c30c..df5aa54d6 100644
--- a/drivers/video/tegra/host/Makefile
+++ b/drivers/video/tegra/host/Makefile
@@ -1,6 +1,6 @@
 GCOV_PROFILE := y
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host
+ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/host
-ccflags-y += -I$(srctree)/../nvidia/include
+ccflags-y += -I$(srctree.nvidia)/include
 ccflags-y += -Idrivers/video/tegra/host
 ccflags-y += -Idrivers/devfreq
 ccflags-y += -Wno-multichar
diff --git a/drivers/video/tegra/host/flcn/Makefile b/drivers/video/tegra/host/flcn/Makefile
index 7f88f693c..7a4b8f7ec 100644
--- a/drivers/video/tegra/host/flcn/Makefile
+++ b/drivers/video/tegra/host/flcn/Makefile
@@ -1,9 +1,9 @@
 GCOV_PROFILE := y
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host
+ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/host
 ccflags-y += -Idrivers/video/tegra/host
 ifeq ($(CONFIG_TEGRA_T19X_GRHOST),y)
-ccflags-y += -I$(srctree)/../t19x/drivers/video/tegra/host/
+ccflags-y += -I$(srctree.t19x)/drivers/video/tegra/host/
 endif
 nvhost-flcn-objs  = \
diff --git a/drivers/video/tegra/host/host1x/Makefile b/drivers/video/tegra/host/host1x/Makefile
index fad713355..36c5c1303 100644
--- a/drivers/video/tegra/host/host1x/Makefile
+++ b/drivers/video/tegra/host/host1x/Makefile
@@ -1,10 +1,10 @@
 GCOV_PROFILE := y
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host
+ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/host
 ccflags-y += -Idrivers/video/tegra/host
 ccflags-y += -Werror
 ifeq ($(CONFIG_TEGRA_T19X_GRHOST),y)
-ccflags-y += -I$(srctree)/../t19x/drivers/video/tegra/host/
+ccflags-y += -I$(srctree.t19x)/drivers/video/tegra/host/
 endif
 nvhost-host1x-objs  = \
diff --git a/drivers/video/tegra/host/isp/Makefile b/drivers/video/tegra/host/isp/Makefile
index 5936983bf..13f61198e 100644
--- a/drivers/video/tegra/host/isp/Makefile
+++ b/drivers/video/tegra/host/isp/Makefile
@@ -1,5 +1,5 @@
 GCOV_PROFILE := y
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host
+ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/host
 ccflags-y += -Idrivers/video/tegra/host
 ccflags-y += -Idrivers/video/tegra/camera
 ccflags-y += -Werror
diff --git a/drivers/video/tegra/host/nvcsi/Makefile b/drivers/video/tegra/host/nvcsi/Makefile
index b8d2b1a6e..3c2d2f9d8 100644
--- a/drivers/video/tegra/host/nvcsi/Makefile
+++ b/drivers/video/tegra/host/nvcsi/Makefile
@@ -1,8 +1,8 @@
 GCOV_PROFILE := y
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host
+ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/host
 ccflags-y += -Idrivers/video/tegra/host
-ccflags-y += -I$(srctree)/../nvidia/drivers/media/platform/tegra
+ccflags-y += -I$(srctree.nvidia)/drivers/media/platform/tegra
-ccflags-y += -I$(srctree)/../nvidia/include
+ccflags-y += -I$(srctree.nvidia)/include
 ccflags-y += -Werror
 nvhost-nvcsi-objs  = \
diff --git a/drivers/video/tegra/host/nvdec/Makefile b/drivers/video/tegra/host/nvdec/Makefile
index 8536b0486..91f020487 100644
--- a/drivers/video/tegra/host/nvdec/Makefile
+++ b/drivers/video/tegra/host/nvdec/Makefile
@@ -1,10 +1,10 @@
 GCOV_PROFILE := y
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host
+ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/host
 ccflags-y += -Idrivers/video/tegra/host
 ccflags-y += -Iarch/arm/mach-tegra
 ifeq ($(CONFIG_TEGRA_T19X_GRHOST),y)
-ccflags-y += -I$(srctree)/../t19x/drivers/video/tegra/host/
+ccflags-y += -I$(srctree.t19x)/drivers/video/tegra/host/
 endif
 nvhost-nvdec-objs  = \
diff --git a/drivers/video/tegra/host/t124/Makefile b/drivers/video/tegra/host/t124/Makefile
index 196033dfe..178b6a64b 100644
--- a/drivers/video/tegra/host/t124/Makefile
+++ b/drivers/video/tegra/host/t124/Makefile
@@ -1,7 +1,7 @@
 GCOV_PROFILE := y
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host
+ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/host
 ccflags-y += -Idrivers/video/tegra/host
-ccflags-y += -I$(srctree)/../nvidia/include
+ccflags-y += -I$(srctree.nvidia)/include
 ccflags-y += -Wno-multichar
 ccflags-y += -Werror
diff --git a/drivers/video/tegra/host/t186/Makefile b/drivers/video/tegra/host/t186/Makefile
index c6dcdb995..fe81ea036 100644
--- a/drivers/video/tegra/host/t186/Makefile
+++ b/drivers/video/tegra/host/t186/Makefile
@@ -1,11 +1,11 @@
 GCOV_PROFILE := y
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host
+ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/host
 ccflags-y += -Idrivers/video/tegra/host
 ccflags-y += -Idrivers/video/tegra/host/host1x
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host/t186
+ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/host/t186
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host
+ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/host
 ccflags-y += -Idrivers/video/tegra/host/t186
-ccflags-y += -I$(srctree)/../nvidia/include
+ccflags-y += -I$(srctree.nvidia)/include
 ccflags-y += -Wno-multichar
 ccflags-y += -Werror
diff --git a/drivers/video/tegra/host/t210/Makefile b/drivers/video/tegra/host/t210/Makefile
index cbf9b6afd..32181d9fa 100644
--- a/drivers/video/tegra/host/t210/Makefile
+++ b/drivers/video/tegra/host/t210/Makefile
@@ -1,9 +1,9 @@
 GCOV_PROFILE := y
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host
+ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/host
 ccflags-y += -Idrivers/video/tegra/host
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host/t124
+ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/host/t124
 ccflags-y += -Idrivers/video/tegra/host/t124
-ccflags-y += -I$(srctree)/../nvidia/include
+ccflags-y += -I$(srctree.nvidia)/include
 ccflags-y += -Wno-multichar
 ccflags-y += -Werror
diff --git a/drivers/video/tegra/host/tsec/Makefile b/drivers/video/tegra/host/tsec/Makefile
index b9412a05b..8a1663bfb 100644
--- a/drivers/video/tegra/host/tsec/Makefile
+++ b/drivers/video/tegra/host/tsec/Makefile
@@ -1,12 +1,12 @@
 GCOV_PROFILE := y
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host
+ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/host
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/dc
+ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/dc
 ccflags-y += -Idrivers/video/tegra/host
 ccflags-y += -Idrivers/video/tegra/dc
 ccflags-y += -Werror
 ifeq ($(CONFIG_TEGRA_T19X_GRHOST),y)
-ccflags-y += -I$(srctree)/../t19x/drivers/video/tegra/host/
+ccflags-y += -I$(srctree.t19x)/drivers/video/tegra/host/
 endif
 nvhost-tsec-objs  = \
diff --git a/drivers/video/tegra/host/vhost/Makefile b/drivers/video/tegra/host/vhost/Makefile
index fc0079ad9..16f605bab 100644
--- a/drivers/video/tegra/host/vhost/Makefile
+++ b/drivers/video/tegra/host/vhost/Makefile
@@ -1,10 +1,10 @@
 GCOV_PROFILE := y
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host
+ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/host
 ccflags-y += -Idrivers/video/tegra/host
 ccflags-y += -Werror
 ifeq ($(CONFIG_TEGRA_T19X_GRHOST),y)
-ccflags-y += -I$(srctree)/../t19x/drivers/video/tegra/host/
+ccflags-y += -I$(srctree.t19x)/drivers/video/tegra/host/
 endif
 nvhost-vhost-objs  = \
diff --git a/drivers/video/tegra/host/vi/Makefile b/drivers/video/tegra/host/vi/Makefile
index d07f74cbe..90e033c62 100644
--- a/drivers/video/tegra/host/vi/Makefile
+++ b/drivers/video/tegra/host/vi/Makefile
@@ -1,7 +1,6 @@
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host
+ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/host
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/host
+ccflags-y += -I$(srctree.nvidia)/drivers/media/platform/tegra
-ccflags-y += -I$(srctree)/../nvidia/drivers/media/platform/tegra
+ccflags-y += -I$(srctree.nvidia)/include
-ccflags-y += -I$(srctree)/../nvidia/include
 obj-$(CONFIG_VIDEO_TEGRA_VI) += host_vi_notify.o
 obj-$(CONFIG_VIDEO_TEGRA_VI) += vi4.o
diff --git a/drivers/video/tegra/nvmap/Makefile b/drivers/video/tegra/nvmap/Makefile
index d68b9bd5a..a58d8304b 100644
--- a/drivers/video/tegra/nvmap/Makefile
+++ b/drivers/video/tegra/nvmap/Makefile
@@ -7,7 +7,7 @@ ccflags-y += -Iarch/arm/mach-tegra/include
 endif
 ccflags-y += -Iarch/arm/mach-tegra
-ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/nvmap/
+ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/nvmap/
 obj-y += nvmap.o
 obj-y += nvmap_alloc.o
diff --git a/sound/soc/tegra-alt/Makefile b/sound/soc/tegra-alt/Makefile
index e129c0c2b..1bca380b1 100644
--- a/sound/soc/tegra-alt/Makefile
+++ b/sound/soc/tegra-alt/Makefile
@@ -4,9 +4,9 @@ subdir-ccflags-y := -Werror
 subdir-ccflags-y += -I$(srctree)
 subdir-ccflags-y += -I$(srctree)/sound/soc/codecs/
-subdir-ccflags-y += -I$(srctree)/../nvidia
+subdir-ccflags-y += -I$(srctree.nvidia)
-subdir-ccflags-y += -I$(srctree)/../nvidia/sound/soc/tegra-virt-alt/
+subdir-ccflags-y += -I$(srctree.nvidia)/sound/soc/tegra-virt-alt/
-subdir-ccflags-y += -I$(srctree)/../nvidia/sound/soc/tegra-alt/include/
+subdir-ccflags-y += -I$(srctree.nvidia)/sound/soc/tegra-alt/include/
 #----------------------------- utility drivers --------------------------------------
 CFLAGS_tegra_pcm_alt.o                          += -Wno-shift-count-overflow