Commit 01ed875a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k/amiga: Fix "debug=mem"
  m68k/atari: Rename "scc" to "atari_scc"
  m68k: Uninline strchr()
parents 8348ad7c 5df1abdb

arch/m68k/amiga/config.c

+7 −9
Original line number Diff line number Diff line
@@ -610,17 +610,17 @@ static void amiga_mem_console_write(struct console *co, const char *s, 


static int __init amiga_savekmsg_setup(char *arg)

{

	static struct resource debug_res = { .name = "Debug" };



	if (!MACH_IS_AMIGA || strcmp(arg, "mem"))

		goto done;

		return 0;



	if (!AMIGAHW_PRESENT(CHIP_RAM)) {

		printk("Warning: no chipram present for debugging\n");

		goto done;

	if (amiga_chip_size < SAVEKMSG_MAXMEM) {

		pr_err("Not enough chipram for debugging\n");

		return -ENOMEM;

	}



	savekmsg = amiga_chip_alloc_res(SAVEKMSG_MAXMEM, &debug_res);

	/* Just steal the block, the chipram allocator isn't functional yet */

	amiga_chip_size -= SAVEKMSG_MAXMEM;

	savekmsg = (void *)ZTWO_VADDR(CHIP_PHYSADDR + amiga_chip_size);

	savekmsg->magic1 = SAVEKMSG_MAGIC1;

	savekmsg->magic2 = SAVEKMSG_MAGIC2;

	savekmsg->magicptr = ZTWO_PADDR(savekmsg);
@@ -628,8 +628,6 @@ static int __init amiga_savekmsg_setup(char *arg) 


	amiga_console_driver.write = amiga_mem_console_write;

	register_console(&amiga_console_driver);



done:

	return 0;

}

arch/m68k/atari/ataints.c

+2 −2
Original line number Diff line number Diff line
@@ -388,9 +388,9 @@ void __init atari_init_IRQ(void) 
	}



	if (ATARIHW_PRESENT(SCC) && !atari_SCC_reset_done) {

		scc.cha_a_ctrl = 9;

		atari_scc.cha_a_ctrl = 9;

		MFPDELAY();

		scc.cha_a_ctrl = (char) 0xc0; /* hardware reset */

		atari_scc.cha_a_ctrl = (char) 0xc0; /* hardware reset */

	}



	if (ATARIHW_PRESENT(SCU)) {

arch/m68k/atari/config.c

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ void __init config_atari(void) 
		ATARIHW_SET(SCC_DMA);

		printk("SCC_DMA ");

	}

	if (scc_test(&scc.cha_a_ctrl)) {

	if (scc_test(&atari_scc.cha_a_ctrl)) {

		ATARIHW_SET(SCC);

		printk("SCC ");

	}

arch/m68k/atari/debug.c

+7 −7
Original line number Diff line number Diff line
@@ -53,9 +53,9 @@ static inline void ata_scc_out(char c) 
{

	do {

		MFPDELAY();

	} while (!(scc.cha_b_ctrl & 0x04)); /* wait for tx buf empty */

	} while (!(atari_scc.cha_b_ctrl & 0x04)); /* wait for tx buf empty */

	MFPDELAY();

	scc.cha_b_data = c;

	atari_scc.cha_b_data = c;

}



static void atari_scc_console_write(struct console *co, const char *str,
@@ -140,9 +140,9 @@ int atari_scc_console_wait_key(struct console *co) 
{

	do {

		MFPDELAY();

	} while (!(scc.cha_b_ctrl & 0x01)); /* wait for rx buf filled */

	} while (!(atari_scc.cha_b_ctrl & 0x01)); /* wait for rx buf filled */

	MFPDELAY();

	return scc.cha_b_data;

	return atari_scc.cha_b_data;

}



int atari_midi_console_wait_key(struct console *co)
@@ -185,9 +185,9 @@ static void __init atari_init_mfp_port(int cflag) 


#define SCC_WRITE(reg, val)				\

	do {						\

		scc.cha_b_ctrl = (reg);			\

		atari_scc.cha_b_ctrl = (reg);		\

		MFPDELAY();				\

		scc.cha_b_ctrl = (val);			\

		atari_scc.cha_b_ctrl = (val);		\

		MFPDELAY();				\

	} while (0)
@@ -240,7 +240,7 @@ static void __init atari_init_scc_port(int cflag) 
	reg3 = (cflag & CSIZE) == CS8 ? 0xc0 : 0x40;

	reg5 = (cflag & CSIZE) == CS8 ? 0x60 : 0x20 | 0x82 /* assert DTR/RTS */;



	(void)scc.cha_b_ctrl;		/* reset reg pointer */

	(void)atari_scc.cha_b_ctrl;	/* reset reg pointer */

	SCC_WRITE(9, 0xc0);		/* reset */

	LONG_DELAY();			/* extra delay after WR9 access */

	SCC_WRITE(4, (cflag & PARENB) ? ((cflag & PARODD) ? 0x01 : 0x03)

arch/m68k/include/asm/atarihw.h

+1 −1
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ struct SCC 
  u_char char_dummy3;

  u_char cha_b_data;

 };

# define scc ((*(volatile struct SCC*)SCC_BAS))

# define atari_scc ((*(volatile struct SCC*)SCC_BAS))



/* The ESCC (Z85230) in an Atari ST. The channels are reversed! */

# define st_escc ((*(volatile struct SCC*)0xfffffa31))