summaryrefslogtreecommitdiff
path: root/arch/mips/cavium-octeon/setup.c
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2016-02-24 01:52:05 +0300
committerRalf Baechle <ralf@linux-mips.org>2016-05-13 15:01:42 +0300
commit43349b9e4bb008a2fb7e92de53fe2aa1ccf8ea24 (patch)
tree0b4595f4a08de8fbfe2dedf942949da356fc3244 /arch/mips/cavium-octeon/setup.c
parent1a1590ab1a4a0898fe0a6809e5bcd7c225e3b4d6 (diff)
downloadlinux-43349b9e4bb008a2fb7e92de53fe2aa1ccf8ea24.tar.xz
MIPS: Octeon: device_tree_init: use separate pass to fill mac addresses
Use separate pass to fill MAC addresses. This is needed because we want to do this also for the appended DTB. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Acked-by: David Daney <david.daney@cavium.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/12588/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/cavium-octeon/setup.c')
-rw-r--r--arch/mips/cavium-octeon/setup.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c
index 37ac229bebb6..60f66bbcb620 100644
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
@@ -1108,6 +1108,7 @@ void __init prom_free_prom_memory(void)
}
}
+void __init octeon_fill_mac_addresses(void);
int octeon_prune_device_tree(void);
extern const char __appended_dtb;
@@ -1143,6 +1144,7 @@ void __init device_tree_init(void)
if (do_prune) {
octeon_prune_device_tree();
+ octeon_fill_mac_addresses();
pr_info("Using internal Device Tree.\n");
}
unflatten_and_copy_device_tree();