projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next'
[platform/kernel/u-boot.git]
/
include
/
cpsw.h
diff --git
a/include/cpsw.h
b/include/cpsw.h
index
547b40c
..
cf1d30b
100644
(file)
--- a/
include/cpsw.h
+++ b/
include/cpsw.h
@@
-31,6
+31,8
@@
enum {
struct cpsw_platform_data {
u32 mdio_base;
u32 cpsw_base;
+ u32 mac_id;
+ u32 gmii_sel;
int mdio_div;
int channels; /* number of cpdma channels (symmetric) */
u32 cpdma_reg_ofs; /* cpdma register offset */