Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4d87ace authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 324dcd65 6ed23707

drivers/interconnect/qcom/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -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

drivers/interconnect/qcom/Makefile

+1 −4
Original line number Diff line number Diff line
@@ -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