Merge tag 'icc-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc into char-misc-next

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Georgi writes:

interconnect changes for 6.10

This pull request contains the interconnect changes for the 6.10-rc1 merge
window. It contains some small driver changes listed below:

Driver changes:
- Cleanup sm6115 QoS port numbering.
- Fix incorrect port value in qcm2290 driver.

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

* tag 'icc-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc:
interconnect: qcom: qcm2290: Fix mas_snoc_bimc QoS port assignment
interconnect: qcom: sm6115: Unspaghettify SNoC QoS port numbering

Greg Kroah-Hartman 2 years ago eacdd8e3 8003f00d

+19 -16

2 changed files

expand all

drivers

interconnect

qcom

qcm2290.c

sm6115.c

+1 -1

drivers/interconnect/qcom/qcm2290.c

··· 164 164 .name = "mas_snoc_bimc", 165 165 .buswidth = 16, 166 166 .qos.ap_owned = true, 167 - .qos.qos_port = 2, 167 + .qos.qos_port = 6, 168 168 .qos.qos_mode = NOC_QOS_MODE_BYPASS, 169 169 .mas_rpm_id = 164, 170 170 .slv_rpm_id = -1,

+18 -15

drivers/interconnect/qcom/sm6115.c

··· 242 242 .id = SM6115_MASTER_CRYPTO_CORE0, 243 243 .channels = 1, 244 244 .buswidth = 8, 245 - .qos.qos_port = 43, 245 + .qos.qos_port = 22, 246 246 .qos.qos_mode = NOC_QOS_MODE_FIXED, 247 247 .qos.areq_prio = 2, 248 248 .mas_rpm_id = 23, ··· 332 332 .id = SM6115_MASTER_CAMNOC_SF, 333 333 .channels = 1, 334 334 .buswidth = 32, 335 - .qos.qos_port = 25, 335 + .qos.qos_port = 4, 336 336 .qos.qos_mode = NOC_QOS_MODE_FIXED, 337 337 .qos.areq_prio = 3, 338 338 .mas_rpm_id = -1, ··· 346 346 .id = SM6115_MASTER_VIDEO_P0, 347 347 .channels = 1, 348 348 .buswidth = 16, 349 - .qos.qos_port = 30, 349 + .qos.qos_port = 9, 350 350 .qos.qos_mode = NOC_QOS_MODE_FIXED, 351 351 .qos.areq_prio = 3, 352 352 .qos.urg_fwd_en = true, ··· 361 361 .id = SM6115_MASTER_VIDEO_PROC, 362 362 .channels = 1, 363 363 .buswidth = 8, 364 - .qos.qos_port = 34, 364 + .qos.qos_port = 13, 365 365 .qos.qos_mode = NOC_QOS_MODE_FIXED, 366 366 .qos.areq_prio = 4, 367 367 .mas_rpm_id = -1, ··· 379 379 .id = SM6115_MASTER_CAMNOC_HF, 380 380 .channels = 1, 381 381 .buswidth = 32, 382 - .qos.qos_port = 31, 382 + .qos.qos_port = 10, 383 383 .qos.qos_mode = NOC_QOS_MODE_FIXED, 384 384 .qos.areq_prio = 3, 385 385 .qos.urg_fwd_en = true, ··· 394 394 .id = SM6115_MASTER_MDP_PORT0, 395 395 .channels = 1, 396 396 .buswidth = 16, 397 - .qos.qos_port = 26, 397 + .qos.qos_port = 5, 398 398 .qos.qos_mode = NOC_QOS_MODE_FIXED, 399 399 .qos.areq_prio = 3, 400 400 .qos.urg_fwd_en = true, ··· 434 434 .id = SM6115_MASTER_TIC, 435 435 .channels = 1, 436 436 .buswidth = 4, 437 - .qos.qos_port = 29, 437 + .qos.qos_port = 8, 438 438 .qos.qos_mode = NOC_QOS_MODE_FIXED, 439 439 .qos.areq_prio = 2, 440 440 .mas_rpm_id = -1, ··· 484 484 .id = SM6115_MASTER_PIMEM, 485 485 .channels = 1, 486 486 .buswidth = 8, 487 - .qos.qos_port = 41, 487 + .qos.qos_port = 20, 488 488 .qos.qos_mode = NOC_QOS_MODE_FIXED, 489 489 .qos.areq_prio = 2, 490 490 .mas_rpm_id = -1, ··· 498 498 .id = SM6115_MASTER_QDSS_BAM, 499 499 .channels = 1, 500 500 .buswidth = 4, 501 - .qos.qos_port = 23, 501 + .qos.qos_port = 2, 502 502 .qos.qos_mode = NOC_QOS_MODE_FIXED, 503 503 .qos.areq_prio = 2, 504 504 .mas_rpm_id = -1, ··· 523 523 .id = SM6115_MASTER_QUP_0, 524 524 .channels = 1, 525 525 .buswidth = 4, 526 - .qos.qos_port = 21, 526 + .qos.qos_port = 0, 527 527 .qos.qos_mode = NOC_QOS_MODE_FIXED, 528 528 .qos.areq_prio = 2, 529 529 .mas_rpm_id = 166, ··· 537 537 .id = SM6115_MASTER_IPA, 538 538 .channels = 1, 539 539 .buswidth = 8, 540 - .qos.qos_port = 24, 540 + .qos.qos_port = 3, 541 541 .qos.qos_mode = NOC_QOS_MODE_FIXED, 542 542 .qos.areq_prio = 2, 543 543 .mas_rpm_id = 59, ··· 551 551 .id = SM6115_MASTER_QDSS_ETR, 552 552 .channels = 1, 553 553 .buswidth = 8, 554 - .qos.qos_port = 33, 554 + .qos.qos_port = 12, 555 555 .qos.qos_mode = NOC_QOS_MODE_FIXED, 556 556 .qos.areq_prio = 2, 557 557 .mas_rpm_id = -1, ··· 565 565 .id = SM6115_MASTER_SDCC_1, 566 566 .channels = 1, 567 567 .buswidth = 8, 568 - .qos.qos_port = 38, 568 + .qos.qos_port = 17, 569 569 .qos.qos_mode = NOC_QOS_MODE_FIXED, 570 570 .qos.areq_prio = 2, 571 571 .mas_rpm_id = 33, ··· 579 579 .id = SM6115_MASTER_SDCC_2, 580 580 .channels = 1, 581 581 .buswidth = 8, 582 - .qos.qos_port = 44, 582 + .qos.qos_port = 23, 583 583 .qos.qos_mode = NOC_QOS_MODE_FIXED, 584 584 .qos.areq_prio = 2, 585 585 .mas_rpm_id = 35, ··· 593 593 .id = SM6115_MASTER_USB3, 594 594 .channels = 1, 595 595 .buswidth = 8, 596 - .qos.qos_port = 45, 596 + .qos.qos_port = 24, 597 597 .qos.qos_mode = NOC_QOS_MODE_FIXED, 598 598 .qos.areq_prio = 2, 599 599 .mas_rpm_id = -1, ··· 1336 1336 .intf_clocks = snoc_intf_clocks, 1337 1337 .num_intf_clocks = ARRAY_SIZE(snoc_intf_clocks), 1338 1338 .bus_clk_desc = &bus_2_clk, 1339 + .qos_offset = 0x15000, 1339 1340 .keep_alive = true, 1340 1341 }; 1341 1342 ··· 1368 1367 .regmap_cfg = &sys_noc_regmap_config, 1369 1368 .bus_clk_desc = &mmaxi_0_clk, 1370 1369 .keep_alive = true, 1370 + .qos_offset = 0x15000, 1371 1371 .ab_coeff = 142, 1372 1372 }; 1373 1373 ··· 1385 1383 .regmap_cfg = &sys_noc_regmap_config, 1386 1384 .bus_clk_desc = &mmaxi_1_clk, 1387 1385 .keep_alive = true, 1386 + .qos_offset = 0x15000, 1388 1387 .ab_coeff = 139, 1389 1388 }; 1390 1389