Skip to content

Commit

Permalink
[PATCH] m32r: mappi3 reboot support
Browse files Browse the repository at this point in the history
Here is a patch to support a reboot function for M3A-2170(Mappi-III)
evaluation board.

Signed-off-by: Hayato Fujiwara <fujiwara@linux-m32r.org>
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Hirokazu Takata authored and Linus Torvalds committed Apr 19, 2006
1 parent fa37281 commit 0d34c86
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 11 deletions.
4 changes: 4 additions & 0 deletions arch/m32r/kernel/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
22 changes: 11 additions & 11 deletions include/asm-m32r/mappi3/mappi3_pld.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,14 @@
/* Power Control of MMC and CF */
#define PLD_CPCR __reg16(PLD_BASE + 0x14000)


/*==== 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_IDEIREQ (8) /* INT7 IDE Interrupt */
#define PLD_IRQ_MMCCARD (43) /* MMC Card Insert */
#define PLD_IRQ_MMCIRQ (44) /* MMC Transfer Done */

/* 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 & 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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -140,4 +137,7 @@

#endif

/* Reset Control */
#define PLD_REBOOT __reg16(PLD_BASE + 0x38000)

#endif /* _MAPPI3_PLD.H */

0 comments on commit 0d34c86

Please sign in to comment.