Merge "Revert "interconnect: qcom: Build icc-rpmh with qnoc-lahaina""

This commit is contained in:
qctecmdr 2020-06-24 06:08:09 -07:00 • committed by Gerrit - the friendly Code Review server
commit e093936a5f
3 changed files with 10 additions and 1 deletions

View file

@ -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

View file

@ -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

View file

@ -9,6 +9,7 @@
#include <linux/clk.h>
#include <linux/interconnect.h>
#include <linux/interconnect-provider.h>
#include <linux/module.h>
#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");