nvidia: Setting proper names to Makefiles & Kconfig

Makefiles and Kconfig files are picked up based
on project name being the extension.

Makefiles and Kconfig files brought over from
t18x have .t18x suffix.

Changed to .nvidia

Bug 200295104

Change-Id: Idade26f293c1faaf74f53b2ab20798c47652bdb9
Signed-off-by: Ishan Mittal <imittal@nvidia.com>

60 files changed, 53 insertions, 68 deletions

diff --git a/arch/arm64/Kconfig.t18x b/arch/arm64/Kconfig.nvidia
index 81558a81b..81558a81b 100644
--- a/arch/arm64/Kconfig.t18x
+++ b/arch/arm64/Kconfig.nvidia
diff --git a/drivers/Makefile.nvidia b/drivers/Makefile.nvidia
index 1636dd70c..5ccae5d1f 100644
--- a/drivers/Makefile.nvidia
+++ b/drivers/Makefile.nvidia
@@ -9,9 +9,28 @@
 # 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-y += tachometer/
+obj-$(CONFIG_TEGRA186_AHC) += misc/tegra186-ahc/
+obj-y += tty/
diff --git a/drivers/Makefile.t18x b/drivers/Makefile.t18x
deleted file mode 100644
index c24da6e20..000000000
--- a/drivers/Makefile.t18x
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (c) 2015-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)/../t18x/include
-obj-y += platform/
-obj-y += video/
-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-y += tachometer/
-obj-$(CONFIG_TEGRA186_AHC) += misc/tegra186-ahc/
-obj-y += tty/
diff --git a/drivers/clocksource/Kconfig.t18x b/drivers/clocksource/Kconfig.nvidia
index f2e4dde89..f2e4dde89 100644
--- a/drivers/clocksource/Kconfig.t18x
+++ b/drivers/clocksource/Kconfig.nvidia
diff --git a/drivers/clocksource/Makefile.t18x b/drivers/clocksource/Makefile.nvidia
index 7a169c183..7a169c183 100644
--- a/drivers/clocksource/Makefile.t18x
+++ b/drivers/clocksource/Makefile.nvidia
diff --git a/drivers/cpufreq/Makefile.t18x b/drivers/cpufreq/Makefile.nvidia
index 76d8d6f2a..76d8d6f2a 100644
--- a/drivers/cpufreq/Makefile.t18x
+++ b/drivers/cpufreq/Makefile.nvidia
diff --git a/drivers/cpuidle/Makefile.t18x b/drivers/cpuidle/Makefile.nvidia
index 24c000c34..24c000c34 100644
--- a/drivers/cpuidle/Makefile.t18x
+++ b/drivers/cpuidle/Makefile.nvidia
diff --git a/drivers/crypto/Kconfig.t18x b/drivers/crypto/Kconfig.nvidia
index 5bb437a45..5bb437a45 100644
--- a/drivers/crypto/Kconfig.t18x
+++ b/drivers/crypto/Kconfig.nvidia
diff --git a/drivers/crypto/Makefile.t18x b/drivers/crypto/Makefile.nvidia
index a041c3c3a..a041c3c3a 100644
--- a/drivers/crypto/Makefile.t18x
+++ b/drivers/crypto/Makefile.nvidia
diff --git a/drivers/dma/Kconfig.t18x b/drivers/dma/Kconfig.nvidia
index 90487df10..90487df10 100644
--- a/drivers/dma/Kconfig.t18x
+++ b/drivers/dma/Kconfig.nvidia
diff --git a/drivers/dma/Makefile.t18x b/drivers/dma/Makefile.nvidia
index ef6c11504..ef6c11504 100644
--- a/drivers/dma/Makefile.t18x
+++ b/drivers/dma/Makefile.nvidia
diff --git a/drivers/gpio/Kconfig.t18x b/drivers/gpio/Kconfig.nvidia
index 9ebf3f440..9ebf3f440 100644
--- a/drivers/gpio/Kconfig.t18x
+++ b/drivers/gpio/Kconfig.nvidia
diff --git a/drivers/gpio/Makefile.t18x b/drivers/gpio/Makefile.nvidia
index e133af05f..e133af05f 100644
--- a/drivers/gpio/Makefile.t18x
+++ b/drivers/gpio/Makefile.nvidia
diff --git a/drivers/gpu/drm/tegra/Makefile.t18x b/drivers/gpu/drm/tegra/Makefile.nvidia
index ee133616a..ee133616a 100644
--- a/drivers/gpu/drm/tegra/Makefile.t18x
+++ b/drivers/gpu/drm/tegra/Makefile.nvidia
diff --git a/drivers/gpu/host1x/Makefile.t18x b/drivers/gpu/host1x/Makefile.nvidia
index 25d54f73a..25d54f73a 100644
--- a/drivers/gpu/host1x/Makefile.t18x
+++ b/drivers/gpu/host1x/Makefile.nvidia
diff --git a/drivers/i2c/Makefile.t18x b/drivers/i2c/Makefile.t18x
deleted file mode 100644
index c7fd0f235..000000000
--- a/drivers/i2c/Makefile.t18x
+++ /dev/null
@@ -1 +0,0 @@
-obj-y  +=  busses/
diff --git a/drivers/i2c/busses/Kconfig.nvidia b/drivers/i2c/busses/Kconfig.nvidia
index 385e6ada4..309587723 100644
--- a/drivers/i2c/busses/Kconfig.nvidia
+++ b/drivers/i2c/busses/Kconfig.nvidia
@@ -7,3 +7,31 @@ config I2C_TEGRA_VI
         help
           If you say yes to this option, support will be included for the
           I2C controller embedded in NVIDIA Tegra SOCs
