interconnect: qcom: Build icc-rpmh with qnoc-lahaina

Commit 342ec64e3b ("icc: qcom: Refactor icc rpmh support") made
icc-rpmh.c buildable as a module but it isn't set up to be a module which
results in the following warning:

 WARNING: modpost: missing MODULE_LICENSE() in drivers/interconnect/qcom/icc-rpmh.o

It looks like the intent is to make the symbols available in a module but
since only qnoc-lahaina selects it it makes sense for now to put the object
file into that module for now.

Change-Id: Ic0dedbad82d10f303e01a3624d78b39f711ab007
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
This commit is contained in:
Jordan Crouse 2019-11-05 12:20:44 -07:00
commit 6ed237072e
2 changed files with 1 additions and 8 deletions

View file

@ -27,7 +27,6 @@ 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.
@ -46,6 +45,3 @@ config INTERCONNECT_QCOM_SMD_RPM
config INTERCONNECT_QCOM_BCM_VOTER
tristate
config INTERCONNECT_QCOM_RPMH
tristate

View file

@ -2,16 +2,13 @@
qnoc-qcs404-objs := qcs404.o
qnoc-sdm845-objs := sdm845.o
qnoc-lahaina-objs := lahaina.o
qnoc-lahaina-objs := lahaina.o icc-rpmh.o
icc-smd-rpm-objs := smd-rpm.o
icc-bcm-voter-objs := bcm-voter.o
icc-rpmh-obj := icc-rpmh.o
epss-l3-obj := epss-l3.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