diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2008-01-15 10:30:32 -0500 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2008-01-23 20:32:44 -0500 |
commit | ad160681c8caa0a73e6abd3ac606cd857608f94a (patch) | |
tree | b3e1a48096c03ff83fdf5b0dfccd2434c57c9621 /arch/powerpc/boot | |
parent | 6392f1845b54eefbfa5f3569155451949d250b6d (diff) |
[POWERPC] bootwrapper: Add find_node_by_alias and dt_fixup_mac_address_by_alias
Add the ability to set the mac address given the alias for the device.
Removes the need for having a linux,network-index property.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/boot')
-rw-r--r-- | arch/powerpc/boot/devtree.c | 14 | ||||
-rw-r--r-- | arch/powerpc/boot/ops.h | 14 |
2 files changed, 28 insertions, 0 deletions
diff --git a/arch/powerpc/boot/devtree.c b/arch/powerpc/boot/devtree.c index e5dfe4497313..60f561e307a9 100644 --- a/arch/powerpc/boot/devtree.c +++ b/arch/powerpc/boot/devtree.c | |||
@@ -88,6 +88,20 @@ void dt_fixup_clock(const char *path, u32 freq) | |||
88 | } | 88 | } |
89 | } | 89 | } |
90 | 90 | ||
91 | void dt_fixup_mac_address_by_alias(const char *alias, const u8 *addr) | ||
92 | { | ||
93 | void *devp = find_node_by_alias(alias); | ||
94 | |||
95 | if (devp) { | ||
96 | printf("%s: local-mac-address <-" | ||
97 | " %02x:%02x:%02x:%02x:%02x:%02x\n\r", alias, | ||
98 | addr[0], addr[1], addr[2], | ||
99 | addr[3], addr[4], addr[5]); | ||
100 | |||
101 | setprop(devp, "local-mac-address", addr, 6); | ||
102 | } | ||
103 | } | ||
104 | |||
91 | void dt_fixup_mac_address(u32 index, const u8 *addr) | 105 | void dt_fixup_mac_address(u32 index, const u8 *addr) |
92 | { | 106 | { |
93 | void *devp = find_node_by_prop_value(NULL, "linux,network-index", | 107 | void *devp = find_node_by_prop_value(NULL, "linux,network-index", |
diff --git a/arch/powerpc/boot/ops.h b/arch/powerpc/boot/ops.h index 6036a98e646a..5872ef1779ae 100644 --- a/arch/powerpc/boot/ops.h +++ b/arch/powerpc/boot/ops.h | |||
@@ -159,9 +159,23 @@ static inline void *find_node_by_devtype(const void *prev, | |||
159 | return find_node_by_prop_value_str(prev, "device_type", type); | 159 | return find_node_by_prop_value_str(prev, "device_type", type); |
160 | } | 160 | } |
161 | 161 | ||
162 | static inline void *find_node_by_alias(const char *alias) | ||
163 | { | ||
164 | void *devp = finddevice("/aliases"); | ||
165 | |||
166 | if (devp) { | ||
167 | char path[MAX_PATH_LEN]; | ||
168 | if (getprop(devp, alias, path, MAX_PATH_LEN) > 0) | ||
169 | return finddevice(path); | ||
170 | } | ||
171 | |||
172 | return NULL; | ||
173 | } | ||
174 | |||
162 | void dt_fixup_memory(u64 start, u64 size); | 175 | void dt_fixup_memory(u64 start, u64 size); |
163 | void dt_fixup_cpu_clocks(u32 cpufreq, u32 tbfreq, u32 busfreq); | 176 | void dt_fixup_cpu_clocks(u32 cpufreq, u32 tbfreq, u32 busfreq); |
164 | void dt_fixup_clock(const char *path, u32 freq); | 177 | void dt_fixup_clock(const char *path, u32 freq); |
178 | void dt_fixup_mac_address_by_alias(const char *alias, const u8 *addr); | ||
165 | void dt_fixup_mac_address(u32 index, const u8 *addr); | 179 | void dt_fixup_mac_address(u32 index, const u8 *addr); |
166 | void __dt_fixup_mac_addresses(u32 startindex, ...); | 180 | void __dt_fixup_mac_addresses(u32 startindex, ...); |
167 | #define dt_fixup_mac_addresses(...) \ | 181 | #define dt_fixup_mac_addresses(...) \ |