From 9385860b4f8ba5033c76f6faa86c6b5289a8aaf9 Mon Sep 17 00:00:00 2001
From: Lina Iyer <ilina@codeaurora.org>
Date: Mon, 2 Dec 2019 11:46:33 -0700
Subject: [PATCH] Revert "drivers: qcom: cmd-db: modularize commandDB driver"

This reverts commit 75afa532e78acc2aff50ade7813a11e31995dc91.
Too many things rely on cmd-db to be built in to allow it to
be built as a module.

Change-Id: I317ba89a7d3c9f88832e73834b65bcccac79bbe1
Signed-off-by: Lina Iyer <ilina@codeaurora.org>
---
 drivers/soc/qcom/Kconfig  | 2 +-
 drivers/soc/qcom/cmd-db.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig
index 67f6406240c8..44366356ec81 100644
--- a/drivers/soc/qcom/Kconfig
+++ b/drivers/soc/qcom/Kconfig
@@ -17,7 +17,7 @@ config QCOM_AOSS_QMP
 	  Subsystem (AOSS) using Qualcomm Messaging Protocol (QMP).
 
 config QCOM_COMMAND_DB
-	tristate "Qualcomm Technologies, Inc. Command DB driver"
+	bool "Qualcomm Technologies, Inc. Command DB driver"
 	depends on ARCH_QCOM || COMPILE_TEST
 	depends on OF_RESERVED_MEM
 	help
diff --git a/drivers/soc/qcom/cmd-db.c b/drivers/soc/qcom/cmd-db.c
index 8261b76bb50c..c0794ecfde32 100644
--- a/drivers/soc/qcom/cmd-db.c
+++ b/drivers/soc/qcom/cmd-db.c
@@ -4,7 +4,6 @@
 #include <linux/debugfs.h>
 #include <linux/fs.h>
 #include <linux/kernel.h>
-#include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <linux/of_platform.h>
@@ -398,7 +397,9 @@ static struct platform_driver cmd_db_dev_driver = {
 		   .of_match_table = cmd_db_match_table,
 	},
 };
-builtin_platform_driver(cmd_db_dev_driver);
 
-MODULE_LICENSE("GPL v2");
-MODULE_DESCRIPTION("Qualcomm Technologies, Inc. CommandDB driver");
+static int __init cmd_db_device_init(void)
+{
+	return platform_driver_register(&cmd_db_dev_driver);
+}
+arch_initcall(cmd_db_device_init);