nvidia: Add Kconfig and Makefile support

Add Kconfigs and Makefiles in sub-folders to
compile code.

Bug 1856401

Change-Id: Ice5c0b4a8a25dc28b1faac1df32bae04b7391506
Signed-off-by: Bhanu Murthy V <bmurthyv@nvidia.com>
Reviewed-on: http://git-master/r/1324565
Reviewed-by: Frank Chen <frankc@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Jihoon Bang <jbang@nvidia.com>

27 files changed, 240 insertions, 65 deletions

diff --git a/drivers/Makefile.nvidia b/drivers/Makefile.nvidia
new file mode 100644
index 000000000..70849d6d1
--- /dev/null
+++ b/drivers/Makefile.nvidia
@@ -0,0 +1,3 @@
+obj-y += i2c/
+obj-y += media/
+obj-y += video/
diff --git a/drivers/i2c/Makefile.nvidia b/drivers/i2c/Makefile.nvidia
new file mode 100644
index 000000000..0717b752f
--- /dev/null
+++ b/drivers/i2c/Makefile.nvidia
@@ -0,0 +1 @@
+obj-y += busses/
diff --git a/drivers/i2c/busses/Kconfig.nvidia b/drivers/i2c/busses/Kconfig.nvidia
new file mode 100644
index 000000000..385e6ada4
--- /dev/null
+++ b/drivers/i2c/busses/Kconfig.nvidia
@@ -0,0 +1,9 @@
+
+config I2C_TEGRA_VI
+        tristate "NVIDIA Tegra internal VII2C controller"
+        depends on ARCH_TEGRA
+        default y
+        select I2C_ALGOBIT
+        help
+          If you say yes to this option, support will be included for the
+          I2C controller embedded in NVIDIA Tegra SOCs
diff --git a/drivers/i2c/busses/Makefile.nvidia b/drivers/i2c/busses/Makefile.nvidia
new file mode 100644
index 000000000..2836f3f1b
--- /dev/null
+++ b/drivers/i2c/busses/Makefile.nvidia
@@ -0,0 +1 @@
+obj-$(CONFIG_I2C_TEGRA_VI)      += i2c-tegra-vi.o
diff --git a/drivers/media/Makefile.nvidia b/drivers/media/Makefile.nvidia
new file mode 100644
index 000000000..f86e3259f
--- /dev/null
+++ b/drivers/media/Makefile.nvidia
@@ -0,0 +1,2 @@
+obj-y += i2c/
+obj-y += platform/
diff --git a/drivers/media/i2c/Kconfig.nvidia b/drivers/media/i2c/Kconfig.nvidia
new file mode 100644
index 000000000..46f106c52
--- /dev/null
+++ b/drivers/media/i2c/Kconfig.nvidia
@@ -0,0 +1,96 @@
+
+config VIDEO_IMX185
+        tristate "IMX185 camera sensor support"
+        depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
+        ---help---
+        This is a Video4Linux2 sensor-level driver for the Sony
+        IMX185 camera sensor
+
+        To compile this driver as a module, choose M here: the module
+        will be called imx185.
+
+config VIDEO_IMX219
+        tristate "IMX219 camera sensor support"
+        depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
+        ---help---
+          This driver supports IMX219 camera sensor from Sony
+
+          To compile this driver as a module, choose M here: the module
+          will be called imx219.
+
+config VIDEO_IMX274
+        tristate "IMX274 camera sensor support"
+        depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
+        ---help---
+          This is a Video4Linux2 sensor-level driver for the Sony
+          IMX274 camera sensor
+
+          To compile this driver as a module, choose M here: the module
+          will be called imx274.
+
+config VIDEO_LC898212
+        tristate "LC898212 focuser support"
+        depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
+        ---help---
+          This driver supports LC898212 camera focuser
+
+          To compile this driver as a module, choose M here: the module
+          will be called lc898212.
+
+config VIDEO_OV5693
+        tristate "OV5693 camera sensor support"
+        depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
+        ---help---
+          This is a Video4Linux2 sensor-level driver for the OmniVision
+          OV5693 camera.
+
+          To compile this driver as a module, choose M here: the module
+          will be called ov5693.
+
+config VIDEO_OV9281
+        tristate "OmniVision OV9281 camera sensor support"
+        depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
+        ---help---
+          This is a Video4Linux2 sensor driver for the OmniVision
+          OV9281 camera sensor, for use with the tegra isp.
+
+          To compile this driver as a module, choose M here: the module
+          will be called ov9281.
+
+config VIDEO_OV10823
+        tristate "OmniVision OV10823 camera sensor support"
+        depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
+        ---help---
+          This is a Video4Linux2 sensor driver for the OmniVision
+          OV10823 camera sensor, for use with the tegra isp.
+
+          To compile this driver as a module, choose M here: the module
+          will be called ov10823.
+
+config VIDEO_OV23850
+        tristate "OmniVision OV23850 sensor support"
+        depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
+        ---help---
+          This driver supports OmniVision OV23850 camera sensor
+
+          To compile this driver as a module, choose M here: the module
+          will be called ov23850.
+
+config I2C_IOEXPANDER_PCA9570
+        tristate "nxp PCA9570 I2C IO Expander"
+        help
+          If you say yes here you get support for the nxp PCA9570
+          I2C IO Expander devices.
+
+          To compile this driver as a module, choose M here: the module
+          will be called pca9570.
+
+config VIDEO_TC358840
+        tristate "Toshiba TC358840 decoder"
+        depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API
+        select HDMI
+        ---help---
+          Support for the Toshiba TC358840 HDMI to MIPI CSI-2 bridge.
+
+          To compile this driver as a module, choose M here: the
+          module will be called tc358840.
diff --git a/drivers/media/i2c/Makefile.nvidia b/drivers/media/i2c/Makefile.nvidia
new file mode 100644
index 000000000..f1f14864f
--- /dev/null
+++ b/drivers/media/i2c/Makefile.nvidia
@@ -0,0 +1,15 @@
+subdir-ccflags-y += -Werror
+
+ccflags-y += -I$(srctree)/drivers/media/platform/tegra
+ccflags-y += -I$(srctree)/drivers/video/tegra/camera
+
+obj-$(CONFIG_VIDEO_IMX185) += imx185.o
+obj-$(CONFIG_VIDEO_IMX219) += imx219.o
+obj-$(CONFIG_VIDEO_IMX274) += imx274.o
+obj-$(CONFIG_VIDEO_LC898212) += lc898212.o
+obj-$(CONFIG_VIDEO_OV5693) += ov5693.o
+obj-$(CONFIG_VIDEO_OV9281) += ov9281.o
+obj-$(CONFIG_VIDEO_OV10823) += ov10823.o
+obj-$(CONFIG_VIDEO_OV23850) += ov23850.o
+obj-$(CONFIG_I2C_IOEXPANDER_PCA9570) += pca9570.o
+obj-$(CONFIG_VIDEO_TC358840) += tc358840.o
diff --git a/drivers/media/platform/Makefile.nvidia b/drivers/media/platform/Makefile.nvidia
new file mode 100644
index 000000000..3d50fea2a
--- /dev/null
+++ b/drivers/media/platform/Makefile.nvidia
@@ -0,0 +1 @@
+obj-y += tegra/
diff --git a/drivers/media/platform/tegra/Kconfig.nvidia b/drivers/media/platform/tegra/Kconfig.nvidia
new file mode 100644
index 000000000..ed13e592d
--- /dev/null
+++ b/drivers/media/platform/tegra/Kconfig.nvidia
@@ -0,0 +1,37 @@
+
+source "../nvidia/drivers/media/platform/tegra/mipical/Kconfig.nvidia"
+
+config VIDEO_CAMERA
+        tristate "generic camera device support"
+        depends on I2C && ARCH_TEGRA
+        select REGMAP_I2C
+        ---help---
+          This is a driver for generic camera devices
+          for use with the tegra isp.
+
+config VIDEO_TEGRA_VI
+        depends on TEGRA_GRHOST
+        depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && OF
+        select VIDEOBUF2_DMA_CONTIG
+        tristate "Tegra video input host1x client driver"
+        default y
+        help
+          Driver for the Tegra video input hardware based on
+          media controller framework and interact with host1x
+          apis to support both user space as well as kernel
+          programming of VI hardware registers
+          To compile this driver as a module, choose M here:
+          the module will be called nvhost-vi.
+
+config VIDEO_TEGRA_VI_TPG
+        depends on VIDEO_TEGRA_VI
+        tristate "Tegra video input test pattern generator driver"
+        default m
+        help
+          Driver for the Tegra video input test pattern generator
+          driver is based on media controller framework and interact
+          with host1x apis to support both user space as well as kernel
+          programming of VI hardware registers to generate predefined
+          test patterns.
+          To compile this driver as a module, choose M here:
+          the module will be called nvhost-vi-tpg.
diff --git a/drivers/media/platform/tegra/Makefile b/drivers/media/platform/tegra/Makefile.nvidia
index 414f22f69..91d184945 100644
--- a/drivers/media/platform/tegra/Makefile
+++ b/drivers/media/platform/tegra/Makefile.nvidia
@@ -4,9 +4,8 @@ GCOV_PROFILE := y
 #
 # Makefile for the video capture/playback device drivers.
 #