+
+config I2C_BPMP_TEGRA
+        tristate "NVIDIA Tegra internal BPMP I2C controller"
+        depends on TEGRA_BPMP
+        default y
+        select I2C_ALGO_BUSCLEAR
+        select I2C_ALGOBIT
+        help
+          If you say yes to this option, support will be included for the
+          I2C controller embedded in NVIDIA Tegra SOCs accessed via BPMP.
+          This I2C driver is a 'virtual' I2C driver. The real driver is
+          embedded in the BPMP firmware, and this driver merely communicates
+          with that real driver.
+config TEGRA_I2CSLV_T186
+        bool "Tegra i2c slave controller driver"
+        default y
+        help
+          Enable on-chip i2c slave controller.
+config I2C_TEGRA_CAMRTC
+        bool "Tegra I2C Camera RTCPU driver"
+        depends on TEGRA_CAMERA_RTCPU
+        help
+          If you say yes to this option, support will be included for the
+          I2C controller embedded in NVIDIA Tegra SOCs accessed via Camera
+          RTCPU processor. This I2C driver is a 'virtual' I2C driver
+          compatible with I2C bus driver. The real driver is embedded in the
+          Camera RTCPU firmware, and this driver merely communicates with
+          that real driver.
diff --git a/drivers/i2c/busses/Kconfig.t18x b/drivers/i2c/busses/Kconfig.t18x
deleted file mode 100644
index 6c2770821..000000000
--- a/drivers/i2c/busses/Kconfig.t18x
+++ /dev/null
@@ -1,28 +0,0 @@
-config I2C_BPMP_TEGRA
-        tristate "NVIDIA Tegra internal BPMP I2C controller"
-        depends on TEGRA_BPMP
-        default y
-        select I2C_ALGO_BUSCLEAR
-        select I2C_ALGOBIT
-        help
-          If you say yes to this option, support will be included for the
-          I2C controller embedded in NVIDIA Tegra SOCs accessed via BPMP.
-          This I2C driver is a 'virtual' I2C driver. The real driver is
-          embedded in the BPMP firmware, and this driver merely communicates
-          with that real driver.
-config TEGRA_I2CSLV_T186
-        bool "Tegra i2c slave controller driver"
-        default y
-        help
-          Enable on-chip i2c slave controller.
-
-config I2C_TEGRA_CAMRTC
-        bool "Tegra I2C Camera RTCPU driver"
-        depends on TEGRA_CAMERA_RTCPU
-        help
-          If you say yes to this option, support will be included for the
-          I2C controller embedded in NVIDIA Tegra SOCs accessed via Camera
-          RTCPU processor. This I2C driver is a 'virtual' I2C driver
-          compatible with I2C bus driver. The real driver is embedded in the
-          Camera RTCPU firmware, and this driver merely communicates with
-          that real driver.
diff --git a/drivers/i2c/busses/Makefile.nvidia b/drivers/i2c/busses/Makefile.nvidia
index 2836f3f1b..6eac88aa6 100644
--- a/drivers/i2c/busses/Makefile.nvidia
+++ b/drivers/i2c/busses/Makefile.nvidia
@@ -1 +1,5 @@
 obj-$(CONFIG_I2C_TEGRA_VI)      += i2c-tegra-vi.o
