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

Commit 2f66b529 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus 

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Fix marge error due to conflict in arch/mips/kernel/head.S
  [MIPS] ARC: Remove unused arch/mips/arc/console.c
  [MIPS] SNI: sniprom
  [MIPS] Jazz: remove unneeded reset functions
  [MIPS] Whitespace cleanup.
  [MIPS] Make resources for ds1742 "static __initdata"
  [MIPS] Replace __attribute_used__ with __used
  [MIPS] Jazz: Remove unused arch/mips/jazz/io.c
  [MIPS] Mark prom_free_prom_memory as __init_refok
  [MIPS] MIPSsim: Fix cflags
parents 1e66239e cdcc9eb5

arch/mips/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -328,7 +328,7 @@ load-$(CONFIG_MIPS_SEAD) += 0xffffffff80100000 
# MIPS SIM

# MIPS SIM

#

#

core-$(CONFIG_MIPS_SIM)		+= arch/mips/mipssim/

core-$(CONFIG_MIPS_SIM)		+= arch/mips/mipssim/

cflags-$(CONFIG_MIPS_SIM)	+= -Iinclude/asm-mips/mach-sim

cflags-$(CONFIG_MIPS_SIM)	+= -Iinclude/asm-mips/mach-mipssim

load-$(CONFIG_MIPS_SIM)		+= 0x80100000

load-$(CONFIG_MIPS_SIM)		+= 0x80100000





#

#

arch/mips/arc/console.c

deleted100644 → 0
+0 −31
Original line number Original line Diff line number Diff line 
/*

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 *

 * Copyright (C) 1996 David S. Miller (dm@sgi.com)

 * Compability with board caches, Ulf Carlsson

 */

#include <linux/kernel.h>

#include <asm/sgialib.h>

#include <asm/bcache.h>



/*

 * IP22 boardcache is not compatible with board caches.  Thus we disable it

 * during romvec action.  Since r4xx0.c is always compiled and linked with your

 * kernel, this shouldn't cause any harm regardless what MIPS processor you

 * have.

 *

 * The ARC write and read functions seem to interfere with the serial lines

 * in some way. You should be careful with them.

 */



void prom_putchar(char c)

{

	ULONG cnt;

	CHAR it = c;



	bc_disable();

	ArcWrite(1, &it, 1, &cnt);

	bc_enable();

}

arch/mips/jazz/io.c

deleted100644 → 0
+0 −135
Original line number Original line Diff line number Diff line 
/*

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 *

 * Low level I/O functions for Jazz family machines.

 *

 * Copyright (C) 1997 by Ralf Baechle.

 */

#include <linux/string.h>

#include <linux/spinlock.h>

#include <asm/addrspace.h>

#include <asm/system.h>

#include <asm/jazz.h>



/*

 * Map an 16mb segment of the EISA address space to 0xe3000000;

 */

static inline void map_eisa_address(unsigned long address)

{

  /* XXX */

  /* We've got an wired entry in the TLB.  We just need to modify it.

     fast and clean.  But since we want to get rid of wired entries

     things are a little bit more complicated ... */

}



static unsigned char jazz_readb(unsigned long addr)

{

	unsigned char res;



	map_eisa_address(addr);

	addr &= 0xffffff;

	res = *(volatile unsigned char *) (JAZZ_EISA_BASE + addr);



	return res;

}



static unsigned short jazz_readw(unsigned long addr)

{

	unsigned short res;



	map_eisa_address(addr);

	addr &= 0xffffff;

	res = *(volatile unsigned char *) (JAZZ_EISA_BASE + addr);



	return res;

}



static unsigned int jazz_readl(unsigned long addr)

{

	unsigned int res;



	map_eisa_address(addr);

	addr &= 0xffffff;

	res = *(volatile unsigned char *) (JAZZ_EISA_BASE + addr);



	return res;

}



static void jazz_writeb(unsigned char val, unsigned long addr)

{

	map_eisa_address(addr);

	addr &= 0xffffff;

	*(volatile unsigned char *) (JAZZ_EISA_BASE + addr) = val;

}



static void jazz_writew(unsigned short val, unsigned long addr)

