Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 1f8a9ef10732c96b5f898eacd5603c07dcc68b32

Authored by Jayachandran C
Committed by John Crispin
1 parent 98dbc5764d
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

MIPS: Netlogic: merge of.c into setup.c 

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>
Patchwork: http://patchwork.linux-mips.org/patch/4097/
Signed-off-by: John Crispin <blogic@openwrt.org>

Showing 3 changed files with 20 additions and 35 deletions Side-by-side Diff

arch/mips/netlogic/xlp/Makefile
Diff comments   View file @ 1f8a9ef
1 1 obj-y += setup.o platform.o nlm_hal.o
2   -obj-$(CONFIG_OF) += of.o
3 2 obj-$(CONFIG_SMP) += wakeup.o
4 3 obj-$(CONFIG_USB) += usb-init.o
arch/mips/netlogic/xlp/of.c
View file @ 1f8a9ef
1   -#include <linux/bootmem.h>
2   -#include <linux/init.h>
3   -#include <linux/io.h>
4   -#include <linux/of_fdt.h>
5   -#include <asm/byteorder.h>
6   -
7   -static int __init reserve_mem_mach(unsigned long addr, unsigned long size)
8   -{
9   - return reserve_bootmem(addr, size, BOOTMEM_DEFAULT);
10   -}
11   -
12   -void __init free_mem_mach(unsigned long addr, unsigned long size)
13   -{
14   - return free_bootmem(addr, size);
15   -}
16   -
17   -void __init device_tree_init(void)
18   -{
19   - unsigned long base, size;
20   -
21   - if (!initial_boot_params)
22   - return;
23   -
24   - base = virt_to_phys((void *)initial_boot_params);
25   - size = be32_to_cpu(initial_boot_params->totalsize);
26   -
27   - /* Before we do anything, lets reserve the dt blob */
28   - reserve_mem_mach(base, size);
29   -
30   - unflatten_device_tree();
31   -
32   - /* free the space reserved for the dt blob */
33   - free_mem_mach(base, size);
34   -}
arch/mips/netlogic/xlp/setup.c
Diff comments   View file @ 1f8a9ef
... ... @@ -35,6 +35,7 @@
35 35 #include <linux/kernel.h>
36 36 #include <linux/serial_8250.h>
37 37 #include <linux/pm.h>
  38 +#include <linux/bootmem.h>
38 39  
39 40 #include <asm/reboot.h>
40 41 #include <asm/time.h>
... ... @@ -110,6 +111,25 @@
110 111  
111 112 register_smp_ops(&nlm_smp_ops);
112 113 #endif
  114 +}
  115 +
  116 +void __init device_tree_init(void)
  117 +{
  118 + unsigned long base, size;
  119 +
  120 + if (!initial_boot_params)
  121 + return;
  122 +
  123 + base = virt_to_phys((void *)initial_boot_params);
  124 + size = be32_to_cpu(initial_boot_params->totalsize);
  125 +
  126 + /* Before we do anything, lets reserve the dt blob */
  127 + reserve_bootmem(base, size, BOOTMEM_DEFAULT);
  128 +
  129 + unflatten_device_tree();
  130 +
  131 + /* free the space reserved for the dt blob */
  132 + free_bootmem(base, size);
113 133 }
114 134  
115 135 static struct of_device_id __initdata xlp_ids[] = {