-obj-y   += camera/
-obj-y   += vi/
+obj-$(CONFIG_VIDEO_CAMERA)      += camera/
+obj-$(CONFIG_VIDEO_TEGRA_VI)    += vi/
 obj-$(CONFIG_VIDEO_CAMERA)      += regmap_util.o
 obj-$(CONFIG_VIDEO_TEGRA_VI_TPG) += tpg/
-
 obj-$(CONFIG_TEGRA_MIPI_CAL)    += mipical/
diff --git a/drivers/media/platform/tegra/camera/Makefile b/drivers/media/platform/tegra/camera/Makefile
deleted file mode 100644
index 8474f451a..000000000
--- a/drivers/media/platform/tegra/camera/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-GCOV_PROFILE := y
-obj-y                           += vi/
-obj-y                           += csi/
-ccflags-y += -I../nvhost/drivers/video/tegra/host
-ccflags-y += -Idrivers/video/tegra/host
-ccflags-y += -Idrivers/video/tegra/camera
-ccflags-y += -Idrivers/media/platform/tegra
-ccflags-y += -Werror
-
-obj-y += camera_common.o camera_gpio.o sensor_common.o
diff --git a/drivers/media/platform/tegra/camera/Makefile.nvidia b/drivers/media/platform/tegra/camera/Makefile.nvidia
new file mode 100644
index 000000000..ac2be6e56
--- /dev/null
+++ b/drivers/media/platform/tegra/camera/Makefile.nvidia
@@ -0,0 +1,10 @@
+GCOV_PROFILE := y
+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/media/platform/tegra
+ccflags-y += -Werror
+
+obj-y += vi/
+obj-y += csi/
+obj-y += camera_common.o camera_gpio.o sensor_common.o
diff --git a/drivers/media/platform/tegra/camera/csi/Makefile b/drivers/media/platform/tegra/camera/csi/Makefile
deleted file mode 100644
index 3d307cb83..000000000
--- a/drivers/media/platform/tegra/camera/csi/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-GCOV_PROFILE := y
-ccflags-y += -I../nvhost/drivers/video/tegra/host
-ccflags-y += -I../nvhost/include
-ccflags-y += -Idrivers/video/tegra/camera
-ccflags-y += -Idrivers/media/platform/tegra
-ccflags-y += -Werror
-
-obj-y += csi.o csi2_fops.o csi4_fops.o
diff --git a/drivers/media/platform/tegra/camera/csi/Makefile.nvidia b/drivers/media/platform/tegra/camera/csi/Makefile.nvidia
new file mode 100644
index 000000000..93cc3ad87
--- /dev/null
+++ b/drivers/media/platform/tegra/camera/csi/Makefile.nvidia
@@ -0,0 +1,8 @@
+GCOV_PROFILE := y
+ccflags-y += -I$(srctree)/../nvhost/drivers/video/tegra/host
+ccflags-y += -I$(srctree)/../nvidia/drivers/video/tegra/camera
+ccflags-y += -I$(srctree)/../nvidia/drivers/media/platform/tegra
+ccflags-y += -I$(srctree)/../nvhost/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
deleted file mode 100644
index 11bce8f3b..000000000
--- a/drivers/media/platform/tegra/camera/vi/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-GCOV_PROFILE := y
-ccflags-y += -I../nvhost/drivers/video/tegra/host
-ccflags-y += -Idrivers/video/tegra/host
-ccflags-y += -Idrivers/video/tegra/camera
-ccflags-y += -Idrivers/media/platform/tegra
-ccflags-y += -Werror
-
-ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y)
-ccflags-y += -I../t18x/drivers/video/tegra/host/
-ccflags-y += -I../t18x/include
-ccflags-y += -I../nvhost/include
-obj-y += mc_common.o core.o channel.o graph.o vi2_fops.o vi4_fops.o
-endif
-
-obj-$(CONFIG_TEGRA_CAMERA_RTCPU) += capture.o
-
-ifeq ($(CONFIG_ARCH_TEGRA_210_SOC),y)
-ccflags-y += -I../nvhost/include
-ccflags-y += -I../t18x/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/camera/vi/Makefile.nvidia b/drivers/media/platform/tegra/camera/vi/Makefile.nvidia
new file mode 100644
index 000000000..cd52046ad
--- /dev/null
+++ b/drivers/media/platform/tegra/camera/vi/Makefile.nvidia
@@ -0,0 +1,20 @@
+GCOV_PROFILE := y
+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/media/platform/tegra
+ccflags-y += -I$(srctree)/../nvhost/include
+ccflags-y += -I$(srctree)/../t18x/drivers/video/tegra/host/
+ccflags-y += -I$(srctree)/../t18x/include
+ccflags-y += -Werror
+
+ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y)
+obj-y += mc_common.o core.o channel.o graph.o vi2_fops.o vi4_fops.o
+endif
+
+obj-$(CONFIG_TEGRA_CAMERA_RTCPU) += capture.o
+
+ifeq ($(CONFIG_ARCH_TEGRA_210_SOC),y)
+ccflags-y += -I$(srctree)/../t18x/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/camera/vi/graph.c b/drivers/media/platform/tegra/camera/vi/graph.c
index c2dd058a1..43bea2eae 100644
--- a/drivers/media/platform/tegra/camera/vi/graph.c
+++ b/drivers/media/platform/tegra/camera/vi/graph.c
@@ -19,7 +19,7 @@
 #include <linux/regulator/consumer.h>
 #include <linux/reset.h>
 #include <linux/slab.h>
