All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Jayachandran C" <jayachandranc@netlogicmicro.com>
To: linux-mips@linux-mips.org, ralf@linux-mips.org
Cc: "Jayachandran C" <jayachandranc@netlogicmicro.com>
Subject: [PATCH 03/12] MIPS: Netlogic: merge of.c into setup.c
Date: Fri, 13 Jul 2012 21:53:16 +0530	[thread overview]
Message-ID: <1342196605-4260-4-git-send-email-jayachandranc@netlogicmicro.com> (raw)
In-Reply-To: <1342196605-4260-1-git-send-email-jayachandranc@netlogicmicro.com>

Move the function device_tree_init() from netlogic/xlp/of.c
to setup.c, and remove the wrapper functions reserve_mem_mach()
and free_mem_mach().

Remove file netlogic/xlp/of.c, and the Makefile entry for it.

Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com>
---
 arch/mips/netlogic/xlp/Makefile |    1 -
 arch/mips/netlogic/xlp/of.c     |   34 ----------------------------------
 arch/mips/netlogic/xlp/setup.c  |   20 ++++++++++++++++++++
 3 files changed, 20 insertions(+), 35 deletions(-)
 delete mode 100644 arch/mips/netlogic/xlp/of.c

diff --git a/arch/mips/netlogic/xlp/Makefile b/arch/mips/netlogic/xlp/Makefile
index 6b4b972..5bd24b6 100644
--- a/arch/mips/netlogic/xlp/Makefile
+++ b/arch/mips/netlogic/xlp/Makefile
@@ -1,4 +1,3 @@
 obj-y				+= setup.o platform.o nlm_hal.o
-obj-$(CONFIG_OF)		+= of.o
 obj-$(CONFIG_SMP)		+= wakeup.o
 obj-$(CONFIG_USB)		+= usb-init.o
diff --git a/arch/mips/netlogic/xlp/of.c b/arch/mips/netlogic/xlp/of.c
deleted file mode 100644
index 8e3921c..0000000
--- a/arch/mips/netlogic/xlp/of.c
+++ /dev/null
@@ -1,34 +0,0 @@
-#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);
-}
diff --git a/arch/mips/netlogic/xlp/setup.c b/arch/mips/netlogic/xlp/setup.c
index 3dec9f2..0d2d679 100644
--- a/arch/mips/netlogic/xlp/setup.c
+++ b/arch/mips/netlogic/xlp/setup.c
@@ -35,6 +35,7 @@
 #include <linux/kernel.h>
 #include <linux/serial_8250.h>
 #include <linux/pm.h>
+#include <linux/bootmem.h>
 
 #include <asm/reboot.h>
 #include <asm/time.h>
@@ -112,6 +113,25 @@ void __init prom_init(void)
 #endif
 }
 
+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_bootmem(base, size, BOOTMEM_DEFAULT);
+
+	unflatten_device_tree();
+
+	/* free the space reserved for the dt blob */
+	free_bootmem(base, size);
+}
+
 static struct of_device_id __initdata xlp_ids[] = {
 	{ .compatible = "simple-bus", },
 	{},
-- 
1.7.9.5

  parent reply	other threads:[~2012-07-13 16:26 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-13 16:23 [PATCH 00/12] Netlogic XLR/XLP updates Jayachandran C
2012-07-13 16:23 ` [PATCH 01/12] MIPS: Netlogic: Fix indentation of smpboot.S Jayachandran C
2012-07-13 16:23 ` [PATCH 02/12] MIPS: Netlogic: Fix low-level flush on core wakeup Jayachandran C
2012-07-24 14:59   ` Ralf Baechle
2012-07-13 16:23 ` Jayachandran C [this message]
2012-07-13 16:23 ` [PATCH 04/12] MIPS: Netlogic: remove cpu_has_dc_aliases define for XLP Jayachandran C
2012-07-13 16:23 ` [PATCH 05/12] MIPS: PCI: Fix for byte swap for Netlogic XLP Jayachandran C
2012-07-24 14:58   ` Ralf Baechle
2012-07-13 16:23 ` [PATCH 06/12] MIPS: Netlogic: early console fix Jayachandran C
2012-07-13 16:27   ` Florian Fainelli
2012-07-16 10:03     ` [PATCH UPDATED " Jayachandran C
2012-07-13 16:23 ` [PATCH 07/12] MIPS: Netlogic: DTS file for XLP boards Jayachandran C
2012-07-13 16:23 ` [PATCH 08/12] MIPS: Netlogic: Move serial ports to device tree Jayachandran C
2012-07-13 16:23 ` [PATCH 09/12] MIPS: Netlogic: Add support for built in DTB Jayachandran C
2012-07-13 16:23 ` [PATCH 10/12] MIPS: oprofile: Support for XLR/XLS processors Jayachandran C
2012-07-13 16:23 ` [PATCH 11/12] MIPS: perf: Add XLP support for hardware perf Jayachandran C
2012-07-13 16:23 ` [PATCH 12/12] MIPS: Netlogic: XLP defconfig update Jayachandran C
2012-08-21 12:52   ` Ralf Baechle
2012-08-22 12:57     ` Jayachandran C.

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1342196605-4260-4-git-send-email-jayachandranc@netlogicmicro.com \
    --to=jayachandranc@netlogicmicro.com \
    --cc=linux-mips@linux-mips.org \
    --cc=ralf@linux-mips.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.