From dde3183f2e386070ce772309e12a19e2fe2e4f9f Mon Sep 17 00:00:00 2001 From: Mukesh Ojha Date: Mon, 15 Jun 2020 18:36:31 +0530 Subject: [PATCH] Revert "interconnect: qcom: Build icc-rpmh with qnoc-lahaina" This reverts commit 6ed237072e8a41e528b8581f384cce0f0c1f802c. and make icc-rpmh work as a module. Change-Id: Ib002f15eda6a9ccfe5ef053195d6b485c99db2a6 Signed-off-by: Mukesh Ojha --- drivers/interconnect/qcom/Kconfig | 4 ++++ drivers/interconnect/qcom/Makefile | 4 +++- drivers/interconnect/qcom/icc-rpmh.c | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/interconnect/qcom/Kconfig b/drivers/interconnect/qcom/Kconfig index edbf3b13fd2b..31d592a0f604 100644 --- a/drivers/interconnect/qcom/Kconfig +++ b/drivers/interconnect/qcom/Kconfig @@ -27,6 +27,7 @@ config INTERCONNECT_QCOM_LAHAINA depends on INTERCONNECT_QCOM depends on QCOM_RPMH && QCOM_COMMAND_DB && OF select INTERCONNECT_QCOM_BCM_VOTER + select INTERCONNECT_QCOM_RPMH help This is a driver for the Qualcomm Technologies, Inc. Network-on-Chip on lahaina-based platforms. @@ -45,3 +46,6 @@ config INTERCONNECT_QCOM_SMD_RPM config INTERCONNECT_QCOM_BCM_VOTER tristate + +config INTERCONNECT_QCOM_RPMH + tristate diff --git a/drivers/interconnect/qcom/Makefile b/drivers/interconnect/qcom/Makefile index becb72e3014f..df825c5a83b9 100644 --- a/drivers/interconnect/qcom/Makefile +++ b/drivers/interconnect/qcom/Makefile @@ -2,13 +2,15 @@ qnoc-qcs404-objs := qcs404.o qnoc-sdm845-objs := sdm845.o -qnoc-lahaina-objs := lahaina.o icc-rpmh.o qnoc-qos.o +qnoc-lahaina-objs := lahaina.o qnoc-qos.o icc-smd-rpm-objs := smd-rpm.o icc-bcm-voter-objs := bcm-voter.o +icc-rpmh-obj := icc-rpmh.o obj-$(CONFIG_INTERCONNECT_QCOM_QCS404) += qnoc-qcs404.o obj-$(CONFIG_INTERCONNECT_QCOM_SDM845) += qnoc-sdm845.o obj-$(CONFIG_INTERCONNECT_QCOM_LAHAINA) += qnoc-lahaina.o obj-$(CONFIG_INTERCONNECT_QCOM_SMD_RPM) += icc-smd-rpm.o obj-$(CONFIG_INTERCONNECT_QCOM_BCM_VOTER) += icc-bcm-voter.o +obj-$(CONFIG_INTERCONNECT_QCOM_RPMH) += icc-rpmh.o obj-$(CONFIG_INTERCONNECT_QCOM_EPSS_L3) += epss-l3.o diff --git a/drivers/interconnect/qcom/icc-rpmh.c b/drivers/interconnect/qcom/icc-rpmh.c index 196195502a65..eb521067de75 100644 --- a/drivers/interconnect/qcom/icc-rpmh.c +++ b/drivers/interconnect/qcom/icc-rpmh.c @@ -9,6 +9,7 @@ #include #include #include +#include #include "icc-rpmh.h" #include "bcm-voter.h" @@ -171,3 +172,5 @@ int qcom_icc_bcm_init(struct qcom_icc_bcm *bcm, struct device *dev) return 0; } EXPORT_SYMBOL(qcom_icc_bcm_init); + +MODULE_LICENSE("GPL v2");