Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9169a5d0 authored by John Crispin's avatar John Crispin Committed by Ralf Baechle
Browse files

MIPS: move mips_{set,get}_machine_name() to a more generic place 



Previously this functionality was only available to users of the mips_machine
api. Moving the code to prom.c allows us to also add a OF wrapper.

Signed-off-by: default avatarJohn Crispin <blogic@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/5164/
parent d41d547a

arch/mips/include/asm/mips_machine.h

+0 −4
Original line number Diff line number Diff line
@@ -42,13 +42,9 @@ extern long __mips_machines_end; 
#ifdef CONFIG_MIPS_MACHINE

int  mips_machtype_setup(char *id) __init;

void mips_machine_setup(void) __init;

void mips_set_machine_name(const char *name) __init;

char *mips_get_machine_name(void);

#else

static inline int mips_machtype_setup(char *id) { return 1; }

static inline void mips_machine_setup(void) { }

static inline void mips_set_machine_name(const char *name) { }

static inline char *mips_get_machine_name(void) { return NULL; }

#endif /* CONFIG_MIPS_MACHINE */



#endif /* __ASM_MIPS_MACHINE_H */

arch/mips/include/asm/prom.h

+3 −0
Original line number Diff line number Diff line
@@ -48,4 +48,7 @@ extern void __dt_setup_arch(struct boot_param_header *bph); 
static inline void device_tree_init(void) { }

#endif /* CONFIG_OF */



extern char *mips_get_machine_name(void);

extern void mips_set_machine_name(const char *name);



#endif /* __ASM_PROM_H */

arch/mips/kernel/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
extra-y		:= head.o vmlinux.lds



obj-y		+= cpu-probe.o branch.o entry.o genex.o irq.o process.o \

		   ptrace.o reset.o setup.o signal.o syscall.o \

		   prom.o ptrace.o reset.o setup.o signal.o syscall.o \

		   time.o topology.o traps.o unaligned.o watch.o vdso.o



ifdef CONFIG_FUNCTION_TRACER
@@ -86,8 +86,6 @@ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o 
obj-$(CONFIG_SPINLOCK_TEST)	+= spinlock_test.o

obj-$(CONFIG_MIPS_MACHINE)	+= mips_machine.o



obj-$(CONFIG_OF)		+= prom.o



CFLAGS_cpu-bugs64.o	= $(shell if $(CC) $(KBUILD_CFLAGS) -Wa,-mdaddi -c -o /dev/null -x c /dev/null >/dev/null 2>&1; then echo "-DHAVE_AS_SET_DADDI"; fi)



obj-$(CONFIG_HAVE_STD_PC_SERIAL_PORT)	+= 8250-platform.o

arch/mips/kernel/mips_machine.c

+1 −21
Original line number Diff line number Diff line
@@ -11,9 +11,9 @@ 
#include <linux/slab.h>



#include <asm/mips_machine.h>

#include <asm/prom.h>



static struct mips_machine *mips_machine __initdata;

static char *mips_machine_name = "Unknown";



#define for_each_machine(mach) \

	for ((mach) = (struct mips_machine *)&__mips_machines_start; \
@@ -21,25 +21,6 @@ static char *mips_machine_name = "Unknown"; 
	     (unsigned long)(mach) < (unsigned long)&__mips_machines_end; \

	     (mach)++)



__init void mips_set_machine_name(const char *name)

{

	char *p;



	if (name == NULL)

		return;



	p = kstrdup(name, GFP_KERNEL);

	if (!p)

		pr_err("MIPS: no memory for machine_name\n");



	mips_machine_name = p;

}



char *mips_get_machine_name(void)

{

	return mips_machine_name;

}



__init int mips_machtype_setup(char *id)

{

	struct mips_machine *mach;
@@ -79,7 +60,6 @@ __init void mips_machine_setup(void) 
		return;



	mips_set_machine_name(mips_machine->mach_name);

	pr_info("MIPS: machine is %s\n", mips_machine_name);



	if (mips_machine->mach_setup)

		mips_machine->mach_setup();

arch/mips/kernel/proc.c

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include <asm/cpu-features.h>

#include <asm/mipsregs.h>

#include <asm/processor.h>

#include <asm/mips_machine.h>

#include <asm/prom.h>



unsigned int vced_count, vcei_count;