From d20bc7c1883f6c81c5116a1eb808ee82b46e1dc8 Mon Sep 17 00:00:00 2001
From: Jon Hunter <jonathanh@nvidia.com>
Date: Wed, 19 Apr 2023 15:55:36 +0100
Subject: [PATCH] platform: tegra: rtcpu: Combine drivers

The RTCPU driver has a dependency of the following kernel modules:

 clk-group
 device-group
 reset-group

Rather that builds all these source files as individual drivers, which
is bloating the number of kernel modules required, compile these source
files into the main RTCPU kernel module.

Finally, remove any unneeded header files from the ivc-bus driver.

Bug 4078936

Change-Id: I0981a716db7a91556d8c00a291b81dec01dda2e3
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2890896
Reviewed-by: svcacv <svcacv@nvidia.com>
Reviewed-by: Matti Ryttylainen <mryttylainen@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
---
 drivers/platform/tegra/rtcpu/Makefile  | 11 +++++++----
 drivers/platform/tegra/rtcpu/ivc-bus.c |  2 --
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/platform/tegra/rtcpu/Makefile b/drivers/platform/tegra/rtcpu/Makefile
index ccc0ecdb..089127d3 100644
--- a/drivers/platform/tegra/rtcpu/Makefile
+++ b/drivers/platform/tegra/rtcpu/Makefile
@@ -12,10 +12,13 @@ obj-m += ivc-bus.o
 obj-m += camchar.o
 obj-m += camera-diagnostics.o
 obj-m += rtcpu-debug.o
-obj-m += clk-group.o
 obj-m += hsp-mailbox-client.o
-obj-m += reset-group.o
-obj-m += device-group.o
 
-tegra-camera-rtcpu-objs :=  tegra-camera-rtcpu-base.o tegra-rtcpu-trace.o rtcpu-monitor.o
+tegra-camera-rtcpu-objs := clk-group.o \
+			   device-group.o \
+			   reset-group.o \
+			   rtcpu-monitor.o \
+	                   tegra-camera-rtcpu-base.o \
+			   tegra-rtcpu-trace.o
+
 obj-m += tegra-camera-rtcpu.o
diff --git a/drivers/platform/tegra/rtcpu/ivc-bus.c b/drivers/platform/tegra/rtcpu/ivc-bus.c
index 344d46ec..4698cea5 100644
--- a/drivers/platform/tegra/rtcpu/ivc-bus.c
+++ b/drivers/platform/tegra/rtcpu/ivc-bus.c
@@ -9,11 +9,9 @@
 #include <linux/slab.h>
 #include <soc/tegra/ivc_ext.h>
 #include <linux/tegra-ivc-bus.h>
-#include <linux/tegra-camera-rtcpu.h>
 #include <linux/bitops.h>
 #include <linux/version.h>
 #include "soc/tegra/camrtc-channels.h"
-#include "soc/tegra/camrtc-commands.h"
 
 #define NV(p) "nvidia," #p