+#CFLAGS_i2c-bpmp-tegra.o                 = -Werror
+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-rtcpu.o i2c-rtcpu-clk-config.o
diff --git a/drivers/i2c/busses/Makefile.t18x b/drivers/i2c/busses/Makefile.t18x
deleted file mode 100644
index fc2bce2ea..000000000
--- a/drivers/i2c/busses/Makefile.t18x
+++ /dev/null
@@ -1,4 +0,0 @@
-#CFLAGS_i2c-bpmp-tegra.o                 = -Werror
-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-rtcpu.o i2c-rtcpu-clk-config.o
diff --git a/drivers/misc/tegra186-ahc/Kconfig.t18x b/drivers/misc/tegra186-ahc/Kconfig.nvidia
index 017125c29..017125c29 100644
--- a/drivers/misc/tegra186-ahc/Kconfig.t18x
+++ b/drivers/misc/tegra186-ahc/Kconfig.nvidia
diff --git a/drivers/misc/tegra186-ahc/Makefile.t18x b/drivers/misc/tegra186-ahc/Makefile.nvidia
index 8e7279353..8e7279353 100644
--- a/drivers/misc/tegra186-ahc/Makefile.t18x
+++ b/drivers/misc/tegra186-ahc/Makefile.nvidia
diff --git a/drivers/net/Makefile.t18x b/drivers/net/Makefile.nvidia
index fdedda760..fdedda760 100644
--- a/drivers/net/Makefile.t18x
+++ b/drivers/net/Makefile.nvidia
diff --git a/drivers/net/can/Kconfig.t18x b/drivers/net/can/Kconfig.nvidia
index e43e13399..e43e13399 100644
--- a/drivers/net/can/Kconfig.t18x
+++ b/drivers/net/can/Kconfig.nvidia
diff --git a/drivers/net/can/Makefile.t18x b/drivers/net/can/Makefile.nvidia
index 9c9337e7f..9c9337e7f 100644
--- a/drivers/net/can/Makefile.t18x
+++ b/drivers/net/can/Makefile.nvidia
diff --git a/drivers/net/can/mttcan/Makefile.t18x b/drivers/net/can/mttcan/Makefile.nvidia
index 8459c62cc..8459c62cc 100644
--- a/drivers/net/can/mttcan/Makefile.t18x
+++ b/drivers/net/can/mttcan/Makefile.nvidia
diff --git a/drivers/net/can/mttcan/ivc/Kconfig.t18x b/drivers/net/can/mttcan/ivc/Kconfig.nvidia
index a73619fd7..a73619fd7 100644
--- a/drivers/net/can/mttcan/ivc/Kconfig.t18x
+++ b/drivers/net/can/mttcan/ivc/Kconfig.nvidia
diff --git a/drivers/net/can/mttcan/ivc/Makefile.t18x b/drivers/net/can/mttcan/ivc/Makefile.nvidia
index 4ce03181d..4ce03181d 100644
--- a/drivers/net/can/mttcan/ivc/Makefile.t18x
+++ b/drivers/net/can/mttcan/ivc/Makefile.nvidia
diff --git a/drivers/net/can/mttcan/native/Kconfig.t18x b/drivers/net/can/mttcan/native/Kconfig.nvidia
index 28e8730ab..28e8730ab 100644
--- a/drivers/net/can/mttcan/native/Kconfig.t18x
+++ b/drivers/net/can/mttcan/native/Kconfig.nvidia
diff --git a/drivers/net/can/mttcan/native/Makefile.t18x b/drivers/net/can/mttcan/native/Makefile.nvidia
index 502d57b2c..502d57b2c 100644
--- a/drivers/net/can/mttcan/native/Makefile.t18x
+++ b/drivers/net/can/mttcan/native/Makefile.nvidia
diff --git a/drivers/pinctrl/Kconfig.t18x b/drivers/pinctrl/Kconfig.nvidia
index 325875a27..325875a27 100644
--- a/drivers/pinctrl/Kconfig.t18x
+++ b/drivers/pinctrl/Kconfig.nvidia
diff --git a/drivers/pinctrl/Makefile.t18x b/drivers/pinctrl/Makefile.nvidia
index 60adacadd..60adacadd 100644
--- a/drivers/pinctrl/Makefile.t18x
+++ b/drivers/pinctrl/Makefile.nvidia
diff --git a/drivers/platform/Makefile.t18x b/drivers/platform/Makefile.nvidia
index 3d50fea2a..3d50fea2a 100644
--- a/drivers/platform/Makefile.t18x
+++ b/drivers/platform/Makefile.nvidia
diff --git a/drivers/platform/tegra/Kconfig.t18x b/drivers/platform/tegra/Kconfig.nvidia
index f8fa4cac6..f8fa4cac6 100644
--- a/drivers/platform/tegra/Kconfig.t18x
+++ b/drivers/platform/tegra/Kconfig.nvidia
diff --git a/drivers/platform/tegra/Makefile.t18x b/drivers/platform/tegra/Makefile.nvidia
index d5a664b0f..d5a664b0f 100644
--- a/drivers/platform/tegra/Makefile.t18x
+++ b/drivers/platform/tegra/Makefile.nvidia
diff --git a/drivers/platform/tegra/powergate/Makefile.t18x b/drivers/platform/tegra/powergate/Makefile.nvidia
index b89051683..b89051683 100644
--- a/drivers/platform/tegra/powergate/Makefile.t18x
+++ b/drivers/platform/tegra/powergate/Makefile.nvidia
diff --git a/drivers/platform/tegra/rtcpu/Makefile.t18x b/drivers/platform/tegra/rtcpu/Makefile.nvidia
index 631ca679b..631ca679b 100644
--- a/drivers/platform/tegra/rtcpu/Makefile.t18x
+++ b/drivers/platform/tegra/rtcpu/Makefile.nvidia
diff --git a/drivers/reset/Makefile.t18x b/drivers/reset/Makefile.nvidia
index 94a640234..94a640234 100644
--- a/drivers/reset/Makefile.t18x
+++ b/drivers/reset/Makefile.nvidia
diff --git a/drivers/reset/tegra/Makefile.t18x b/drivers/reset/tegra/Makefile.nvidia
index eec4279fc..eec4279fc 100644
--- a/drivers/reset/tegra/Makefile.t18x
+++ b/drivers/reset/tegra/Makefile.nvidia
diff --git a/drivers/spi/Kconfig.t18x b/drivers/spi/Kconfig.nvidia
index a3b3650ff..a3b3650ff 100644
--- a/drivers/spi/Kconfig.t18x
+++ b/drivers/spi/Kconfig.nvidia
diff --git a/drivers/spi/Makefile.t18x b/drivers/spi/Makefile.nvidia
index 35efac7f4..35efac7f4 100644
--- a/drivers/spi/Makefile.t18x
+++ b/drivers/spi/Makefile.nvidia
diff --git a/drivers/tachometer/Kconfig.t18x b/drivers/tachometer/Kconfig.nvidia
index 20206811a..20206811a 100644
--- a/drivers/tachometer/Kconfig.t18x
+++ b/drivers/tachometer/Kconfig.nvidia
diff --git a/drivers/tachometer/Makefile.t18x b/drivers/tachometer/Makefile.nvidia
index c28d0f60a..c28d0f60a 100644
--- a/drivers/tachometer/Makefile.t18x
+++ b/drivers/tachometer/Makefile.nvidia
diff --git a/drivers/thermal/Makefile.t18x b/drivers/thermal/Makefile.nvidia
index 0c48740ad..0c48740ad 100644
--- a/drivers/thermal/Makefile.t18x
+++ b/drivers/thermal/Makefile.nvidia
diff --git a/drivers/tty/Makefile.t18x b/drivers/tty/Makefile.nvidia
index dd3b9b662..dd3b9b662 100644
--- a/drivers/tty/Makefile.t18x
+++ b/drivers/tty/Makefile.nvidia
diff --git a/drivers/tty/serial/Kconfig.t18x b/drivers/tty/serial/Kconfig.nvidia
index f45d401fa..f45d401fa 100644
--- a/drivers/tty/serial/Kconfig.t18x
+++ b/drivers/tty/serial/Kconfig.nvidia
diff --git a/drivers/tty/serial/Makefile.t18x b/drivers/tty/serial/Makefile.nvidia
index bb8320da1..bb8320da1 100644
--- a/drivers/tty/serial/Makefile.t18x
+++ b/drivers/tty/serial/Makefile.nvidia
diff --git a/drivers/video/Makefile.t18x b/drivers/video/Makefile.t18x
deleted file mode 100644
index 3d50fea2a..000000000
--- a/drivers/video/Makefile.t18x
+++ /dev/null
@@ -1 +0,0 @@
-obj-y += tegra/
diff --git a/drivers/video/tegra/Makefile.nvidia b/drivers/video/tegra/Makefile.nvidia
index 9b903d1ec..264b2db4c 100644
--- a/drivers/video/tegra/Makefile.nvidia
+++ b/drivers/video/tegra/Makefile.nvidia
@@ -1 +1,3 @@
 obj-$(CONFIG_TEGRA_CAMERA_PLATFORM) += camera/
