aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMurali Karicheri2015-01-22 09:51:35 -0600
committerMurali Karicheri2015-01-22 09:51:35 -0600
commitbb7341f021f0a3f76cd62e4c351dee4efb81ab9e (patch)
treea2721b9823f189717684edfb2aca87af6fa0a3d3
parent862a194b330b1bef82c542ecfd1a0e50cedc3870 (diff)
parent03d441b8102abfd5c89d9a265538f498594484a9 (diff)
downloadlinux-bb7341f021f0a3f76cd62e4c351dee4efb81ab9e.tar.gz
linux-bb7341f021f0a3f76cd62e4c351dee4efb81ab9e.tar.xz
linux-bb7341f021f0a3f76cd62e4c351dee4efb81ab9e.zip
Merge branch 'v3.10.61/rebuild/24-drivers-net' into v3.10.61/master
-rw-r--r--drivers/net/ethernet/ti/cpsw_ale.c3
-rw-r--r--drivers/net/ethernet/ti/keystone_pa2.c10
2 files changed, 8 insertions, 5 deletions
diff --git a/drivers/net/ethernet/ti/cpsw_ale.c b/drivers/net/ethernet/ti/cpsw_ale.c
index 172c024631c..b0c4292ef90 100644
--- a/drivers/net/ethernet/ti/cpsw_ale.c
+++ b/drivers/net/ethernet/ti/cpsw_ale.c
@@ -1570,14 +1570,17 @@ void cpsw_ale_start(struct cpsw_ale *ale)
1570 cpsw_ale_control_set(ale, i, ALE_PORT_STATE, ALE_PORT_STATE_DISABLE); 1570 cpsw_ale_control_set(ale, i, ALE_PORT_STATE, ALE_PORT_STATE_DISABLE);
1571 1571
1572 ale->ale_control_attr = dev_attr_ale_control; 1572 ale->ale_control_attr = dev_attr_ale_control;
1573 sysfs_attr_init(&ale->ale_control_attr.attr);
1573 ret = device_create_file(ale->params.dev, &ale->ale_control_attr); 1574 ret = device_create_file(ale->params.dev, &ale->ale_control_attr);
1574 WARN_ON(ret < 0); 1575 WARN_ON(ret < 0);
1575 1576
1576 ale->ale_table_attr = dev_attr_ale_table; 1577 ale->ale_table_attr = dev_attr_ale_table;
1578 sysfs_attr_init(&ale->ale_table_attr.attr);
1577 ret = device_create_file(ale->params.dev, &ale->ale_table_attr); 1579 ret = device_create_file(ale->params.dev, &ale->ale_table_attr);
1578 WARN_ON(ret < 0); 1580 WARN_ON(ret < 0);
1579 1581
1580 ale->ale_table_raw_attr = dev_attr_ale_table_raw; 1582 ale->ale_table_raw_attr = dev_attr_ale_table_raw;
1583 sysfs_attr_init(&ale->ale_table_raw_attr.attr);
1581 ret = device_create_file(ale->params.dev, &ale->ale_table_raw_attr); 1584 ret = device_create_file(ale->params.dev, &ale->ale_table_raw_attr);
1582 WARN_ON(ret < 0); 1585 WARN_ON(ret < 0);
1583 1586
diff --git a/drivers/net/ethernet/ti/keystone_pa2.c b/drivers/net/ethernet/ti/keystone_pa2.c
index d6be68cce76..aa9ac5ec2c0 100644
--- a/drivers/net/ethernet/ti/keystone_pa2.c
+++ b/drivers/net/ethernet/ti/keystone_pa2.c
@@ -647,7 +647,7 @@ static const u32 pa2_pdsp_const_reg_map[PA2_NUM_PDSPS][PA2_PDSP_CONST_NUM_REG] \
647 0x00000000, /* C22: Reserved */ 647 0x00000000, /* C22: Reserved */
648 0xFFF81F00, /* C23: PDSP Info */ 648 0xFFF81F00, /* C23: PDSP Info */
649 0xFFF80A00, /* C24: Temporary Buffer */ 649 0xFFF80A00, /* C24: Temporary Buffer */
650 0xFFF80280, /* C25: User Stats CB and FIFO 650 0xFF980280, /* C25: User Stats CB and FIFO
651 (Global address of Post cluster) */ 651 (Global address of Post cluster) */
652 0xFF020400, /* C26: Eflow Exception route */ 652 0xFF020400, /* C26: Eflow Exception route */
653 0x00000000, /* C27: Reserved*/ 653 0x00000000, /* C27: Reserved*/
@@ -683,7 +683,7 @@ static const u32 pa2_pdsp_const_reg_map[PA2_NUM_PDSPS][PA2_PDSP_CONST_NUM_REG] \
683 0x00000000, /* C22: Reserved */ 683 0x00000000, /* C22: Reserved */
684 0xFFF81F20, /* C23: PDSP Info */ 684 0xFFF81F20, /* C23: PDSP Info */
685 0xFFF80A00, /* C24: Temporary Buffer */ 685 0xFFF80A00, /* C24: Temporary Buffer */
686 0xFFF802C0, /* C25: User Stats CB and FIFO 686 0xFF9802C0, /* C25: User Stats CB and FIFO
687 (Global address of Post cluster) */ 687 (Global address of Post cluster) */
688 0xFF020400, /* C26: Eflow Exception route */ 688 0xFF020400, /* C26: Eflow Exception route */
689 0xFFF80800, /* C27: Command Buffer */ 689 0xFFF80800, /* C27: Command Buffer */
@@ -719,7 +719,7 @@ static const u32 pa2_pdsp_const_reg_map[PA2_NUM_PDSPS][PA2_PDSP_CONST_NUM_REG] \
719 0x00000000, /* C22: Reserved */ 719 0x00000000, /* C22: Reserved */
720 0xFFF81F40, /* C23: PDSP Info */ 720 0xFFF81F40, /* C23: PDSP Info */
721 0xFFF80A00, /* C24: Temporary Buffer */ 721 0xFFF80A00, /* C24: Temporary Buffer */
722 0xFFF80300, /* C25: User Stats CB and FIFO 722 0xFF980300, /* C25: User Stats CB and FIFO
723 (Global address of Post cluster) */ 723 (Global address of Post cluster) */
724 0xFF020400, /* C26: Eflow Exception route */ 724 0xFF020400, /* C26: Eflow Exception route */
725 0xFFF80900, /* C27: Command Buffer */ 725 0xFFF80900, /* C27: Command Buffer */
@@ -755,7 +755,7 @@ static const u32 pa2_pdsp_const_reg_map[PA2_NUM_PDSPS][PA2_PDSP_CONST_NUM_REG] \
755 0x00000000, /* C22: Reserved */ 755 0x00000000, /* C22: Reserved */
756 0xFFF80F00, /* C23: PDSP Info */ 756 0xFFF80F00, /* C23: PDSP Info */
757 0xFFF80A00, /* C24: Temporary Buffer */ 757 0xFFF80A00, /* C24: Temporary Buffer */
758 0xFFF80340, /* C25: User Stats CB and FIFO 758 0xFF980340, /* C25: User Stats CB and FIFO
759 (Global address of Post cluster) */ 759 (Global address of Post cluster) */
760 0xFF020400, /* C26: Eflow Exception route */ 760 0xFF020400, /* C26: Eflow Exception route */
761 0xFFF80800, /* C27: Command Buffer */ 761 0xFFF80800, /* C27: Command Buffer */
@@ -791,7 +791,7 @@ static const u32 pa2_pdsp_const_reg_map[PA2_NUM_PDSPS][PA2_PDSP_CONST_NUM_REG] \
791 0x00000000, /* C22: Reserved */ 791 0x00000000, /* C22: Reserved */
792 0xFFF80F00, /* C23: PDSP Info */ 792 0xFFF80F00, /* C23: PDSP Info */
793 0xFFF80A00, /* C24: Temporary Buffer */ 793 0xFFF80A00, /* C24: Temporary Buffer */
794 0xFFF80380, /* C25: User Stats CB and FIFO 794 0xFF980380, /* C25: User Stats CB and FIFO
795 (Global address of Post cluster) */ 795 (Global address of Post cluster) */
796 0xFF020400, /* C26: Eflow Exception route */ 796 0xFF020400, /* C26: Eflow Exception route */
797 0xFFF80800, /* C27: Command Buffer */ 797 0xFFF80800, /* C27: Command Buffer */