-#include <linux/tegra-soc.h>
+#include <soc/tegra/chip-id.h>
 #include <linux/tegra_pm_domains.h>
 
 #include <media/media-device.h>
diff --git a/drivers/media/platform/tegra/mipical/Kconfig b/drivers/media/platform/tegra/mipical/Kconfig.nvidia
index e00659b2b..e00659b2b 100644
--- a/drivers/media/platform/tegra/mipical/Kconfig
+++ b/drivers/media/platform/tegra/mipical/Kconfig.nvidia
diff --git a/drivers/media/platform/tegra/mipical/Makefile b/drivers/media/platform/tegra/mipical/Makefile.nvidia
index ffd996e09..ffd996e09 100644
--- a/drivers/media/platform/tegra/mipical/Makefile
+++ b/drivers/media/platform/tegra/mipical/Makefile.nvidia
diff --git a/drivers/media/platform/tegra/tpg/Makefile b/drivers/media/platform/tegra/tpg/Makefile.nvidia
index 135473166..a5ba01b47 100644
--- a/drivers/media/platform/tegra/tpg/Makefile
+++ b/drivers/media/platform/tegra/tpg/Makefile.nvidia
@@ -1,14 +1,13 @@
 GCOV_PROFILE := y
-ccflags-y += -I../nvhost/drivers/video/tegra/host
-ccflags-y += -Idrivers/media/platform/tegra
+ccflags-y += -I$(srctree)/../nvhost/drivers/video/tegra/host
+ccflags-y += -I$(srctree)/../nvidia/drivers/media/platform/tegra
+ccflags-y += -I$(srctree)/../t18x/drivers/video/tegra/host
 ccflags-y += -Werror
 
 ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y)
