* [PATCH 15/28] mips: use early_init_dt_scan [not found] <1379372965-22359-1-git-send-email-robherring2@gmail.com> @ 2013-09-16 23:09 ` Rob Herring 2013-09-17 4:32 ` John Crispin 2013-09-16 23:09 ` [PATCH 28/28] mips: use common of_flat_dt_get_machine_name Rob Herring 1 sibling, 1 reply; 4+ messages in thread From: Rob Herring @ 2013-09-16 23:09 UTC (permalink / raw) To: linux-kernel, devicetree Cc: Grant Likely, Rob Herring, Ralf Baechle, linux-mips From: Rob Herring <rob.herring@calxeda.com> Convert mips to use new early_init_dt_scan function. Remove early_init_dt_scan_memory_arch Signed-off-by: Rob Herring <rob.herring@calxeda.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: linux-mips@linux-mips.org --- arch/mips/include/asm/prom.h | 3 --- arch/mips/kernel/prom.c | 39 +++------------------------------------ 2 files changed, 3 insertions(+), 39 deletions(-) diff --git a/arch/mips/include/asm/prom.h b/arch/mips/include/asm/prom.h index 1e7e096..e3dbd0e 100644 --- a/arch/mips/include/asm/prom.h +++ b/arch/mips/include/asm/prom.h @@ -17,9 +17,6 @@ #include <linux/types.h> #include <asm/bootinfo.h> -extern int early_init_dt_scan_memory_arch(unsigned long node, - const char *uname, int depth, void *data); - extern void device_tree_init(void); static inline unsigned long pci_address_to_pio(phys_addr_t address) diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c index 0fa0b69..67a4c53 100644 --- a/arch/mips/kernel/prom.c +++ b/arch/mips/kernel/prom.c @@ -17,8 +17,6 @@ #include <linux/debugfs.h> #include <linux/of.h> #include <linux/of_fdt.h> -#include <linux/of_irq.h> -#include <linux/of_platform.h> #include <asm/page.h> #include <asm/prom.h> @@ -40,13 +38,6 @@ char *mips_get_machine_name(void) } #ifdef CONFIG_OF -int __init early_init_dt_scan_memory_arch(unsigned long node, - const char *uname, int depth, - void *data) -{ - return early_init_dt_scan_memory(node, uname, depth, data); -} - void __init early_init_dt_add_memory_arch(u64 base, u64 size) { return add_memory_region(base, size, BOOT_MEM_RAM); @@ -78,36 +69,12 @@ int __init early_init_dt_scan_model(unsigned long node, const char *uname, return 0; } -void __init early_init_devtree(void *params) -{ - /* Setup flat device-tree pointer */ - initial_boot_params = params; - - /* Retrieve various informations from the /chosen node of the - * device-tree, including the platform type, initrd location and - * size, and more ... - */ - of_scan_flat_dt(early_init_dt_scan_chosen, arcs_cmdline); - - - /* Scan memory nodes */ - of_scan_flat_dt(early_init_dt_scan_root, NULL); - of_scan_flat_dt(early_init_dt_scan_memory_arch, NULL); - - /* try to load the mips machine name */ - of_scan_flat_dt(early_init_dt_scan_model, NULL); -} - void __init __dt_setup_arch(struct boot_param_header *bph) { - if (be32_to_cpu(bph->magic) != OF_DT_HEADER) { - pr_err("DTB has bad magic, ignoring builtin OF DTB\n"); - + if (!early_init_dt_scan(bph)) return; - } - - initial_boot_params = bph; - early_init_devtree(initial_boot_params); + /* try to load the mips machine name */ + of_scan_flat_dt(early_init_dt_scan_model, NULL); } #endif -- 1.8.1.2 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 15/28] mips: use early_init_dt_scan 2013-09-16 23:09 ` [PATCH 15/28] mips: use early_init_dt_scan Rob Herring @ 2013-09-17 4:32 ` John Crispin 0 siblings, 0 replies; 4+ messages in thread From: John Crispin @ 2013-09-17 4:32 UTC (permalink / raw) To: Rob Herring Cc: linux-kernel, devicetree, Grant Likely, Rob Herring, Ralf Baechle, linux-mips On 17/09/13 01:09, Rob Herring wrote: > From: Rob Herring<rob.herring@calxeda.com> > > Convert mips to use new early_init_dt_scan function. > > Remove early_init_dt_scan_memory_arch > > Signed-off-by: Rob Herring<rob.herring@calxeda.com> > Cc: Ralf Baechle<ralf@linux-mips.org> > Cc: linux-mips@linux-mips.org > --- Acked-by: John Crispin <blogic@openwrt.org> Thanks for this series ... > arch/mips/include/asm/prom.h | 3 --- > arch/mips/kernel/prom.c | 39 +++------------------------------------ > 2 files changed, 3 insertions(+), 39 deletions(-) > > diff --git a/arch/mips/include/asm/prom.h b/arch/mips/include/asm/prom.h > index 1e7e096..e3dbd0e 100644 > --- a/arch/mips/include/asm/prom.h > +++ b/arch/mips/include/asm/prom.h > @@ -17,9 +17,6 @@ > #include<linux/types.h> > #include<asm/bootinfo.h> > > -extern int early_init_dt_scan_memory_arch(unsigned long node, > - const char *uname, int depth, void *data); > - > extern void device_tree_init(void); > > static inline unsigned long pci_address_to_pio(phys_addr_t address) > diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c > index 0fa0b69..67a4c53 100644 > --- a/arch/mips/kernel/prom.c > +++ b/arch/mips/kernel/prom.c > @@ -17,8 +17,6 @@ > #include<linux/debugfs.h> > #include<linux/of.h> > #include<linux/of_fdt.h> > -#include<linux/of_irq.h> > -#include<linux/of_platform.h> > > #include<asm/page.h> > #include<asm/prom.h> > @@ -40,13 +38,6 @@ char *mips_get_machine_name(void) > } > > #ifdef CONFIG_OF > -int __init early_init_dt_scan_memory_arch(unsigned long node, > - const char *uname, int depth, > - void *data) > -{ > - return early_init_dt_scan_memory(node, uname, depth, data); > -} > - > void __init early_init_dt_add_memory_arch(u64 base, u64 size) > { > return add_memory_region(base, size, BOOT_MEM_RAM); > @@ -78,36 +69,12 @@ int __init early_init_dt_scan_model(unsigned long node, const char *uname, > return 0; > } > > -void __init early_init_devtree(void *params) > -{ > - /* Setup flat device-tree pointer */ > - initial_boot_params = params; > - > - /* Retrieve various informations from the /chosen node of the > - * device-tree, including the platform type, initrd location and > - * size, and more ... > - */ > - of_scan_flat_dt(early_init_dt_scan_chosen, arcs_cmdline); > - > - > - /* Scan memory nodes */ > - of_scan_flat_dt(early_init_dt_scan_root, NULL); > - of_scan_flat_dt(early_init_dt_scan_memory_arch, NULL); > - > - /* try to load the mips machine name */ > - of_scan_flat_dt(early_init_dt_scan_model, NULL); > -} > - > void __init __dt_setup_arch(struct boot_param_header *bph) > { > - if (be32_to_cpu(bph->magic) != OF_DT_HEADER) { > - pr_err("DTB has bad magic, ignoring builtin OF DTB\n"); > - > + if (!early_init_dt_scan(bph)) > return; > - } > - > - initial_boot_params = bph; > > - early_init_devtree(initial_boot_params); > + /* try to load the mips machine name */ > + of_scan_flat_dt(early_init_dt_scan_model, NULL); > } > #endif ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 28/28] mips: use common of_flat_dt_get_machine_name [not found] <1379372965-22359-1-git-send-email-robherring2@gmail.com> 2013-09-16 23:09 ` [PATCH 15/28] mips: use early_init_dt_scan Rob Herring @ 2013-09-16 23:09 ` Rob Herring 2013-09-17 4:32 ` John Crispin 1 sibling, 1 reply; 4+ messages in thread From: Rob Herring @ 2013-09-16 23:09 UTC (permalink / raw) To: linux-kernel, devicetree Cc: Grant Likely, Rob Herring, Ralf Baechle, linux-mips From: Rob Herring <rob.herring@calxeda.com> Convert mips to use the common of_flat_dt_get_machine_name function. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: linux-mips@linux-mips.org --- arch/mips/kernel/prom.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c index 0b2485f..3c3b0df 100644 --- a/arch/mips/kernel/prom.c +++ b/arch/mips/kernel/prom.c @@ -47,24 +47,11 @@ void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align) return __alloc_bootmem(size, align, __pa(MAX_DMA_ADDRESS)); } -int __init early_init_dt_scan_model(unsigned long node, const char *uname, - int depth, void *data) -{ - if (!depth) { - char *model = of_get_flat_dt_prop(node, "model", NULL); - - if (model) - mips_set_machine_name(model); - } - return 0; -} - void __init __dt_setup_arch(struct boot_param_header *bph) { if (!early_init_dt_scan(bph)) return; - /* try to load the mips machine name */ - of_scan_flat_dt(early_init_dt_scan_model, NULL); + mips_set_machine_name(of_flat_dt_get_machine_name()); } #endif -- 1.8.1.2 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 28/28] mips: use common of_flat_dt_get_machine_name 2013-09-16 23:09 ` [PATCH 28/28] mips: use common of_flat_dt_get_machine_name Rob Herring @ 2013-09-17 4:32 ` John Crispin 0 siblings, 0 replies; 4+ messages in thread From: John Crispin @ 2013-09-17 4:32 UTC (permalink / raw) To: Rob Herring Cc: linux-kernel, devicetree, Grant Likely, Rob Herring, Ralf Baechle, linux-mips On 17/09/13 01:09, Rob Herring wrote: > From: Rob Herring<rob.herring@calxeda.com> > > Convert mips to use the common of_flat_dt_get_machine_name function. > > Signed-off-by: Rob Herring<rob.herring@calxeda.com> > Cc: Ralf Baechle<ralf@linux-mips.org> > Cc: linux-mips@linux-mips.org > --- Acked-by: John Crispin <blogic@openwrt.org> Thanks for this series ... > arch/mips/kernel/prom.c | 15 +-------------- > 1 file changed, 1 insertion(+), 14 deletions(-) > > diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c > index 0b2485f..3c3b0df 100644 > --- a/arch/mips/kernel/prom.c > +++ b/arch/mips/kernel/prom.c > @@ -47,24 +47,11 @@ void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align) > return __alloc_bootmem(size, align, __pa(MAX_DMA_ADDRESS)); > } > > -int __init early_init_dt_scan_model(unsigned long node, const char *uname, > - int depth, void *data) > -{ > - if (!depth) { > - char *model = of_get_flat_dt_prop(node, "model", NULL); > - > - if (model) > - mips_set_machine_name(model); > - } > - return 0; > -} > - > void __init __dt_setup_arch(struct boot_param_header *bph) > { > if (!early_init_dt_scan(bph)) > return; > > - /* try to load the mips machine name */ > - of_scan_flat_dt(early_init_dt_scan_model, NULL); > + mips_set_machine_name(of_flat_dt_get_machine_name()); > } > #endif ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-09-17 4:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1379372965-22359-1-git-send-email-robherring2@gmail.com>
2013-09-16 23:09 ` [PATCH 15/28] mips: use early_init_dt_scan Rob Herring
2013-09-17 4:32 ` John Crispin
2013-09-16 23:09 ` [PATCH 28/28] mips: use common of_flat_dt_get_machine_name Rob Herring
2013-09-17 4:32 ` John Crispin
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox