[PATCH RFC 3/7] cpsw: correct the CPSW_PORT register bank declaration
flat view
STALE5116d
SUPERSEDED
From: richardcochran@gmail.com (Richard Cochran)
Date: 2012-10-11 20:27:18
Also in:
netdev
Subsystem:
networking drivers, open firmware and flattened device tree bindings, the rest, ti ethernet switch driver (cpsw) · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Linus Torvalds
Revision rfc of 2 in this series.
Revisions (2)
- rfc current
- v2 [diff vs current]
This commit corrects and expands the slave port register bank according to TI's Technical Reference Manual. Signed-off-by: Richard Cochran <richardcochran@gmail.com> --- Documentation/devicetree/bindings/net/cpsw.txt | 8 ++++---- drivers/net/ethernet/ti/cpsw.c | 14 +++++++++++++- 2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/Documentation/devicetree/bindings/net/cpsw.txt b/Documentation/devicetree/bindings/net/cpsw.txt
index dcaabe9..3af47b7 100644
--- a/Documentation/devicetree/bindings/net/cpsw.txt
+++ b/Documentation/devicetree/bindings/net/cpsw.txt@@ -59,14 +59,14 @@ Examples: mac_control = <0x20>; slaves = <2>; cpsw_emac0: slave at 0 { - slave_reg_ofs = <0x208>; + slave_reg_ofs = <0x200>; sliver_reg_ofs = <0xd80>; phy_id = "davinci_mdio.16:00"; /* Filled in by U-Boot */ mac-address = [ 00 00 00 00 00 00 ]; }; cpsw_emac1: slave at 1 { - slave_reg_ofs = <0x308>; + slave_reg_ofs = <0x300>; sliver_reg_ofs = <0xdc0>; phy_id = "davinci_mdio.16:01"; /* Filled in by U-Boot */
@@ -93,14 +93,14 @@ Examples: mac_control = <0x20>; slaves = <2>; cpsw_emac0: slave at 0 { - slave_reg_ofs = <0x208>; + slave_reg_ofs = <0x200>; sliver_reg_ofs = <0xd80>; phy_id = "davinci_mdio.16:00"; /* Filled in by U-Boot */ mac-address = [ 00 00 00 00 00 00 ]; }; cpsw_emac1: slave at 1 { - slave_reg_ofs = <0x308>; + slave_reg_ofs = <0x300>; sliver_reg_ofs = <0xdc0>; phy_id = "davinci_mdio.16:01"; /* Filled in by U-Boot */
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 24304e8..600699e 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c@@ -157,9 +157,11 @@ struct cpsw_ss_regs { }; struct cpsw_slave_regs { + u32 control; + u32 res1; u32 max_blks; u32 blk_cnt; - u32 flow_thresh; + u32 tx_in_ctl; u32 port_vlan; u32 tx_pri_map; u32 ts_ctl;
@@ -167,6 +169,16 @@ struct cpsw_slave_regs { u32 ts_vlan; u32 sa_lo; u32 sa_hi; + u32 send_percent; + u32 res2; + u32 rx_dscp_pri_map0; + u32 rx_dscp_pri_map1; + u32 rx_dscp_pri_map2; + u32 rx_dscp_pri_map3; + u32 rx_dscp_pri_map4; + u32 rx_dscp_pri_map5; + u32 rx_dscp_pri_map6; + u32 rx_dscp_pri_map7; }; struct cpsw_host_regs {
--
1.7.2.5