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 'master' of git://git.denx.de/u-boot-tegra
[platform/kernel/u-boot.git]
/
include
/
cpsw.h
diff --git
a/include/cpsw.h
b/include/cpsw.h
index
743cb96
..
547b40c
100644
(file)
--- a/
include/cpsw.h
+++ b/
include/cpsw.h
@@
-19,7
+19,7
@@
struct cpsw_slave_data {
u32 slave_reg_ofs;
u32 sliver_reg_ofs;
- int phy_
id
;
+ int phy_
addr
;
int phy_if;
};
@@
-44,6
+44,7
@@
struct cpsw_platform_data {
struct cpsw_slave_data *slave_data;
void (*control)(int enabled);
u32 host_port_num;
+ u32 active_slave;
u8 version;
};