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

Commit 4388817f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull m68knommu fixes from Greg Ungerer:
 "It contains a few small fixes for the non-MMU m68k platforms.  Fixes
  some compilation problems, some broken header definitions, removes an
  unused config option and adds a name for the old 68000 CPU support."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: drop "select EMAC_INC"
  m68knommu: fix misnamed GPIO pin definition for ColdFire 528x CPU
  m68knommu: fix MC68328.h defines
  m68knommu: fix build when CPU is not coldfire
  m68knommu: add CPU_NAME for 68000
parents fa4a6732 ef9240f4

arch/m68k/Kconfig.machine

+0 −1
Original line number Diff line number Diff line
@@ -310,7 +310,6 @@ config COBRA5282 
config SOM5282EM

	bool "EMAC.Inc SOM5282EM board support"

	depends on M528x

	select EMAC_INC

	help

	  Support for the EMAC.Inc SOM5282EM module.

arch/m68k/include/asm/MC68328.h

+5 −5
Original line number Diff line number Diff line
@@ -757,7 +757,7 @@ 


/* 'EZ328-compatible definitions */

#define TCN_ADDR	TCN1_ADDR

#define TCN		TCN

#define TCN		TCN1



/*

 * Timer Unit 1 and 2 Status Registers

arch/m68k/kernel/setup_no.c

+3 −0
Original line number Diff line number Diff line
@@ -57,6 +57,9 @@ void (*mach_reset)(void); 
void (*mach_halt)(void);

void (*mach_power_off)(void);



#ifdef CONFIG_M68000

#define CPU_NAME	"MC68000"

#endif

#ifdef CONFIG_M68328

#define CPU_NAME	"MC68328"

#endif

arch/m68k/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ void __init mem_init(void) 
		}

	}



#if !defined(CONFIG_SUN3) && !defined(CONFIG_COLDFIRE)

#if defined(CONFIG_MMU) && !defined(CONFIG_SUN3) && !defined(CONFIG_COLDFIRE)

	/* insert pointer tables allocated so far into the tablelist */

	init_pointer_table((unsigned long)kernel_pg_dir);

	for (i = 0; i < PTRS_PER_PGD; i++) {

arch/m68k/platform/coldfire/m528x.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static void __init m528x_uarts_init(void) 
	u8 port;



	/* make sure PUAPAR is set for UART0 and UART1 */

	port = readb(MCF5282_GPIO_PUAPAR);

	port = readb(MCFGPIO_PUAPAR);

	port |= 0x03 | (0x03 << 2);

	writeb(port, MCFGPIO_PUAPAR);

}