---

yaml --- r: 133314 b: refs/heads/master c: df4d4f1 h: refs/heads/master v: v3
git-mirror · Mar 10, 2009 · 1ed1982 · 1ed1982
1 parent d3c64c2
commit 1ed1982
Show file tree

Hide file tree

Showing 4 changed files with 1,564 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f47f44790a9c8fc43e515df3c6be19a35ee5de5
+refs/heads/master: df4d4f1a47ed6080c7b4010149126bd1013dc3f1
diff --git a/trunk/arch/sh/boards/Kconfig b/trunk/arch/sh/boards/Kconfig
@@ -155,7 +155,7 @@ config SH_SH7785LCR
 
 config SH_SH7785LCR_29BIT_PHYSMAPS
 	bool "SH7785LCR 29bit physmaps"
-	depends on SH_SH7785LCR
+	depends on SH_SH7785LCR && 29BIT
 	default y
 	help
 	  This board has 2 physical memory maps. It can be changed with

diff --git a/trunk/arch/sh/boards/board-sh7785lcr.c b/trunk/arch/sh/boards/board-sh7785lcr.c
@@ -275,7 +275,15 @@ void __init init_sh7785lcr_IRQ(void)
 
 static void sh7785lcr_power_off(void)
 {
-	ctrl_outb(0x01, P2SEGADDR(PLD_POFCR));
+	unsigned char *p;
+
+	p = ioremap(PLD_POFCR, PLD_POFCR + 1);
+	if (!p) {
+		printk(KERN_ERR "%s: ioremap error.\n", __func__);
+		return;
+	}
+	*p = 0x01;
+	iounmap(p);
 }
 
 /* Initialize the board */