From bbe32ec3b46e06fef19dd9899e76b989e06bf91c Mon Sep 17 00:00:00 2001
From: David Daney <david.daney@cavium.com>
Date: Thu, 5 Jul 2012 18:12:38 +0200
Subject: [PATCH] --- yaml --- r: 319629 b: refs/heads/master c:
 b01da9f130adbf69cfbad2a65f1327f1382bf4ae h: refs/heads/master i:   319627:
 331ddb23b943a9332226db4efc92d97e88e54888 v: v3

---
 [refs]                                |  2 +-
 trunk/arch/mips/include/asm/prom.h    |  3 ---
 trunk/arch/mips/kernel/prom.c         | 29 -----------------------
 trunk/arch/mips/netlogic/xlp/Makefile |  1 +
 trunk/arch/mips/netlogic/xlp/of.c     | 34 +++++++++++++++++++++++++++
 5 files changed, 36 insertions(+), 33 deletions(-)
 create mode 100644 trunk/arch/mips/netlogic/xlp/of.c

diff --git a/[refs] b/[refs]
index 5a98b08c3116..9dcc2329d2f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 736b1c9c957e38b80d2e36b2ed196fa1c07468bc
+refs/heads/master: b01da9f130adbf69cfbad2a65f1327f1382bf4ae
diff --git a/trunk/arch/mips/include/asm/prom.h b/trunk/arch/mips/include/asm/prom.h
index 7206d445bab8..8808bf548b99 100644
--- a/trunk/arch/mips/include/asm/prom.h
+++ b/trunk/arch/mips/include/asm/prom.h
@@ -20,9 +20,6 @@
 extern int early_init_dt_scan_memory_arch(unsigned long node,
 	const char *uname, int depth, void *data);
 
-extern int reserve_mem_mach(unsigned long addr, unsigned long size);
-extern void free_mem_mach(unsigned long addr, unsigned long size);
-
 extern void device_tree_init(void);
 
 static inline unsigned long pci_address_to_pio(phys_addr_t address)
diff --git a/trunk/arch/mips/kernel/prom.c b/trunk/arch/mips/kernel/prom.c
index f11b2bbb826d..028f6f837ef9 100644
--- a/trunk/arch/mips/kernel/prom.c
+++ b/trunk/arch/mips/kernel/prom.c
@@ -35,16 +35,6 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size)
 	return add_memory_region(base, size, BOOT_MEM_RAM);
 }
 
-int __init reserve_mem_mach(unsigned long addr, unsigned long size)
-{
-	return reserve_bootmem(addr, size, BOOTMEM_DEFAULT);
-}
-
-void __init free_mem_mach(unsigned long addr, unsigned long size)
-{
-	return free_bootmem(addr, size);
-}
-
 void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)
 {
 	return __alloc_bootmem(size, align, __pa(MAX_DMA_ADDRESS));
@@ -77,25 +67,6 @@ void __init early_init_devtree(void *params)
 	of_scan_flat_dt(early_init_dt_scan_memory_arch, NULL);
 }
 
-void __init device_tree_init(void)
-{
-	unsigned long base, size;
-
-	if (!initial_boot_params)
-		return;
-
-	base = virt_to_phys((void *)initial_boot_params);
-	size = be32_to_cpu(initial_boot_params->totalsize);
-
-	/* Before we do anything, lets reserve the dt blob */
-	reserve_mem_mach(base, size);
-
-	unflatten_device_tree();
-
-	/* free the space reserved for the dt blob */
-	free_mem_mach(base, size);
-}
-
 void __init __dt_setup_arch(struct boot_param_header *bph)
 {
 	if (be32_to_cpu(bph->magic) != OF_DT_HEADER) {
diff --git a/trunk/arch/mips/netlogic/xlp/Makefile b/trunk/arch/mips/netlogic/xlp/Makefile
index b93ed83474ec..9007ef0c398e 100644
--- a/trunk/arch/mips/netlogic/xlp/Makefile
+++ b/trunk/arch/mips/netlogic/xlp/Makefile
@@ -1,2 +1,3 @@
 obj-y				+= setup.o platform.o nlm_hal.o
+obj-$(CONFIG_OF)		+= of.o
 obj-$(CONFIG_SMP)		+= wakeup.o
diff --git a/trunk/arch/mips/netlogic/xlp/of.c b/trunk/arch/mips/netlogic/xlp/of.c
new file mode 100644
index 000000000000..8e3921c0c201
--- /dev/null
+++ b/trunk/arch/mips/netlogic/xlp/of.c
@@ -0,0 +1,34 @@
+#include <linux/bootmem.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/of_fdt.h>
+#include <asm/byteorder.h>
+
+static int __init reserve_mem_mach(unsigned long addr, unsigned long size)
+{
+	return reserve_bootmem(addr, size, BOOTMEM_DEFAULT);
+}
+
+void __init free_mem_mach(unsigned long addr, unsigned long size)
+{
+	return free_bootmem(addr, size);
+}
+
+void __init device_tree_init(void)
+{
+	unsigned long base, size;
+
+	if (!initial_boot_params)
+		return;
+
+	base = virt_to_phys((void *)initial_boot_params);
+	size = be32_to_cpu(initial_boot_params->totalsize);
+
+	/* Before we do anything, lets reserve the dt blob */
+	reserve_mem_mach(base, size);
+
+	unflatten_device_tree();
+
+	/* free the space reserved for the dt blob */
+	free_mem_mach(base, size);
+}