Commit 51c16100 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'icc-6.8-rc4' of...

Merge tag 'icc-6.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc

 into char-misc-linus

Georgi writes:

interconnect fixes for v6.8-rc

These are tiny fixes for reported issues in driver code for a few
platforms. One of them sorts out a hang issue, the other improves
the power consumption and the rest are fixing some bitmasks to make
sure the hardware does thing right.

-  interconnect: qcom: sc8180x: Mark CO0 BCM keepalive
-  interconnect: qcom: sm8550: Enable sync_state
-  interconnect: qcom: sm8650: Use correct ACV enable_mask
-  interconnect: qcom: x1e80100: Add missing ACV enable_mask

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

* tag 'icc-6.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc:
  interconnect: qcom: x1e80100: Add missing ACV enable_mask
  interconnect: qcom: sm8650: Use correct ACV enable_mask
  interconnect: qcom: sm8550: Enable sync_state
  interconnect: qcom: sc8180x: Mark CO0 BCM keepalive
parents 54be6c6c 5464e7ac
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -1372,6 +1372,7 @@ static struct qcom_icc_bcm bcm_mm0 = {

static struct qcom_icc_bcm bcm_co0 = {
	.name = "CO0",
	.keepalive = true,
	.num_nodes = 1,
	.nodes = { &slv_qns_cdsp_mem_noc }
};
+1 −0
Original line number Diff line number Diff line
@@ -2223,6 +2223,7 @@ static struct platform_driver qnoc_driver = {
	.driver = {
		.name = "qnoc-sm8550",
		.of_match_table = qnoc_of_match,
		.sync_state = icc_sync_state,
	},
};

+1 −1
Original line number Diff line number Diff line
@@ -1160,7 +1160,7 @@ static struct qcom_icc_node qns_gemnoc_sf = {

static struct qcom_icc_bcm bcm_acv = {
	.name = "ACV",
	.enable_mask = BIT(3),
	.enable_mask = BIT(0),
	.num_nodes = 1,
	.nodes = { &ebi },
};
+1 −0
Original line number Diff line number Diff line
@@ -1586,6 +1586,7 @@ static struct qcom_icc_node qns_pcie_south_gem_noc_pcie = {

static struct qcom_icc_bcm bcm_acv = {
	.name = "ACV",
	.enable_mask = BIT(3),
	.num_nodes = 1,
	.nodes = { &ebi },
};