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

Commit 4c642f3f authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Ralf Baechle
Browse files

[MIPS] TXx9: rename asm-mips/mach-jmr3927 to asm-mips/mach-tx39xx 



Rename mach-jmr3927 directory to more proper name to make adding other
platforms easier.

Signed-off-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 6e68665e

arch/mips/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ all-$(CONFIG_SNI_RM) := vmlinux.ecoff 
# Common TXx9

#

core-$(CONFIG_MACH_TX39XX)	+= arch/mips/txx9/generic/

cflags-$(CONFIG_MACH_TX39XX) += -Iinclude/asm-mips/mach-jmr3927

cflags-$(CONFIG_MACH_TX39XX) += -Iinclude/asm-mips/mach-tx39xx

load-$(CONFIG_MACH_TX39XX)	+= 0xffffffff80050000

core-$(CONFIG_MACH_TX49XX)	+= arch/mips/txx9/generic/

cflags-$(CONFIG_MACH_TX49XX) += -Iinclude/asm-mips/mach-tx49xx

arch/mips/txx9/generic/setup.c

+10 −0
Original line number Diff line number Diff line
@@ -200,3 +200,13 @@ asmlinkage void plat_irq_dispatch(void) 
	else

		spurious_interrupt();

}



/* see include/asm-mips/mach-tx39xx/mangle-port.h, for example. */

#ifdef NEEDS_TXX9_SWIZZLE_ADDR_B

static unsigned long __swizzle_addr_none(unsigned long port)

{

	return port;

}

unsigned long (*__swizzle_addr_b)(unsigned long port) = __swizzle_addr_none;

EXPORT_SYMBOL(__swizzle_addr_b);

#endif

arch/mips/txx9/jmr3927/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ static void __init tx3927_setup(void) 
}



/* This trick makes rtc-ds1742 driver usable as is. */

unsigned long __swizzle_addr_b(unsigned long port)

static unsigned long jmr3927_swizzle_addr_b(unsigned long port)

{

	if ((port & 0xffff0000) != JMR3927_IOC_NVRAMB_ADDR)

		return port;
@@ -326,7 +326,6 @@ unsigned long __swizzle_addr_b(unsigned long port) 
	return port | 1;

#endif

}

EXPORT_SYMBOL(__swizzle_addr_b);



static int __init jmr3927_rtc_init(void)

{
@@ -361,6 +360,7 @@ static int __init jmr3927_wdt_init(void) 


static void __init jmr3927_device_init(void)

{

	__swizzle_addr_b = jmr3927_swizzle_addr_b;

	jmr3927_rtc_init();

	jmr3927_wdt_init();

}

include/asm-mips/mach-jmr3927/ioremap.h→include/asm-mips/mach-tx39xx/ioremap.h

+4 −4
Original line number Diff line number Diff line 
/*

 *	include/asm-mips/mach-jmr3927/ioremap.h

 *	include/asm-mips/mach-tx39xx/ioremap.h

 *

 *	This program is free software; you can redistribute it and/or

 *	modify it under the terms of the GNU General Public License

 *	as published by the Free Software Foundation; either version

 *	2 of the License, or (at your option) any later version.

 */

#ifndef __ASM_MACH_JMR3927_IOREMAP_H

#define __ASM_MACH_JMR3927_IOREMAP_H

#ifndef __ASM_MACH_TX39XX_IOREMAP_H

#define __ASM_MACH_TX39XX_IOREMAP_H



#include <linux/types.h>
@@ -35,4 +35,4 @@ static inline int plat_iounmap(const volatile void __iomem *addr) 
	return (unsigned long)addr >= TXX9_DIRECTMAP_BASE;

}



#endif /* __ASM_MACH_JMR3927_IOREMAP_H */
 
#endif /* __ASM_MACH_TX39XX_IOREMAP_H */

include/asm-mips/mach-jmr3927/mangle-port.h→include/asm-mips/mach-tx39xx/mangle-port.h

+9 −4
Original line number Diff line number Diff line 
#ifndef __ASM_MACH_JMR3927_MANGLE_PORT_H

#define __ASM_MACH_JMR3927_MANGLE_PORT_H

#ifndef __ASM_MACH_TX39XX_MANGLE_PORT_H

#define __ASM_MACH_TX39XX_MANGLE_PORT_H



extern unsigned long __swizzle_addr_b(unsigned long port);

#if defined(CONFIG_TOSHIBA_JMR3927)

extern unsigned long (*__swizzle_addr_b)(unsigned long port);

#define NEEDS_TXX9_SWIZZLE_ADDR_B

#else

#define __swizzle_addr_b(port)	(port)

#endif

#define __swizzle_addr_w(port)	(port)

#define __swizzle_addr_l(port)	(port)

#define __swizzle_addr_q(port)	(port)
@@ -15,4 +20,4 @@ extern unsigned long __swizzle_addr_b(unsigned long port); 
#define ioswabq(a, x)		le64_to_cpu(x)

#define __mem_ioswabq(a, x)	(x)



#endif /* __ASM_MACH_JMR3927_MANGLE_PORT_H */
 
#endif /* __ASM_MACH_TX39XX_MANGLE_PORT_H */