Commit 549985ee authored by Richard Cochran's avatar Richard Cochran Committed by David S. Miller

cpsw: simplify the setup of the register pointers

Instead of having a host of different register offsets in the device tree,
this patch simplifies the CPSW code by letting the driver set the proper
register offsets automatically, based on the CPSW version.
Signed-off-by: default avatarRichard Cochran <richardcochran@gmail.com>
Signed-off-by: default avatarMugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1fb19aa7
...@@ -9,15 +9,7 @@ Required properties: ...@@ -9,15 +9,7 @@ Required properties:
number number
- interrupt-parent : The parent interrupt controller - interrupt-parent : The parent interrupt controller
- cpdma_channels : Specifies number of channels in CPDMA - cpdma_channels : Specifies number of channels in CPDMA
- host_port_no : Specifies host port shift
- cpdma_reg_ofs : Specifies CPDMA submodule register offset
- cpdma_sram_ofs : Specifies CPDMA SRAM offset
- ale_reg_ofs : Specifies ALE submodule register offset
- ale_entries : Specifies No of entries ALE can hold - ale_entries : Specifies No of entries ALE can hold
- host_port_reg_ofs : Specifies host port register offset
- hw_stats_reg_ofs : Specifies hardware statistics register offset
- cpts_reg_ofs : Specifies the offset of the CPTS registers
- bd_ram_ofs : Specifies internal desciptor RAM offset
- bd_ram_size : Specifies internal descriptor RAM size - bd_ram_size : Specifies internal descriptor RAM size
- rx_descs : Specifies number of Rx descriptors - rx_descs : Specifies number of Rx descriptors
- mac_control : Specifies Default MAC control register content - mac_control : Specifies Default MAC control register content
...@@ -26,8 +18,6 @@ Required properties: ...@@ -26,8 +18,6 @@ Required properties:
- cpts_active_slave : Specifies the slave to use for time stamping - cpts_active_slave : Specifies the slave to use for time stamping
- cpts_clock_mult : Numerator to convert input clock ticks into nanoseconds - cpts_clock_mult : Numerator to convert input clock ticks into nanoseconds
- cpts_clock_shift : Denominator to convert input clock ticks into nanoseconds - cpts_clock_shift : Denominator to convert input clock ticks into nanoseconds
- slave_reg_ofs : Specifies slave register offset
- sliver_reg_ofs : Specifies slave sliver register offset
- phy_id : Specifies slave phy id - phy_id : Specifies slave phy id
- mac-address : Specifies slave MAC address - mac-address : Specifies slave MAC address
...@@ -49,15 +39,7 @@ Examples: ...@@ -49,15 +39,7 @@ Examples:
interrupts = <55 0x4>; interrupts = <55 0x4>;
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
cpdma_channels = <8>; cpdma_channels = <8>;
host_port_no = <0>;
cpdma_reg_ofs = <0x800>;
cpdma_sram_ofs = <0xa00>;
ale_reg_ofs = <0xd00>;
ale_entries = <1024>; ale_entries = <1024>;
host_port_reg_ofs = <0x108>;
hw_stats_reg_ofs = <0x900>;
cpts_reg_ofs = <0xc00>;
bd_ram_ofs = <0x2000>;
bd_ram_size = <0x2000>; bd_ram_size = <0x2000>;
no_bd_ram = <0>; no_bd_ram = <0>;
rx_descs = <64>; rx_descs = <64>;
...@@ -67,16 +49,12 @@ Examples: ...@@ -67,16 +49,12 @@ Examples:
cpts_clock_mult = <0x80000000>; cpts_clock_mult = <0x80000000>;
cpts_clock_shift = <29>; cpts_clock_shift = <29>;
cpsw_emac0: slave@0 { cpsw_emac0: slave@0 {
slave_reg_ofs = <0x200>; phy_id = <&davinci_mdio>, <0>;
sliver_reg_ofs = <0xd80>;
phy_id = "davinci_mdio.16:00";
/* Filled in by U-Boot */ /* Filled in by U-Boot */
mac-address = [ 00 00 00 00 00 00 ]; mac-address = [ 00 00 00 00 00 00 ];
}; };
cpsw_emac1: slave@1 { cpsw_emac1: slave@1 {
slave_reg_ofs = <0x300>; phy_id = <&davinci_mdio>, <1>;
sliver_reg_ofs = <0xdc0>;
phy_id = "davinci_mdio.16:01";
/* Filled in by U-Boot */ /* Filled in by U-Boot */
mac-address = [ 00 00 00 00 00 00 ]; mac-address = [ 00 00 00 00 00 00 ];
}; };
...@@ -87,15 +65,7 @@ Examples: ...@@ -87,15 +65,7 @@ Examples:
compatible = "ti,cpsw"; compatible = "ti,cpsw";
ti,hwmods = "cpgmac0"; ti,hwmods = "cpgmac0";
cpdma_channels = <8>; cpdma_channels = <8>;
host_port_no = <0>;
cpdma_reg_ofs = <0x800>;
cpdma_sram_ofs = <0xa00>;
ale_reg_ofs = <0xd00>;
ale_entries = <1024>; ale_entries = <1024>;
host_port_reg_ofs = <0x108>;
hw_stats_reg_ofs = <0x900>;
cpts_reg_ofs = <0xc00>;
bd_ram_ofs = <0x2000>;
bd_ram_size = <0x2000>; bd_ram_size = <0x2000>;
no_bd_ram = <0>; no_bd_ram = <0>;
rx_descs = <64>; rx_descs = <64>;
...@@ -105,16 +75,12 @@ Examples: ...@@ -105,16 +75,12 @@ Examples:
cpts_clock_mult = <0x80000000>; cpts_clock_mult = <0x80000000>;
cpts_clock_shift = <29>; cpts_clock_shift = <29>;
cpsw_emac0: slave@0 { cpsw_emac0: slave@0 {
slave_reg_ofs = <0x200>; phy_id = <&davinci_mdio>, <0>;
sliver_reg_ofs = <0xd80>;
phy_id = "davinci_mdio.16:00";
/* Filled in by U-Boot */ /* Filled in by U-Boot */
mac-address = [ 00 00 00 00 00 00 ]; mac-address = [ 00 00 00 00 00 00 ];
}; };
cpsw_emac1: slave@1 { cpsw_emac1: slave@1 {
slave_reg_ofs = <0x300>; phy_id = <&davinci_mdio>, <1>;
sliver_reg_ofs = <0xdc0>;
phy_id = "davinci_mdio.16:01";
/* Filled in by U-Boot */ /* Filled in by U-Boot */
mac-address = [ 00 00 00 00 00 00 ]; mac-address = [ 00 00 00 00 00 00 ];
}; };
......
This diff is collapsed.
...@@ -18,9 +18,7 @@ ...@@ -18,9 +18,7 @@
#include <linux/if_ether.h> #include <linux/if_ether.h>
struct cpsw_slave_data { struct cpsw_slave_data {
u32 slave_reg_ofs; char phy_id[MII_BUS_ID_SIZE];
u32 sliver_reg_ofs;
const char *phy_id;
int phy_if; int phy_if;
u8 mac_addr[ETH_ALEN]; u8 mac_addr[ETH_ALEN];
}; };
...@@ -28,31 +26,14 @@ struct cpsw_slave_data { ...@@ -28,31 +26,14 @@ struct cpsw_slave_data {
struct cpsw_platform_data { struct cpsw_platform_data {
u32 ss_reg_ofs; /* Subsystem control register offset */ u32 ss_reg_ofs; /* Subsystem control register offset */
u32 channels; /* number of cpdma channels (symmetric) */ u32 channels; /* number of cpdma channels (symmetric) */
u32 cpdma_reg_ofs; /* cpdma register offset */
u32 cpdma_sram_ofs; /* cpdma sram offset */
u32 slaves; /* number of slave cpgmac ports */ u32 slaves; /* number of slave cpgmac ports */
struct cpsw_slave_data *slave_data; struct cpsw_slave_data *slave_data;
u32 cpts_active_slave; /* time stamping slave */ u32 cpts_active_slave; /* time stamping slave */
u32 cpts_clock_mult; /* convert input clock ticks to nanoseconds */ u32 cpts_clock_mult; /* convert input clock ticks to nanoseconds */
u32 cpts_clock_shift; /* convert input clock ticks to nanoseconds */ u32 cpts_clock_shift; /* convert input clock ticks to nanoseconds */
u32 ale_reg_ofs; /* address lookup engine reg offset */
u32 ale_entries; /* ale table size */ u32 ale_entries; /* ale table size */
u32 host_port_reg_ofs; /* cpsw cpdma host port registers */
u32 host_port_num; /* The port number for the host port */
u32 hw_stats_reg_ofs; /* cpsw hardware statistics counters */
u32 cpts_reg_ofs; /* cpts registers */
u32 bd_ram_ofs; /* embedded buffer descriptor RAM offset*/
u32 bd_ram_size; /*buffer descriptor ram size */ u32 bd_ram_size; /*buffer descriptor ram size */
u32 hw_ram_addr; /*if the HW address for BD RAM is different */
bool no_bd_ram; /* no embedded BD ram*/
u32 rx_descs; /* Number of Rx Descriptios */ u32 rx_descs; /* Number of Rx Descriptios */
u32 mac_control; /* Mac control register */ u32 mac_control; /* Mac control register */
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment