aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorReece R. Pollack2014-12-22 17:33:46 -0600
committerReece R. Pollack2014-12-22 17:33:46 -0600
commitdd0d7c472fc55021daff38f8ded6ba90ca7c83a8 (patch)
tree8445e85d00bd6725a5c5e7a7b09cd7aa2696229f /drivers/net
parent8f646c8ac4a6c845bc789b4f24f78a8910fb06ea (diff)
parent43f35e0ecebf989fa5aefcf4c9a90e712bec3550 (diff)
downloadlinux-dd0d7c472fc55021daff38f8ded6ba90ca7c83a8.tar.gz
linux-dd0d7c472fc55021daff38f8ded6ba90ca7c83a8.tar.xz
linux-dd0d7c472fc55021daff38f8ded6ba90ca7c83a8.zip
Merge branch 'master/rebuild/24-drivers-net' into master/master
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/ti/keystone_pa2.c25
1 files changed, 16 insertions, 9 deletions
diff --git a/drivers/net/ethernet/ti/keystone_pa2.c b/drivers/net/ethernet/ti/keystone_pa2.c
index 1fa2e4e3bfd..d6be68cce76 100644
--- a/drivers/net/ethernet/ti/keystone_pa2.c
+++ b/drivers/net/ethernet/ti/keystone_pa2.c
@@ -575,13 +575,14 @@ static const u32 pa2_pdsp_const_reg_map[PA2_NUM_PDSPS][PA2_PDSP_CONST_NUM_REG] \
575 0xFFF82900, /* C22: Split Context FIFO */ 575 0xFFF82900, /* C22: Split Context FIFO */
576 0xFFF83F00, /* C23: PDSP Info*/ 576 0xFFF83F00, /* C23: PDSP Info*/
577 0x00000000, /* C24: Reserved */ 577 0x00000000, /* C24: Reserved */
578 0x00000000, /* C25: Reserved */ 578 0xFFF80200, /* C25: User Stats CB and FIFO
579 (Global address of Post cluster) */
579 0x00000000, /* C26: Reserved*/ 580 0x00000000, /* C26: Reserved*/
580 0x00000000, /* C27: Reserved*/ 581 0x00000000, /* C27: Reserved*/
581 0xFF020500, /* C28: Port (Interface-based) configurations */ 582 0xFF020500, /* C28: Port (Interface-based) configurations */
582 0x00000000, /* C29: Reserved*/ 583 0x00000000, /* C29: Reserved*/
583 0x00000000, /* C30: Reserved*/ 584 0x00000000, /* C30: Reserved*/
584 0x00000000 /* C31: Reserved*/ 585 0x00000000 /* C31: Reserved*/
585 }, 586 },
586 /* Post PDSP1: Modifier */ 587 /* Post PDSP1: Modifier */
587 { 588 {
@@ -610,7 +611,8 @@ static const u32 pa2_pdsp_const_reg_map[PA2_NUM_PDSPS][PA2_PDSP_CONST_NUM_REG] \
610 0xFFF82900, /* C22: Split Context FIFO */ 611 0xFFF82900, /* C22: Split Context FIFO */
611 0xFFF83F20, /* C23: PDSP Info*/ 612 0xFFF83F20, /* C23: PDSP Info*/
612 0x00000000, /* C24: Reserved */ 613 0x00000000, /* C24: Reserved */
613 0x00000000, /* C25: Reserved */ 614 0xFFF80240, /* C25: User Stats CB and FIFO
615 (Global address of Post cluster) */
614 0x00000000, /* C26: Reserved*/ 616 0x00000000, /* C26: Reserved*/
615 0x00000000, /* C27: Reserved*/ 617 0x00000000, /* C27: Reserved*/
616 0xFF020500, /* C28: Port (Interface-based) configurations */ 618 0xFF020500, /* C28: Port (Interface-based) configurations */
@@ -645,7 +647,8 @@ static const u32 pa2_pdsp_const_reg_map[PA2_NUM_PDSPS][PA2_PDSP_CONST_NUM_REG] \
645 0x00000000, /* C22: Reserved */ 647 0x00000000, /* C22: Reserved */
646 0xFFF81F00, /* C23: PDSP Info */ 648 0xFFF81F00, /* C23: PDSP Info */
647 0xFFF80A00, /* C24: Temporary Buffer */ 649 0xFFF80A00, /* C24: Temporary Buffer */
648 0x00000000, /* C25: Reserved*/ 650 0xFFF80280, /* C25: User Stats CB and FIFO
651 (Global address of Post cluster) */
649 0xFF020400, /* C26: Eflow Exception route */ 652 0xFF020400, /* C26: Eflow Exception route */
650 0x00000000, /* C27: Reserved*/ 653 0x00000000, /* C27: Reserved*/
651 0xFF020500, /* C28: Port (Interface-based) configurations */ 654 0xFF020500, /* C28: Port (Interface-based) configurations */
@@ -680,7 +683,8 @@ static const u32 pa2_pdsp_const_reg_map[PA2_NUM_PDSPS][PA2_PDSP_CONST_NUM_REG] \
680 0x00000000, /* C22: Reserved */ 683 0x00000000, /* C22: Reserved */
681 0xFFF81F20, /* C23: PDSP Info */ 684 0xFFF81F20, /* C23: PDSP Info */
682 0xFFF80A00, /* C24: Temporary Buffer */ 685 0xFFF80A00, /* C24: Temporary Buffer */
683 0x00000000, /* C25: Reserved*/ 686 0xFFF802C0, /* C25: User Stats CB and FIFO
687 (Global address of Post cluster) */
684 0xFF020400, /* C26: Eflow Exception route */ 688 0xFF020400, /* C26: Eflow Exception route */
685 0xFFF80800, /* C27: Command Buffer */ 689 0xFFF80800, /* C27: Command Buffer */
686 0xFF020500, /* C28: Port (Interface-based) configurations */ 690 0xFF020500, /* C28: Port (Interface-based) configurations */
@@ -715,7 +719,8 @@ static const u32 pa2_pdsp_const_reg_map[PA2_NUM_PDSPS][PA2_PDSP_CONST_NUM_REG] \
715 0x00000000, /* C22: Reserved */ 719 0x00000000, /* C22: Reserved */
716 0xFFF81F40, /* C23: PDSP Info */ 720 0xFFF81F40, /* C23: PDSP Info */
717 0xFFF80A00, /* C24: Temporary Buffer */ 721 0xFFF80A00, /* C24: Temporary Buffer */
718 0x00000000, /* C25: Reserved*/ 722 0xFFF80300, /* C25: User Stats CB and FIFO
723 (Global address of Post cluster) */
719 0xFF020400, /* C26: Eflow Exception route */ 724 0xFF020400, /* C26: Eflow Exception route */
720 0xFFF80900, /* C27: Command Buffer */ 725 0xFFF80900, /* C27: Command Buffer */
721 0xFF020500, /* C28: Port (Interface-based) configurations */ 726 0xFF020500, /* C28: Port (Interface-based) configurations */
@@ -750,7 +755,8 @@ static const u32 pa2_pdsp_const_reg_map[PA2_NUM_PDSPS][PA2_PDSP_CONST_NUM_REG] \
750 0x00000000, /* C22: Reserved */ 755 0x00000000, /* C22: Reserved */
751 0xFFF80F00, /* C23: PDSP Info */ 756 0xFFF80F00, /* C23: PDSP Info */
752 0xFFF80A00, /* C24: Temporary Buffer */ 757 0xFFF80A00, /* C24: Temporary Buffer */
753 0x00000000, /* C25: Reserved*/ 758 0xFFF80340, /* C25: User Stats CB and FIFO
759 (Global address of Post cluster) */
754 0xFF020400, /* C26: Eflow Exception route */ 760 0xFF020400, /* C26: Eflow Exception route */
755 0xFFF80800, /* C27: Command Buffer */ 761 0xFFF80800, /* C27: Command Buffer */
756 0xFF020500, /* C28: Port (Interface-based) configurations */ 762 0xFF020500, /* C28: Port (Interface-based) configurations */
@@ -785,13 +791,14 @@ static const u32 pa2_pdsp_const_reg_map[PA2_NUM_PDSPS][PA2_PDSP_CONST_NUM_REG] \
785 0x00000000, /* C22: Reserved */ 791 0x00000000, /* C22: Reserved */
786 0xFFF80F00, /* C23: PDSP Info */ 792 0xFFF80F00, /* C23: PDSP Info */
787 0xFFF80A00, /* C24: Temporary Buffer */ 793 0xFFF80A00, /* C24: Temporary Buffer */
788 0x00000000, /* C25: Reserved*/ 794 0xFFF80380, /* C25: User Stats CB and FIFO
795 (Global address of Post cluster) */
789 0xFF020400, /* C26: Eflow Exception route */ 796 0xFF020400, /* C26: Eflow Exception route */
790 0xFFF80800, /* C27: Command Buffer */ 797 0xFFF80800, /* C27: Command Buffer */
791 0xFF020500, /* C28: Port (Interface-based) configurations */ 798 0xFF020500, /* C28: Port (Interface-based) configurations */
792 0x00000000, /* C29: Reserved*/ 799 0x00000000, /* C29: Reserved*/
793 0x00000000, /* C30: Reserved*/ 800 0x00000000, /* C30: Reserved*/
794 0x00000000 /* C31: Reserved*/ 801 0x00000000 /* C31: Reserved*/
795 } 802 }
796}; 803};
797 804
generated by cgit v1.2.3 (git 2.39.2)