diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-05-11 20:24:28 (GMT) |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-05-11 20:24:28 (GMT) |
| commit | cac423a730d3506154744485af1bbc1cd3a1e6a8 (patch) | |
| tree | 358b627972d9125de573c623f33e2da789f1de51 /drivers/net/cpsw.c | |
| parent | c1b43ac7699640c8086bd73faa798bc9722d32c9 (diff) | |
| parent | 47c6ea076eb51e624f8744d93db5cd70b97dc25d (diff) | |
| download | u-boot-cac423a730d3506154744485af1bbc1cd3a1e6a8.tar.xz | |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'drivers/net/cpsw.c')
| -rw-r--r-- | drivers/net/cpsw.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/cpsw.c b/drivers/net/cpsw.c index 7a36850..379b679 100644 --- a/drivers/net/cpsw.c +++ b/drivers/net/cpsw.c @@ -109,7 +109,13 @@ struct cpsw_slave_regs { u32 flow_thresh; u32 port_vlan; u32 tx_pri_map; +#ifdef CONFIG_AM33XX u32 gap_thresh; +#elif defined(CONFIG_TI814X) + u32 ts_ctl; + u32 ts_seq_ltype; + u32 ts_vlan; +#endif u32 sa_lo; u32 sa_hi; }; |