-ccflags-y += -I../t18x/drivers/video/tegra/host
 nvhost-vi-tpg-objs += tpg_t18x.o
 else
 nvhost-vi-tpg-objs += tpg_t21x.o
 endif
 
-
 obj-$(CONFIG_VIDEO_TEGRA_VI_TPG) += nvhost-vi-tpg.o
diff --git a/drivers/media/platform/tegra/vi/Makefile b/drivers/media/platform/tegra/vi/Makefile
deleted file mode 100644
index 6cd9767ea..000000000
--- a/drivers/media/platform/tegra/vi/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-GCOV_PROFILE := y
-ccflags-y += -I../nvhost/drivers/video/tegra/host
-ccflags-y += -Idrivers/video/tegra/camera
-ccflags-y += -Idrivers/media/platform/tegra/
-ccflags-y += -Werror
-
-ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y)
-ccflags-y += -I../t18x/drivers/video/tegra/host/
-endif
-
-ifneq (,$(filter $(CONFIG_VIDEO_TEGRA_VI),y m))
-obj-y += vi_irq.o
-obj-y += tegra_vi.o
-endif
-
-nvhost-vi-objs += vi.o
-obj-$(CONFIG_VIDEO_TEGRA_VI) += nvhost-vi.o
diff --git a/drivers/media/platform/tegra/vi/Makefile.nvidia b/drivers/media/platform/tegra/vi/Makefile.nvidia
new file mode 100644
index 000000000..8858109bd
--- /dev/null
+++ b/drivers/media/platform/tegra/vi/Makefile.nvidia
@@ -0,0 +1,13 @@
+GCOV_PROFILE := y
+ccflags-y += -I$(srctree)/../nvhost/drivers/video/tegra/host
+ccflags-y += -I$(srctree)/drivers/video/tegra/host
+ccflags-y += -I$(srctree)/../t18x/drivers/video/tegra/host/
+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
+nvhost-vi-objs += vi_irq.o
+nvhost-vi-objs += tegra_vi.o
+
+obj-$(CONFIG_VIDEO_TEGRA_VI) += nvhost-vi.o
diff --git a/drivers/media/platform/tegra/vi/vi.c b/drivers/media/platform/tegra/vi/vi.c
index 61f47fd40..da86ee472 100644
--- a/drivers/media/platform/tegra/vi/vi.c
+++ b/drivers/media/platform/tegra/vi/vi.c
@@ -27,7 +27,7 @@
 #include <linux/of_device.h>
 #include <linux/of_platform.h>
 #include <linux/clk/tegra.h>
