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

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

[MIPS] tx4927: Cleanup unused macros and non-standard IO accessors. 



This patch removes many unused constants, replaces non-standard IO
accessors with standard ones, and kills terrible tx4927_mips.h file.

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

arch/mips/tx4927/common/tx4927_dbgio.c

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 


#include <asm/mipsregs.h>

#include <asm/system.h>

#include <asm/tx4927/tx4927_mips.h>



u8 getDebugChar(void)

{

arch/mips/tx4927/common/tx4927_prom.c

+6 −6
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
#include <asm/bootinfo.h>

#include <asm/tx4927/tx4927.h>



static unsigned int __init tx4927_process_sdccr(u64 * addr)

static unsigned int __init tx4927_process_sdccr(unsigned long addr)

{

	u64 val;

	unsigned int sdccr_ce;
@@ -52,7 +52,7 @@ static unsigned int __init tx4927_process_sdccr(u64 * addr) 
	unsigned int mw = 0;

	unsigned int msize = 0;



	val = (*((vu64 *) (addr)));

	val = __raw_readq((void __iomem *)addr);



	/* MVMCP -- need #defs for these bits masks */

	sdccr_ce = ((val & (1 << 10)) >> 10);
@@ -136,10 +136,10 @@ unsigned int __init tx4927_get_mem_size(void) 
	unsigned int total;



	/* MVMCP -- need #defs for these registers */

	c0 = tx4927_process_sdccr((u64 *) 0xff1f8000);

	c1 = tx4927_process_sdccr((u64 *) 0xff1f8008);

	c2 = tx4927_process_sdccr((u64 *) 0xff1f8010);

	c3 = tx4927_process_sdccr((u64 *) 0xff1f8018);

	c0 = tx4927_process_sdccr(0xff1f8000);

	c1 = tx4927_process_sdccr(0xff1f8008);

	c2 = tx4927_process_sdccr(0xff1f8010);

	c3 = tx4927_process_sdccr(0xff1f8018);

	total = c0 + c1 + c2 + c3;



	return (total);

arch/mips/tx4927/common/tx4927_setup.c

+6 −5
Original line number Diff line number Diff line
@@ -124,10 +124,10 @@ dump_cp0(char *key) 
	return;

}



void print_pic(char *key, u32 reg, char *name)

void print_pic(char *key, unsigned long reg, char *name)

{

	printk("%s pic:0x%08x:%s=0x%08x\n", key, reg, name,

	       TX4927_RD(reg));

	printk(KERN_INFO "%s pic:0x%08lx:%s=0x%08x\n", key, reg, name,

	       __raw_readl((void __iomem *)reg));

	return;

}
@@ -166,9 +166,10 @@ void dump_pic(char *key) 
}





void print_addr(char *hdr, char *key, u32 addr)

void print_addr(char *hdr, char *key, unsigned long addr)

{

	printk("%s %s:0x%08x=0x%08x\n", hdr, key, addr, TX4927_RD(addr));

	printk(KERN_INFO "%s %s:0x%08lx=0x%08x\n", hdr, key, addr,

	       __raw_readl((void __iomem *)addr));

	return;

}

arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c

+11 −10
Original line number Diff line number Diff line
@@ -204,8 +204,8 @@ static struct irq_chip toshiba_rbtx4927_irq_ioc_type = { 
	.mask_ack = toshiba_rbtx4927_irq_ioc_disable,

	.unmask = toshiba_rbtx4927_irq_ioc_enable,

};

#define TOSHIBA_RBTX4927_IOC_INTR_ENAB 0xbc002000

#define TOSHIBA_RBTX4927_IOC_INTR_STAT 0xbc002006

#define TOSHIBA_RBTX4927_IOC_INTR_ENAB (void __iomem *)0xbc002000UL

#define TOSHIBA_RBTX4927_IOC_INTR_STAT (void __iomem *)0xbc002006UL





