Commit 3a60e2a1 authored by Georgi Djakov's avatar Georgi Djakov
Browse files

Merge branch 'icc-retire-macros' into icc-next 

This is ripped out of the bigger patch series at [1], as this part
doesn't really have any dependencies and (hopefully) brings no
functional change.

Compile-tested for the most part, bloat-o-meter reports no size change

[1] https://lore.kernel.org/linux-arm-msm/20230708-topic-rpmh_icc_rsc-v1-0-b223bd2ac8dd@linaro.org/

* icc-retire-macros
  interconnect: qcom: sc7180: Retire DEFINE_QNODE
  interconnect: qcom: sdm670: Retire DEFINE_QNODE
  interconnect: qcom: sdm845: Retire DEFINE_QNODE
  interconnect: qcom: sdx55: Retire DEFINE_QNODE
  interconnect: qcom: sdx65: Retire DEFINE_QNODE
  interconnect: qcom: sm6350: Retire DEFINE_QNODE
  interconnect: qcom: sm8150: Retire DEFINE_QNODE
  interconnect: qcom: sm8250: Retire DEFINE_QNODE
  interconnect: qcom: sm8350: Retire DEFINE_QNODE
  interconnect: qcom: icc-rpmh: Retire DEFINE_QNODE
  interconnect: qcom: sc7180: Retire DEFINE_QBCM
  interconnect: qcom: sdm670: Retire DEFINE_QBCM
  interconnect: qcom: sdm845: Retire DEFINE_QBCM
  interconnect: qcom: sdx55: Retire DEFINE_QBCM
  interconnect: qcom: sdx65: Retire DEFINE_QBCM
  interconnect: qcom: sm6350: Retire DEFINE_QBCM
  interconnect: qcom: sm8150: Retire DEFINE_QBCM
  interconnect: qcom: sm8250: Retire DEFINE_QBCM
  interconnect: qcom: sm8350: Retire DEFINE_QBCM
  interconnect: qcom: icc-rpmh: Retire DEFINE_QBCM

Link: https://lore.kernel.org/r/20230811-topic-icc_retire_macrosd-v1-0-c03aaeffc769@linaro.org


Signed-off-by: default avatarGeorgi Djakov <djakov@kernel.org>
parents e0d855b5 a18e26a5

drivers/interconnect/qcom/bcm-voter.h

+0 −8
Original line number Original line Diff line number Diff line
@@ -12,14 +12,6 @@ 




#include "icc-rpmh.h"

#include "icc-rpmh.h"





#define DEFINE_QBCM(_name, _bcmname, _keepalive, ...)			       \

static struct qcom_icc_bcm _name = {					       \

	.name = _bcmname,						       \

	.keepalive = _keepalive,					       \

	.num_nodes = ARRAY_SIZE(((struct qcom_icc_node *[]){ __VA_ARGS__ })),  \

	.nodes = { __VA_ARGS__ },					       \

}



struct bcm_voter *of_bcm_voter_get(struct device *dev, const char *name);

struct bcm_voter *of_bcm_voter_get(struct device *dev, const char *name);

void qcom_icc_bcm_voter_add(struct bcm_voter *voter, struct qcom_icc_bcm *bcm);

void qcom_icc_bcm_voter_add(struct bcm_voter *voter, struct qcom_icc_bcm *bcm);

int qcom_icc_bcm_voter_commit(struct bcm_voter *voter);

int qcom_icc_bcm_voter_commit(struct bcm_voter *voter);

drivers/interconnect/qcom/icc-rpmh.h

+0 −10
Original line number Original line Diff line number Diff line
@@ -120,16 +120,6 @@ struct qcom_icc_desc { 
	size_t num_bcms;

	size_t num_bcms;

};

};





#define DEFINE_QNODE(_name, _id, _channels, _buswidth, ...)		\

		static struct qcom_icc_node _name = {			\

		.id = _id,						\

		.name = #_name,						\

		.channels = _channels,					\

		.buswidth = _buswidth,					\

		.num_links = ARRAY_SIZE(((int[]){ __VA_ARGS__ })),	\

		.links = { __VA_ARGS__ },				\

	}



int qcom_icc_aggregate(struct icc_node *node, u32 tag, u32 avg_bw,

int qcom_icc_aggregate(struct icc_node *node, u32 tag, u32 avg_bw,

		       u32 peak_bw, u32 *agg_avg, u32 *agg_peak);

		       u32 peak_bw, u32 *agg_avg, u32 *agg_peak);

int qcom_icc_set(struct icc_node *src, struct icc_node *dst);

int qcom_icc_set(struct icc_node *src, struct icc_node *dst);

drivers/interconnect/qcom/sc7180.c

+1451 −162

File changed.

Preview size limit exceeded, changes collapsed.

drivers/interconnect/qcom/sdm670.c

+1245 −141

File changed.

Preview size limit exceeded, changes collapsed.

drivers/interconnect/qcom/sdm845.c

+1496 −159

File changed.

Preview size limit exceeded, changes collapsed.