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

Commit b55a0ff8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull m68knommu updates from Greg Ungerer:
 "Nothing too big, just a handfull of small changes.

  A couple of dragonball fixes, coldfire qspi cleanup and fixes, and
  some coldfire gpio cleanup, fixes and extensions"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: Implement gpio support for m54xx.
  m68knommu: Make everything thats not exported, static.
  m68knommu: setting the gpio data direction register to output doesn't dependent upon the value to output!
  m68knommu: add to_irq function so we can map gpios to external interrupts.
  m68knommu: qspi declutter.
  m68knommu: Fix the 5249/525x qspi base address.
  m68knommu: Add qspi clk for Coldfire SoCs without real clks.
  m68k: fix a compiler warning when building for DragonBall
  m68knommu: Fix mach_sched_init for EZ and VZ DragonBall chips
parents a727eaf6 83c6bdb8

arch/m68k/include/asm/m525xsim.h

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ 
/*

 *	QSPI module.

 */

#define MCFQSPI_BASE		(MCF_MBAR + 0x300)	/* Base address QSPI */

#define MCFQSPI_BASE		(MCF_MBAR + 0x400)	/* Base address QSPI */

#define MCFQSPI_SIZE		0x40			/* Register set size */



#ifdef CONFIG_M5249

arch/m68k/include/asm/m54xxsim.h

+9 −3
Original line number Diff line number Diff line
@@ -55,9 +55,15 @@ 
/*

 *	Generic GPIO support

 */

#define MCFGPIO_PIN_MAX		0	/* I am too lazy to count */

#define MCFGPIO_IRQ_MAX		-1

#define MCFGPIO_IRQ_VECBASE	-1

#define MCFGPIO_PODR		(MCF_MBAR + 0xA00)

#define MCFGPIO_PDDR		(MCF_MBAR + 0xA10)

#define MCFGPIO_PPDR		(MCF_MBAR + 0xA20)

#define MCFGPIO_SETR		(MCF_MBAR + 0xA20)

#define MCFGPIO_CLRR		(MCF_MBAR + 0xA30)



#define MCFGPIO_PIN_MAX		136	/* 128 gpio + 8 eport */

#define MCFGPIO_IRQ_MAX		8

#define MCFGPIO_IRQ_VECBASE	MCFINT_VECBASE



/*

 *	EDGE Port support.

arch/m68k/include/asm/mcfgpio.h

+8 −4
Original line number Diff line number Diff line
@@ -139,7 +139,8 @@ static inline void gpio_free(unsigned gpio) 


#if defined(CONFIG_M520x) || defined(CONFIG_M523x) || \

    defined(CONFIG_M527x) || defined(CONFIG_M528x) || \

    defined(CONFIG_M53xx) || defined(CONFIG_M5441x)

    defined(CONFIG_M53xx) || defined(CONFIG_M54xx) || \

    defined(CONFIG_M5441x)

/*

 * These parts have an 'Edge' Port module (external interrupt/GPIO) which uses

 * read-modify-write to change an output and a GPIO module which has separate
@@ -195,7 +196,8 @@ static inline u32 __mcfgpio_ppdr(unsigned gpio) 
		return MCFSIM2_GPIO1READ;

#elif defined(CONFIG_M520x) || defined(CONFIG_M523x) || \

      defined(CONFIG_M527x) || defined(CONFIG_M528x) || \

      defined(CONFIG_M53xx) || defined(CONFIG_M5441x)

      defined(CONFIG_M53xx) || defined(CONFIG_M54xx) || \

      defined(CONFIG_M5441x)

#if !defined(CONFIG_M5441x)

	if (gpio < 8)

		return MCFEPORT_EPPDR;
@@ -237,7 +239,8 @@ static inline u32 __mcfgpio_podr(unsigned gpio) 
		return MCFSIM2_GPIO1WRITE;

#elif defined(CONFIG_M520x) || defined(CONFIG_M523x) || \

      defined(CONFIG_M527x) || defined(CONFIG_M528x) || \

      defined(CONFIG_M53xx) || defined(CONFIG_M5441x)

      defined(CONFIG_M53xx) || defined(CONFIG_M54xx) || \

      defined(CONFIG_M5441x)

#if !defined(CONFIG_M5441x)

	if (gpio < 8)

		return MCFEPORT_EPDR;
@@ -279,7 +282,8 @@ static inline u32 __mcfgpio_pddr(unsigned gpio) 
		return MCFSIM2_GPIO1ENABLE;

#elif defined(CONFIG_M520x) || defined(CONFIG_M523x) || \

      defined(CONFIG_M527x) || defined(CONFIG_M528x) || \

      defined(CONFIG_M53xx) || defined(CONFIG_M5441x)

      defined(CONFIG_M53xx) || defined(CONFIG_M54xx) || \

      defined(CONFIG_M5441x)

#if !defined(CONFIG_M5441x)

	if (gpio < 8)

		return MCFEPORT_EPDDR;

arch/m68k/kernel/setup_no.c

+6 −7
Original line number Diff line number Diff line
@@ -58,17 +58,16 @@ void (*mach_halt)(void); 
void (*mach_power_off)(void);



#ifdef CONFIG_M68000

#define CPU_NAME	"MC68000"

#endif

#ifdef CONFIG_M68328

#if defined(CONFIG_M68328)

#define CPU_NAME	"MC68328"

#endif

#ifdef CONFIG_M68EZ328

#elif defined(CONFIG_M68EZ328)

#define CPU_NAME	"MC68EZ328"

#endif

#ifdef CONFIG_M68VZ328

#elif defined(CONFIG_M68VZ328)

#define CPU_NAME	"MC68VZ328"

#else

#define CPU_NAME	"MC68000"

#endif

#endif /* CONFIG_M68000 */

#ifdef CONFIG_M68360

#define CPU_NAME	"MC68360"

#endif

arch/m68k/platform/68000/m68EZ328.c

+2 −1
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ void __init config_BSP(char *command, int len) 
  else command[0] = 0;

#endif



  mach_sched_init = hw_timer_init;

  mach_hwclk = m68328_hwclk;

  mach_reset = m68ez328_reset;

}