u32 bit2num(u32 num)
@@ -224,7 +224,7 @@ int toshiba_rbtx4927_irq_nested(int sw_irq) 
{

	u32 level3;



	level3 = reg_rd08(TOSHIBA_RBTX4927_IOC_INTR_STAT) & 0x1f;

	level3 = readb(TOSHIBA_RBTX4927_IOC_INTR_STAT) & 0x1f;

	if (level3) {

		sw_irq = TOSHIBA_RBTX4927_IRQ_IOC_BEG + bit2num(level3);

		if (sw_irq != TOSHIBA_RBTX4927_IRQ_NEST_ISA_ON_IOC) {
@@ -288,9 +288,9 @@ static void toshiba_rbtx4927_irq_ioc_enable(unsigned int irq) 
		panic("\n");

	}



	v = TX4927_RD08(TOSHIBA_RBTX4927_IOC_INTR_ENAB);

	v = readb(TOSHIBA_RBTX4927_IOC_INTR_ENAB);

	v |= (1 << (irq - TOSHIBA_RBTX4927_IRQ_IOC_BEG));

	TOSHIBA_RBTX4927_WR08(TOSHIBA_RBTX4927_IOC_INTR_ENAB, v);

	writeb(v, TOSHIBA_RBTX4927_IOC_INTR_ENAB);

}
@@ -308,9 +308,10 @@ static void toshiba_rbtx4927_irq_ioc_disable(unsigned int irq) 
		panic("\n");

	}



	v = TX4927_RD08(TOSHIBA_RBTX4927_IOC_INTR_ENAB);

	v = readb(TOSHIBA_RBTX4927_IOC_INTR_ENAB);

	v &= ~(1 << (irq - TOSHIBA_RBTX4927_IRQ_IOC_BEG));

	TOSHIBA_RBTX4927_WR08(TOSHIBA_RBTX4927_IOC_INTR_ENAB, v);

	writeb(v, TOSHIBA_RBTX4927_IOC_INTR_ENAB);

	mmiowb();

}
@@ -387,12 +388,12 @@ void toshiba_rbtx4927_irq_dump_pics(char *s) 
	level1_m = level0_m;

	level1_s = level0_s & 0x87;



	level2 = TX4927_RD(0xff1ff6a0);

	level2 = __raw_readl((void __iomem *)0xff1ff6a0UL);

	level2_p = (((level2 & 0x10000)) ? 0 : 1);

	level2_s = (((level2 & 0x1f) == 0x1f) ? 0 : (level2 & 0x1f));



	level3_m = reg_rd08(TOSHIBA_RBTX4927_IOC_INTR_ENAB) & 0x1f;

	level3_s = reg_rd08(TOSHIBA_RBTX4927_IOC_INTR_STAT) & 0x1f;

	level3_m = readb(TOSHIBA_RBTX4927_IOC_INTR_ENAB) & 0x1f;

	level3_s = readb(TOSHIBA_RBTX4927_IOC_INTR_STAT) & 0x1f;



	level4_m = inb(0x21);

	outb(0x0A, 0x20);

arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c

+13 −19
Original line number Diff line number Diff line
@@ -679,25 +679,30 @@ void __init tx4927_pci_setup(void) 


#endif /* CONFIG_PCI */



static void __noreturn wait_forever(void)

{

	while (1)

		if (cpu_wait)

			(*cpu_wait)();

}



void toshiba_rbtx4927_restart(char *command)

{

	printk(KERN_NOTICE "System Rebooting...\n");



	/* enable the s/w reset register */

	reg_wr08(RBTX4927_SW_RESET_ENABLE, RBTX4927_SW_RESET_ENABLE_SET);

	writeb(RBTX4927_SW_RESET_ENABLE_SET, RBTX4927_SW_RESET_ENABLE);



	/* wait for enable to be seen */

	while ((reg_rd08(RBTX4927_SW_RESET_ENABLE) &

	while ((readb(RBTX4927_SW_RESET_ENABLE) &

		RBTX4927_SW_RESET_ENABLE_SET) == 0x00);



	/* do a s/w reset */

	reg_wr08(RBTX4927_SW_RESET_DO, RBTX4927_SW_RESET_DO_SET);

	writeb(RBTX4927_SW_RESET_DO_SET, RBTX4927_SW_RESET_DO);



	/* do something passive while waiting for reset */

	local_irq_disable();

	while (1)

		asm_wait();



	wait_forever();

	/* no return */

}
@@ -706,9 +711,7 @@ void toshiba_rbtx4927_halt(void) 
{

	printk(KERN_NOTICE "System Halted\n");

	local_irq_disable();

	while (1) {

		asm_wait();

	}

	wait_forever();

	/* no return */

}
@@ -720,7 +723,7 @@ void toshiba_rbtx4927_power_off(void) 


void __init toshiba_rbtx4927_setup(void)

{

	vu32 cp0_config;

	u32 cp0_config;

	char *argptr;



	printk("CPU is %s\n", toshiba_name);
@@ -747,15 +750,6 @@ void __init toshiba_rbtx4927_setup(void) 
	}

#endif



	/* setup serial stuff */

	TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_SETUP,

				       ":Setting up tx4927 sio.\n");

	TX4927_WR(0xff1ff314, 0x00000000);	/* h/w flow control off */

	TX4927_WR(0xff1ff414, 0x00000000);	/* h/w flow control off */



	TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_SETUP,

				       "+\n");



	set_io_port_base(KSEG1 + TBTX4927_ISA_IO_OFFSET);

	TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_SETUP,

				       ":mips_io_port_base=0x%08lx\n",