Merge "Revert "interconnect: qcom: Build icc-rpmh with qnoc-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.

config INTERCONNECT_QCOM_BCM_VOTER

	tristate

config INTERCONNECT_QCOM_RPMH

	tristate

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

#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"

	return 0;

}

EXPORT_SYMBOL(qcom_icc_bcm_init);

MODULE_LICENSE("GPL v2");