firmware: tegra: add NV_TEGRA_BPMP to build

BPMP driver was moved from linux-4.9 repository. Modify Makefiles and
Kconfig files to add driver as part of build.

Also rename downstream BPMP driver Kconfig to NV_TEGRA_BPMP to
differentiate it from upstream driver that is available in recent
kernel versions. Also add mention about it in menuconfig options.

Bug 200325739

Change-Id: Ide3884b8c8afe8a4d89fa79932381b7cff8edf00
Signed-off-by: Timo Alho <talho@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1635551
GVS: Gerrit_Virtual_Submit
Reviewed-by: Mikko Perttunen <mperttunen@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

7 files changed, 25 insertions, 6 deletions

diff --git a/drivers/clk/tegra/Makefile b/drivers/clk/tegra/Makefile
new file mode 100644
index 000000000..02938f2f7
--- /dev/null
+++ b/drivers/clk/tegra/Makefile
@@ -0,0 +1,3 @@
+obj-y   += clk-bpmp.o
+obj-y   += clk-tegra-bpmp.o
+obj-y   += clk-fake.o
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
new file mode 100644
index 000000000..60c6dfb5c
--- /dev/null
+++ b/drivers/firmware/Kconfig
@@ -0,0 +1,5 @@
+append_menu "Firmware Drivers"
+
+source "drivers/firmware/tegra/Kconfig"
+
+endmenu
diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile
new file mode 100644
index 000000000..ba4584c6c
--- /dev/null
+++ b/drivers/firmware/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_NV_TEGRA_BPMP)     += tegra/
diff --git a/drivers/firmware/tegra/Kconfig b/drivers/firmware/tegra/Kconfig
index 2fa8119a7..1be641336 100644
--- a/drivers/firmware/tegra/Kconfig
+++ b/drivers/firmware/tegra/Kconfig
@@ -1,17 +1,20 @@
 menu "Tegra BPMP Driver"
 
-config TEGRA_BPMP
-        bool "Tegra BPMP driver"
+config NV_TEGRA_BPMP
+        bool "Tegra BPMP driver (Downstream version)"
         default n
         select TEGRA_IVC
         select TEGRA_HSP
         help
           Manages firmware running on Tegra BPMP
 
+          This driver is a downstream version and there is a newer variant
+          available in modern kernels.
+
 config BPMP_DEBUGFS_MOUNT_ON_BOOT
         bool "Mount the BPMP debug fs on boot"
         default y
-        depends on DEBUG_FS
+        depends on DEBUG_FS && NV_TEGRA_BPMP
         help
           Disable this if you don't want to mount the BPMP debug fs by default
           on boot.
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index b0920979a..d488b815c 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -10,8 +10,8 @@ config I2C_TEGRA_VI
           I2C controller embedded in NVIDIA Tegra SOCs
 
 config I2C_BPMP_TEGRA
-        tristate "NVIDIA Tegra internal BPMP I2C controller"
-        depends on TEGRA_BPMP
+        tristate "NVIDIA Tegra internal BPMP I2C controller (Downstream version)"
+        depends on NV_TEGRA_BPMP
         default y
         select I2C_ALGO_BUSCLEAR
         select I2C_ALGOBIT
@@ -21,6 +21,10 @@ config I2C_BPMP_TEGRA
           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.
+
+          This driver is a downstream version and there is a newer variant
+          available in modern kernels.
+
 config TEGRA_I2CSLV_T186
         bool "Tegra i2c slave controller driver"
         default y
diff --git a/drivers/platform/tegra/Kconfig b/drivers/platform/tegra/Kconfig
index e14fb29ce..5956cb223 100644
--- a/drivers/platform/tegra/Kconfig
+++ b/drivers/platform/tegra/Kconfig
@@ -161,4 +161,7 @@ config TEGRA_CBB_NOC
           The Tegra Control Backbone(CBB)/Network-on-chip(NOC) error handler.
           This drivers handles SError from bridges due to failed transactions.
 
+config POWERGATE_TEGRA_BPMP
+        def_bool NV_TEGRA_BPMP
+
 source "drivers/platform/tegra/nvadsp/Kconfig"
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index 0c48740ad..9576924a0 100644
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -1 +1 @@
-obj-$(CONFIG_TEGRA_BPMP) += tegra_bpmp_thermal.o
+obj-$(CONFIG_NV_TEGRA_BPMP) += tegra_bpmp_thermal.o