| .. | .. |
|---|
| 109 | 109 | reg = <0 0x80000000 0 0x40000000>; |
|---|
| 110 | 110 | }; |
|---|
| 111 | 111 | |
|---|
| 112 | + reserved-memory { |
|---|
| 113 | + #address-cells = <2>; |
|---|
| 114 | + #size-cells = <2>; |
|---|
| 115 | + ranges; |
|---|
| 116 | + |
|---|
| 117 | + /* Chipselect 2 is physically at 0x18000000 */ |
|---|
| 118 | + vram: vram@18000000 { |
|---|
| 119 | + /* 8 MB of designated video RAM */ |
|---|
| 120 | + compatible = "shared-dma-pool"; |
|---|
| 121 | + reg = <0 0x18000000 0 0x00800000>; |
|---|
| 122 | + no-map; |
|---|
| 123 | + }; |
|---|
| 124 | + }; |
|---|
| 125 | + |
|---|
| 112 | 126 | wdt@2a490000 { |
|---|
| 113 | 127 | compatible = "arm,sp805", "arm,primecell"; |
|---|
| 114 | 128 | reg = <0 0x2a490000 0 0x1000>; |
|---|
| 115 | 129 | interrupts = <0 98 4>; |
|---|
| 116 | 130 | clocks = <&oscclk6a>, <&oscclk6a>; |
|---|
| 117 | | - clock-names = "wdogclk", "apb_pclk"; |
|---|
| 131 | + clock-names = "wdog_clk", "apb_pclk"; |
|---|
| 118 | 132 | }; |
|---|
| 119 | 133 | |
|---|
| 120 | 134 | hdlcd@2b000000 { |
|---|
| .. | .. |
|---|
| 398 | 412 | |
|---|
| 399 | 413 | clocks = <&oscclk6a>; |
|---|
| 400 | 414 | clock-names = "apb_pclk"; |
|---|
| 401 | | - port { |
|---|
| 402 | | - etb_in_port: endpoint { |
|---|
| 403 | | - slave-mode; |
|---|
| 404 | | - remote-endpoint = <&replicator_out_port0>; |
|---|
| 415 | + in-ports { |
|---|
| 416 | + port { |
|---|
| 417 | + etb_in_port: endpoint { |
|---|
| 418 | + remote-endpoint = <&replicator_out_port0>; |
|---|
| 419 | + }; |
|---|
| 405 | 420 | }; |
|---|
| 406 | 421 | }; |
|---|
| 407 | 422 | }; |
|---|
| .. | .. |
|---|
| 412 | 427 | |
|---|
| 413 | 428 | clocks = <&oscclk6a>; |
|---|
| 414 | 429 | clock-names = "apb_pclk"; |
|---|
| 415 | | - port { |
|---|
| 416 | | - tpiu_in_port: endpoint { |
|---|
| 417 | | - slave-mode; |
|---|
| 418 | | - remote-endpoint = <&replicator_out_port1>; |
|---|
| 430 | + in-ports { |
|---|
| 431 | + port { |
|---|
| 432 | + tpiu_in_port: endpoint { |
|---|
| 433 | + remote-endpoint = <&replicator_out_port1>; |
|---|
| 434 | + }; |
|---|
| 419 | 435 | }; |
|---|
| 420 | 436 | }; |
|---|
| 421 | 437 | }; |
|---|
| .. | .. |
|---|
| 424 | 440 | /* non-configurable replicators don't show up on the |
|---|
| 425 | 441 | * AMBA bus. As such no need to add "arm,primecell". |
|---|
| 426 | 442 | */ |
|---|
| 427 | | - compatible = "arm,coresight-replicator"; |
|---|
| 443 | + compatible = "arm,coresight-static-replicator"; |
|---|
| 428 | 444 | |
|---|
| 429 | | - ports { |
|---|
| 445 | + out-ports { |
|---|
| 430 | 446 | #address-cells = <1>; |
|---|
| 431 | 447 | #size-cells = <0>; |
|---|
| 432 | 448 | |
|---|
| 433 | | - /* replicator output ports */ |
|---|
| 434 | 449 | port@0 { |
|---|
| 435 | 450 | reg = <0>; |
|---|
| 436 | 451 | replicator_out_port0: endpoint { |
|---|
| .. | .. |
|---|
| 444 | 459 | remote-endpoint = <&tpiu_in_port>; |
|---|
| 445 | 460 | }; |
|---|
| 446 | 461 | }; |
|---|
| 462 | + }; |
|---|
| 447 | 463 | |
|---|
| 448 | | - /* replicator input port */ |
|---|
| 449 | | - port@2 { |
|---|
| 450 | | - reg = <0>; |
|---|
| 464 | + in-ports { |
|---|
| 465 | + port { |
|---|
| 451 | 466 | replicator_in_port0: endpoint { |
|---|
| 452 | | - slave-mode; |
|---|
| 453 | 467 | remote-endpoint = <&funnel_out_port0>; |
|---|
| 454 | 468 | }; |
|---|
| 455 | 469 | }; |
|---|
| .. | .. |
|---|
| 457 | 471 | }; |
|---|
| 458 | 472 | |
|---|
| 459 | 473 | funnel@20040000 { |
|---|
| 460 | | - compatible = "arm,coresight-funnel", "arm,primecell"; |
|---|
| 474 | + compatible = "arm,coresight-dynamic-funnel", "arm,primecell"; |
|---|
| 461 | 475 | reg = <0 0x20040000 0 0x1000>; |
|---|
| 462 | 476 | |
|---|
| 463 | 477 | clocks = <&oscclk6a>; |
|---|
| 464 | 478 | clock-names = "apb_pclk"; |
|---|
| 465 | | - ports { |
|---|
| 466 | | - #address-cells = <1>; |
|---|
| 467 | | - #size-cells = <0>; |
|---|
| 468 | | - |
|---|
| 469 | | - /* funnel output port */ |
|---|
| 470 | | - port@0 { |
|---|
| 471 | | - reg = <0>; |
|---|
| 479 | + out-ports { |
|---|
| 480 | + port { |
|---|
| 472 | 481 | funnel_out_port0: endpoint { |
|---|
| 473 | 482 | remote-endpoint = |
|---|
| 474 | 483 | <&replicator_in_port0>; |
|---|
| 475 | 484 | }; |
|---|
| 476 | 485 | }; |
|---|
| 486 | + }; |
|---|
| 477 | 487 | |
|---|
| 478 | | - /* funnel input ports */ |
|---|
| 479 | | - port@1 { |
|---|
| 488 | + in-ports { |
|---|
| 489 | + #address-cells = <1>; |
|---|
| 490 | + #size-cells = <0>; |
|---|
| 491 | + |
|---|
| 492 | + port@0 { |
|---|
| 480 | 493 | reg = <0>; |
|---|
| 481 | 494 | funnel_in_port0: endpoint { |
|---|
| 482 | | - slave-mode; |
|---|
| 483 | 495 | remote-endpoint = <&ptm0_out_port>; |
|---|
| 484 | 496 | }; |
|---|
| 485 | 497 | }; |
|---|
| 486 | 498 | |
|---|
| 487 | | - port@2 { |
|---|
| 499 | + port@1 { |
|---|
| 488 | 500 | reg = <1>; |
|---|
| 489 | 501 | funnel_in_port1: endpoint { |
|---|
| 490 | | - slave-mode; |
|---|
| 491 | 502 | remote-endpoint = <&ptm1_out_port>; |
|---|
| 492 | 503 | }; |
|---|
| 493 | 504 | }; |
|---|
| 494 | 505 | |
|---|
| 495 | | - port@3 { |
|---|
| 506 | + port@2 { |
|---|
| 496 | 507 | reg = <2>; |
|---|
| 497 | 508 | funnel_in_port2: endpoint { |
|---|
| 498 | | - slave-mode; |
|---|
| 499 | 509 | remote-endpoint = <&etm0_out_port>; |
|---|
| 500 | 510 | }; |
|---|
| 501 | 511 | }; |
|---|
| .. | .. |
|---|
| 505 | 515 | port@4 { |
|---|
| 506 | 516 | reg = <4>; |
|---|
| 507 | 517 | funnel_in_port4: endpoint { |
|---|
| 508 | | - slave-mode; |
|---|
| 509 | 518 | remote-endpoint = <&etm1_out_port>; |
|---|
| 510 | 519 | }; |
|---|
| 511 | 520 | }; |
|---|
| .. | .. |
|---|
| 513 | 522 | port@5 { |
|---|
| 514 | 523 | reg = <5>; |
|---|
| 515 | 524 | funnel_in_port5: endpoint { |
|---|
| 516 | | - slave-mode; |
|---|
| 517 | 525 | remote-endpoint = <&etm2_out_port>; |
|---|
| 518 | 526 | }; |
|---|
| 519 | 527 | }; |
|---|
| .. | .. |
|---|
| 527 | 535 | cpu = <&cpu0>; |
|---|
| 528 | 536 | clocks = <&oscclk6a>; |
|---|
| 529 | 537 | clock-names = "apb_pclk"; |
|---|
| 530 | | - port { |
|---|
| 531 | | - ptm0_out_port: endpoint { |
|---|
| 532 | | - remote-endpoint = <&funnel_in_port0>; |
|---|
| 538 | + out-ports { |
|---|
| 539 | + port { |
|---|
| 540 | + ptm0_out_port: endpoint { |
|---|
| 541 | + remote-endpoint = <&funnel_in_port0>; |
|---|
| 542 | + }; |
|---|
| 533 | 543 | }; |
|---|
| 534 | 544 | }; |
|---|
| 535 | 545 | }; |
|---|
| .. | .. |
|---|
| 541 | 551 | cpu = <&cpu1>; |
|---|
| 542 | 552 | clocks = <&oscclk6a>; |
|---|
| 543 | 553 | clock-names = "apb_pclk"; |
|---|
| 544 | | - port { |
|---|
| 545 | | - ptm1_out_port: endpoint { |
|---|
| 546 | | - remote-endpoint = <&funnel_in_port1>; |
|---|
| 554 | + out-ports { |
|---|
| 555 | + port { |
|---|
| 556 | + ptm1_out_port: endpoint { |
|---|
| 557 | + remote-endpoint = <&funnel_in_port1>; |
|---|
| 558 | + }; |
|---|
| 547 | 559 | }; |
|---|
| 548 | 560 | }; |
|---|
| 549 | 561 | }; |
|---|
| .. | .. |
|---|
| 555 | 567 | cpu = <&cpu2>; |
|---|
| 556 | 568 | clocks = <&oscclk6a>; |
|---|
| 557 | 569 | clock-names = "apb_pclk"; |
|---|
| 558 | | - port { |
|---|
| 559 | | - etm0_out_port: endpoint { |
|---|
| 560 | | - remote-endpoint = <&funnel_in_port2>; |
|---|
| 570 | + out-ports { |
|---|
| 571 | + port { |
|---|
| 572 | + etm0_out_port: endpoint { |
|---|
| 573 | + remote-endpoint = <&funnel_in_port2>; |
|---|
| 574 | + }; |
|---|
| 561 | 575 | }; |
|---|
| 562 | 576 | }; |
|---|
| 563 | 577 | }; |
|---|
| .. | .. |
|---|
| 569 | 583 | cpu = <&cpu3>; |
|---|
| 570 | 584 | clocks = <&oscclk6a>; |
|---|
| 571 | 585 | clock-names = "apb_pclk"; |
|---|
| 572 | | - port { |
|---|
| 573 | | - etm1_out_port: endpoint { |
|---|
| 574 | | - remote-endpoint = <&funnel_in_port4>; |
|---|
| 586 | + out-ports { |
|---|
| 587 | + port { |
|---|
| 588 | + etm1_out_port: endpoint { |
|---|
| 589 | + remote-endpoint = <&funnel_in_port4>; |
|---|
| 590 | + }; |
|---|
| 575 | 591 | }; |
|---|
| 576 | 592 | }; |
|---|
| 577 | 593 | }; |
|---|
| .. | .. |
|---|
| 583 | 599 | cpu = <&cpu4>; |
|---|
| 584 | 600 | clocks = <&oscclk6a>; |
|---|
| 585 | 601 | clock-names = "apb_pclk"; |
|---|
| 586 | | - port { |
|---|
| 587 | | - etm2_out_port: endpoint { |
|---|
| 588 | | - remote-endpoint = <&funnel_in_port5>; |
|---|
| 602 | + out-ports { |
|---|
| 603 | + port { |
|---|
| 604 | + etm2_out_port: endpoint { |
|---|
| 605 | + remote-endpoint = <&funnel_in_port5>; |
|---|
| 606 | + }; |
|---|
| 589 | 607 | }; |
|---|
| 590 | 608 | }; |
|---|
| 591 | 609 | }; |
|---|
| 592 | 610 | |
|---|
| 593 | | - smb: smb@8000000 { |
|---|
| 611 | + smb: bus@8000000 { |
|---|
| 594 | 612 | compatible = "simple-bus"; |
|---|
| 595 | 613 | |
|---|
| 596 | 614 | #address-cells = <2>; |
|---|
| .. | .. |
|---|
| 662 | 680 | <0 3 &gic 0 39 4>; |
|---|
| 663 | 681 | }; |
|---|
| 664 | 682 | }; |
|---|
| 683 | + |
|---|
| 684 | +&nor_flash { |
|---|
| 685 | + /* |
|---|
| 686 | + * Unfortunately, accessing the flash disturbs the CPU idle states |
|---|
| 687 | + * (suspend) and CPU hotplug of this platform. For this reason, flash |
|---|
| 688 | + * hardware access is disabled by default on this platform alone. |
|---|
| 689 | + */ |
|---|
| 690 | + status = "disabled"; |
|---|
| 691 | +}; |
|---|