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

Commit 0d34c86c authored by Hirokazu Takata's avatar Hirokazu Takata Committed by Linus Torvalds
Browse files

[PATCH] m32r: mappi3 reboot support 



Here is a patch to support a reboot function for M3A-2170(Mappi-III)
evaluation board.

Signed-off-by: default avatarHayato Fujiwara <fujiwara@linux-m32r.org>
Signed-off-by: default avatarHirokazu Takata <takata@linux-m32r.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent fa372810

arch/m32r/kernel/process.c

+4 −0
Original line number Diff line number Diff line
@@ -116,6 +116,10 @@ void cpu_idle (void) 


void machine_restart(char *__unused)

{

#if defined(CONFIG_PLAT_MAPPI3)

	outw(1, (unsigned long)PLD_REBOOT);

#endif



	printk("Please push reset button!\n");

	while (1)

		cpu_relax();

include/asm-m32r/mappi3/mappi3_pld.h

+11 −11
Original line number Diff line number Diff line
@@ -53,17 +53,15 @@ 
/* Power Control of MMC and CF */

#define PLD_CPCR		__reg16(PLD_BASE + 0x14000)





/*==== ICU ====*/

/* ICU */

#define M32R_IRQ_PC104		(5)	/* INT4(PC/104) */

#define M32R_IRQ_I2C		(28)	/* I2C-BUS */

#define PLD_IRQ_CFIREQ		(6)	/* INT5 CFC Card Interrupt */

#define  PLD_IRQ_CFC_INSERT   (7)  /* INT6 CFC Card Insert */

#define PLD_IRQ_CFC_INSERT	(7)	/* INT6 CFC Card Insert & Eject */

#define PLD_IRQ_IDEIREQ		(8)	/* INT7 IDE Interrupt */

#define PLD_IRQ_MMCCARD		(43)	/* MMC Card Insert */

#define PLD_IRQ_MMCIRQ		(44)	/* MMC Transfer Done */





#if 0

/* LED Control

 *
@@ -97,7 +95,6 @@ 
#define PLD_CRC16ADATA		__reg16(PLD_BASE + 0x18008)

#define PLD_CRC16AINDATA	__reg16(PLD_BASE + 0x1800a)





#if 0

/* RTC */

#define PLD_RTCCR		__reg16(PLD_BASE + 0x1c000)
@@ -140,4 +137,7 @@ 


#endif



/* Reset Control */

#define PLD_REBOOT		__reg16(PLD_BASE + 0x38000)



#endif	/* _MAPPI3_PLD.H */