aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikhil Devshatwar2020-07-31 18:58:00 -0500
committerDave Gerlach2020-08-11 13:38:55 -0500
commitca3045bc8bab83ba8fb5072beff9212a9f92e0bf (patch)
tree7b890e70758e25b027edecdbc09017f0d73f0a0d
parent892a80d1a4001359fd51678cf7264fa23d4e2bbf (diff)
downloadk3-image-gen-ca3045bc8bab83ba8fb5072beff9212a9f92e0bf.tar.gz
k3-image-gen-ca3045bc8bab83ba8fb5072beff9212a9f92e0bf.tar.xz
k3-image-gen-ca3045bc8bab83ba8fb5072beff9212a9f92e0bf.zip
soc: j721e: rm-cfg: Reassign GPIO interrupt routers
Linux GPIO driver requests all the bank interrupts at the time of probe itself. J721e needs minimum of 11 interrupts for the Main GPIO instances and minimum of 6 interrups for the WKUP GPIO instances. Reassign the allocation to increase the counts for A72 hosts while removing them from unused C7X and R5 cores. Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com> Tested-by: Suman Anna <s-anna@ti.com>
-rw-r--r--soc/j721e/evm/rm-cfg.c40
-rw-r--r--soc/j721e/evm/sysfw_img_cfg.h2
2 files changed, 7 insertions, 35 deletions
diff --git a/soc/j721e/evm/rm-cfg.c b/soc/j721e/evm/rm-cfg.c
index 51adf73..1edea30 100644
--- a/soc/j721e/evm/rm-cfg.c
+++ b/soc/j721e/evm/rm-cfg.c
@@ -294,25 +294,18 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = {
294 }, 294 },
295 { 295 {
296 .start_resource = 40, 296 .start_resource = 40,
297 .num_resource = 16, 297 .num_resource = 12,
298 .type = RESASG_UTYPE (J721E_DEV_GPIOMUX_INTRTR0, 298 .type = RESASG_UTYPE (J721E_DEV_GPIOMUX_INTRTR0,
299 RESASG_SUBTYPE_IR_OUTPUT), 299 RESASG_SUBTYPE_IR_OUTPUT),
300 .host_id = HOST_ID_A72_2, 300 .host_id = HOST_ID_A72_2,
301 }, 301 },
302 { 302 {
303 .start_resource = 56, 303 .start_resource = 52,
304 .num_resource = 4, 304 .num_resource = 12,
305 .type = RESASG_UTYPE (J721E_DEV_GPIOMUX_INTRTR0, 305 .type = RESASG_UTYPE (J721E_DEV_GPIOMUX_INTRTR0,
306 RESASG_SUBTYPE_IR_OUTPUT), 306 RESASG_SUBTYPE_IR_OUTPUT),
307 .host_id = HOST_ID_A72_3, 307 .host_id = HOST_ID_A72_3,
308 }, 308 },
309 {
310 .start_resource = 60,
311 .num_resource = 4,
312 .type = RESASG_UTYPE (J721E_DEV_GPIOMUX_INTRTR0,
313 RESASG_SUBTYPE_IR_OUTPUT),
314 .host_id = HOST_ID_C7X_1,
315 },
316 /* Interrupt router for Main R5F Subsystem0 */ 309 /* Interrupt router for Main R5F Subsystem0 */
317 { 310 {
318 .start_resource = 0, 311 .start_resource = 0,
@@ -375,38 +368,17 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = {
375 }, 368 },
376 { 369 {
377 .start_resource = 16, 370 .start_resource = 16,
378 .num_resource = 4, 371 .num_resource = 6,
379 .type = RESASG_UTYPE (J721E_DEV_WKUP_GPIOMUX_INTRTR0, 372 .type = RESASG_UTYPE (J721E_DEV_WKUP_GPIOMUX_INTRTR0,
380 RESASG_SUBTYPE_IR_OUTPUT), 373 RESASG_SUBTYPE_IR_OUTPUT),
381 .host_id = HOST_ID_A72_2, 374 .host_id = HOST_ID_A72_2,
382 }, 375 },
383 { 376 {
384 .start_resource = 20,
385 .num_resource = 2,
386 .type = RESASG_UTYPE (J721E_DEV_WKUP_GPIOMUX_INTRTR0,
387 RESASG_SUBTYPE_IR_OUTPUT),
388 .host_id = HOST_ID_A72_3,
389 },
390 {
391 .start_resource = 22, 377 .start_resource = 22,
392 .num_resource = 2, 378 .num_resource = 6,
393 .type = RESASG_UTYPE (J721E_DEV_WKUP_GPIOMUX_INTRTR0,
394 RESASG_SUBTYPE_IR_OUTPUT),
395 .host_id = HOST_ID_MAIN_1_R5_0,
396 },
397 {
398 .start_resource = 24,
399 .num_resource = 2,
400 .type = RESASG_UTYPE (J721E_DEV_WKUP_GPIOMUX_INTRTR0,
401 RESASG_SUBTYPE_IR_OUTPUT),
402 .host_id = HOST_ID_MAIN_1_R5_2,
403 },
404 {
405 .start_resource = 26,
406 .num_resource = 2,
407 .type = RESASG_UTYPE (J721E_DEV_WKUP_GPIOMUX_INTRTR0, 379 .type = RESASG_UTYPE (J721E_DEV_WKUP_GPIOMUX_INTRTR0,
408 RESASG_SUBTYPE_IR_OUTPUT), 380 RESASG_SUBTYPE_IR_OUTPUT),
409 .host_id = HOST_ID_C7X_1, 381 .host_id = HOST_ID_A72_3,
410 }, 382 },
411 { 383 {
412 .start_resource = 28, 384 .start_resource = 28,
diff --git a/soc/j721e/evm/sysfw_img_cfg.h b/soc/j721e/evm/sysfw_img_cfg.h
index e539d98..bfd4e53 100644
--- a/soc/j721e/evm/sysfw_img_cfg.h
+++ b/soc/j721e/evm/sysfw_img_cfg.h
@@ -37,6 +37,6 @@
37#ifndef SYSFW_IMG_CFG_H 37#ifndef SYSFW_IMG_CFG_H
38#define SYSFW_IMG_CFG_H 38#define SYSFW_IMG_CFG_H
39 39
40#define BOARDCFG_RM_RESASG_ENTRIES 346 40#define BOARDCFG_RM_RESASG_ENTRIES 342
41 41
42#endif /* SYSFW_IMG_CFG_H */ 42#endif /* SYSFW_IMG_CFG_H */