mirror of
https://github.com/torvalds/linux.git
synced 2024-12-29 22:31:32 +00:00
d3557d9616
Commit01306aeadd("MIPS: prepare for user enabling of CONFIG_OF") changed the guards in asm/prom.h from CONFIG_OF to CONFIG_USE_OF, but missed the actual function declarations in kernel/prom.c, which have additional dependencies. Fixes the following build error: CC arch/mips/kernel/prom.o arch/mips/kernel/prom.c: In function '__dt_setup_arch': arch/mips/kernel/prom.c:54:2: error: implicit declaration of function 'early_init_dt_scan' [-Werror=implicit-function-declaration] if (!early_init_dt_scan(bph)) ^ Fixes:01306aeadd("MIPS: prepare for user enabling of CONFIG_OF") Signed-off-by: Jonas Gorski <jogo@openwrt.org> Acked-by: Rob Herring <robh@kernel.org> Cc: linux-mips@linux-mips.org Cc: devicetree@vger.kernel.org Cc: Grant Likely <grant.likely@linaro.org> Patchwork: https://patchwork.linux-mips.org/patch/10741/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
80 lines
1.8 KiB
C
80 lines
1.8 KiB
C
/*
|
|
* MIPS support for CONFIG_OF device tree support
|
|
*
|
|
* Copyright (C) 2010 Cisco Systems Inc. <dediao@cisco.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/export.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/types.h>
|
|
#include <linux/bootmem.h>
|
|
#include <linux/debugfs.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_fdt.h>
|
|
#include <linux/of_platform.h>
|
|
|
|
#include <asm/bootinfo.h>
|
|
#include <asm/page.h>
|
|
#include <asm/prom.h>
|
|
|
|
static char mips_machine_name[64] = "Unknown";
|
|
|
|
__init void mips_set_machine_name(const char *name)
|
|
{
|
|
if (name == NULL)
|
|
return;
|
|
|
|
strlcpy(mips_machine_name, name, sizeof(mips_machine_name));
|
|
pr_info("MIPS: machine is %s\n", mips_get_machine_name());
|
|
}
|
|
|
|
char *mips_get_machine_name(void)
|
|
{
|
|
return mips_machine_name;
|
|
}
|
|
|
|
#ifdef CONFIG_USE_OF
|
|
void __init early_init_dt_add_memory_arch(u64 base, u64 size)
|
|
{
|
|
return add_memory_region(base, size, BOOT_MEM_RAM);
|
|
}
|
|
|
|
void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)
|
|
{
|
|
return __alloc_bootmem(size, align, __pa(MAX_DMA_ADDRESS));
|
|
}
|
|
|
|
void __init __dt_setup_arch(void *bph)
|
|
{
|
|
if (!early_init_dt_scan(bph))
|
|
return;
|
|
|
|
mips_set_machine_name(of_flat_dt_get_machine_name());
|
|
}
|
|
|
|
int __init __dt_register_buses(const char *bus0, const char *bus1)
|
|
{
|
|
static struct of_device_id of_ids[3];
|
|
|
|
if (!of_have_populated_dt())
|
|
panic("device tree not present");
|
|
|
|
strlcpy(of_ids[0].compatible, bus0, sizeof(of_ids[0].compatible));
|
|
if (bus1) {
|
|
strlcpy(of_ids[1].compatible, bus1,
|
|
sizeof(of_ids[1].compatible));
|
|
}
|
|
|
|
if (of_platform_populate(NULL, of_ids, NULL, NULL))
|
|
panic("failed to populate DT");
|
|
|
|
return 0;
|
|
}
|
|
|
|
#endif
|