+obj-y += dc/
+obj-y += host/
diff --git a/drivers/video/tegra/Makefile.t18x b/drivers/video/tegra/Makefile.t18x
deleted file mode 100644
index eef070d95..000000000
--- a/drivers/video/tegra/Makefile.t18x
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-y += dc/
-obj-y += host/
diff --git a/drivers/video/tegra/dc/Makefile.t18x b/drivers/video/tegra/dc/Makefile.nvidia
index 783c0cb0d..783c0cb0d 100644
--- a/drivers/video/tegra/dc/Makefile.t18x
+++ b/drivers/video/tegra/dc/Makefile.nvidia
diff --git a/drivers/video/tegra/dc/nvdisp/Makefile.t18x b/drivers/video/tegra/dc/nvdisp/Makefile.nvidia
index ed6454c06..ed6454c06 100644
--- a/drivers/video/tegra/dc/nvdisp/Makefile.t18x
+++ b/drivers/video/tegra/dc/nvdisp/Makefile.nvidia
diff --git a/drivers/video/tegra/host/Makefile.t18x b/drivers/video/tegra/host/Makefile.nvidia
index 52327a5a8..52327a5a8 100644
--- a/drivers/video/tegra/host/Makefile.t18x
+++ b/drivers/video/tegra/host/Makefile.nvidia
diff --git a/drivers/video/tegra/host/vi/Makefile.t18x b/drivers/video/tegra/host/vi/Makefile.nvidia
index 91119fd76..91119fd76 100644
--- a/drivers/video/tegra/host/vi/Makefile.t18x
+++ b/drivers/video/tegra/host/vi/Makefile.nvidia
diff --git a/drivers/watchdog/Kconfig.t18x b/drivers/watchdog/Kconfig.nvidia
index 499ed973a..499ed973a 100644
--- a/drivers/watchdog/Kconfig.t18x
+++ b/drivers/watchdog/Kconfig.nvidia
diff --git a/drivers/watchdog/Makefile.t18x b/drivers/watchdog/Makefile.nvidia
index 0f8b1cfa1..0f8b1cfa1 100644
--- a/drivers/watchdog/Makefile.t18x
+++ b/drivers/watchdog/Makefile.nvidia
diff --git a/sound/soc/Kconfig.t18x b/sound/soc/Kconfig.nvidia
index 21ccb2400..21ccb2400 100644
--- a/sound/soc/Kconfig.t18x
+++ b/sound/soc/Kconfig.nvidia
diff --git a/sound/soc/Makefile.t18x b/sound/soc/Makefile.nvidia
index f7bbb9095..f7bbb9095 100644
--- a/sound/soc/Makefile.t18x
+++ b/sound/soc/Makefile.nvidia
diff --git a/sound/soc/tegra-alt/Kconfig.t18x b/sound/soc/tegra-alt/Kconfig.nvidia
index 532f78fec..532f78fec 100644
--- a/sound/soc/tegra-alt/Kconfig.t18x
+++ b/sound/soc/tegra-alt/Kconfig.nvidia
diff --git a/sound/soc/tegra-alt/Makefile.t18x b/sound/soc/tegra-alt/Makefile.nvidia
index 1d74c8c97..1d74c8c97 100644
--- a/sound/soc/tegra-alt/Makefile.t18x
+++ b/sound/soc/tegra-alt/Makefile.nvidia