-#include <linux/tegra-soc.h>
+#include <soc/tegra/chip-id.h>
 #include <linux/tegra_pm_domains.h>
 #include <linux/debugfs.h>
 #include <linux/slab.h>
diff --git a/drivers/video/Makefile.nvidia b/drivers/video/Makefile.nvidia
new file mode 100644
index 000000000..3d50fea2a
--- /dev/null
+++ b/drivers/video/Makefile.nvidia
@@ -0,0 +1 @@
+obj-y += tegra/
diff --git a/drivers/video/tegra/Kconfig.nvidia b/drivers/video/tegra/Kconfig.nvidia
new file mode 100644
index 000000000..62f7ae756
--- /dev/null
+++ b/drivers/video/tegra/Kconfig.nvidia
@@ -0,0 +1,8 @@
+
+config TEGRA_CAMERA_PLATFORM
+        bool "Enable tegra camera platform driver"
+        depends on ARCH_TEGRA
+        default y
+        help
+          Enables tegra camera platform driver.
+          If unsure, say Y
diff --git a/drivers/video/tegra/Makefile.nvidia b/drivers/video/tegra/Makefile.nvidia
new file mode 100644
index 000000000..9b903d1ec
--- /dev/null
+++ b/drivers/video/tegra/Makefile.nvidia
@@ -0,0 +1 @@
+obj-$(CONFIG_TEGRA_CAMERA_PLATFORM) += camera/
diff --git a/drivers/video/tegra/camera/Makefile.nvidia b/drivers/video/tegra/camera/Makefile.nvidia
new file mode 100644
index 000000000..242d41482
--- /dev/null
+++ b/drivers/video/tegra/camera/Makefile.nvidia
@@ -0,0 +1,7 @@
+GCOV_PROFILE := y
+ccflags-y += -I$(srctree)/../nvhost/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