{

	map_eisa_address(addr);

	addr &= 0xffffff;

	*(volatile unsigned char *) (JAZZ_EISA_BASE + addr) = val;

}



static void jazz_writel(unsigned int val, unsigned long addr)

{

	map_eisa_address(addr);

	addr &= 0xffffff;

	*(volatile unsigned char *) (JAZZ_EISA_BASE + addr) = val;

}



static void jazz_memset_io(unsigned long addr, int val, unsigned long len)

{

	unsigned long waddr;



	waddr = JAZZ_EISA_BASE | (addr & 0xffffff);

	while(len) {

		unsigned long fraglen;



		fraglen = (~addr + 1) & 0xffffff;

		fraglen = (fraglen < len) ? fraglen : len;

		map_eisa_address(addr);

		memset((char *)waddr, val, fraglen);

		addr += fraglen;

		waddr = waddr + fraglen - 0x1000000;

		len -= fraglen;

	}

}



static void jazz_memcpy_fromio(unsigned long to, unsigned long from, unsigned long len)

{

	unsigned long waddr;



	waddr = JAZZ_EISA_BASE | (from & 0xffffff);

	while(len) {

		unsigned long fraglen;



		fraglen = (~from + 1) & 0xffffff;

		fraglen = (fraglen < len) ? fraglen : len;

		map_eisa_address(from);

		memcpy((void *)to, (void *)waddr, fraglen);

		to += fraglen;

		from += fraglen;

		waddr = waddr + fraglen - 0x1000000;

		len -= fraglen;

	}

}



static void jazz_memcpy_toio(unsigned long to, unsigned long from, unsigned long len)

{

	unsigned long waddr;



	waddr = JAZZ_EISA_BASE | (to & 0xffffff);

	while(len) {

		unsigned long fraglen;



		fraglen = (~to + 1) & 0xffffff;

		fraglen = (fraglen < len) ? fraglen : len;

		map_eisa_address(to);

		memcpy((char *)to + JAZZ_EISA_BASE, (void *)from, fraglen);

		to += fraglen;

		from += fraglen;

		waddr = waddr + fraglen - 0x1000000;

		len -= fraglen;

	}

}

arch/mips/jazz/reset.c

+0 −13
Original line number Original line Diff line number Diff line
@@ -6,10 +6,6 @@ 
 */

 */

#include <linux/jiffies.h>

#include <linux/jiffies.h>

#include <asm/jazz.h>

#include <asm/jazz.h>

#include <asm/io.h>

#include <asm/system.h>

#include <asm/reboot.h>

#include <asm/delay.h>





#define KBD_STAT_IBF		0x02	/* Keyboard input buffer full */

#define KBD_STAT_IBF		0x02	/* Keyboard input buffer full */
@@ -58,12 +54,3 @@ void jazz_machine_restart(char *command) 
		jazz_write_output (0x00);

		jazz_write_output (0x00);

	}

	}

}
 
}
 


void jazz_machine_halt(void)

{

}



void jazz_machine_power_off(void)

{

	/* Jazz machines don't have a software power switch */

}

arch/mips/jazz/setup.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -34,8 +34,6 @@ 
extern asmlinkage void jazz_handle_int(void);

extern asmlinkage void jazz_handle_int(void);





extern void jazz_machine_restart(char *command);

extern void jazz_machine_restart(char *command);

extern void jazz_machine_halt(void);

extern void jazz_machine_power_off(void);





void __init plat_timer_setup(struct irqaction *irq)

void __init plat_timer_setup(struct irqaction *irq)

{

{
@@ -95,8 +93,6 @@ void __init plat_mem_setup(void) 
	/* The RTC is outside the port address space */

	/* The RTC is outside the port address space */





	_machine_restart = jazz_machine_restart;

	_machine_restart = jazz_machine_restart;

	_machine_halt = jazz_machine_halt;

	pm_power_off = jazz_machine_power_off;





	screen_info = (struct screen_info) {

	screen_info = (struct screen_info) {

		0, 0,		/* orig-x, orig-y */

		0, 0,		/* orig-x, orig-y */