Skip to content

Commit 51c1610

Browse files
committed
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: Georgi 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
2 parents 54be6c6 + 5464e7a commit 51c1610

File tree

4 files changed

+4
-1
lines changed

4 files changed

+4
-1
lines changed

drivers/interconnect/qcom/sc8180x.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1372,6 +1372,7 @@ static struct qcom_icc_bcm bcm_mm0 = {
13721372

13731373
static struct qcom_icc_bcm bcm_co0 = {
13741374
.name = "CO0",
1375+
.keepalive = true,
13751376
.num_nodes = 1,
13761377
.nodes = { &slv_qns_cdsp_mem_noc }
13771378
};

drivers/interconnect/qcom/sm8550.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2223,6 +2223,7 @@ static struct platform_driver qnoc_driver = {
22232223
.driver = {
22242224
.name = "qnoc-sm8550",
22252225
.of_match_table = qnoc_of_match,
2226+
.sync_state = icc_sync_state,
22262227
},
22272228
};
22282229

drivers/interconnect/qcom/sm8650.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1160,7 +1160,7 @@ static struct qcom_icc_node qns_gemnoc_sf = {
11601160

11611161
static struct qcom_icc_bcm bcm_acv = {
11621162
.name = "ACV",
1163-
.enable_mask = BIT(3),
1163+
.enable_mask = BIT(0),
11641164
.num_nodes = 1,
11651165
.nodes = { &ebi },
11661166
};

drivers/interconnect/qcom/x1e80100.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1586,6 +1586,7 @@ static struct qcom_icc_node qns_pcie_south_gem_noc_pcie = {
15861586

15871587
static struct qcom_icc_bcm bcm_acv = {
15881588
.name = "ACV",
1589+
.enable_mask = BIT(3),
15891590
.num_nodes = 1,
15901591
.nodes = { &ebi },
15911592
};

0 commit comments

Comments
 (0)