sh: Move out cayman-specific panic handler code to its own file.

This moves out the cayman-specific panic handler code to a better
location, and leaves the generic implementation a simple stub that is
still used under emulation.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

3 files changed, 50 insertions, 44 deletions

diff --git a/arch/sh/boards/mach-cayman/Makefile b/arch/sh/boards/mach-cayman/Makefile
index cafe1ac3b29c..00fa3eaecb1b 100644
--- a/arch/sh/boards/mach-cayman/Makefile
+++ b/arch/sh/boards/mach-cayman/Makefile
@@ -1,4 +1,4 @@
 #
 # Makefile for the Hitachi Cayman specific parts of the kernel
 #
-obj-y := setup.o irq.o
+obj-y := setup.o irq.o panic.o
diff --git a/arch/sh/boards/mach-cayman/panic.c b/arch/sh/boards/mach-cayman/panic.c
new file mode 100644
index 000000000000..d1e67306d07c
--- /dev/null
+++ b/arch/sh/boards/mach-cayman/panic.c
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2003  Richard Curnow, SuperH UK Limited
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+
+#include <linux/kernel.h>
+#include <linux/io.h>
+#include <cpu/registers.h>
+
+/* THIS IS A PHYSICAL ADDRESS */
+#define HDSP2534_ADDR (0x04002100)
+
+static void poor_mans_delay(void)
+{
+        int i;
+
+        for (i = 0; i < 2500000; i++)
+                cpu_relax();
+}
+
+static void show_value(unsigned long x)
+{
+        int i;
+        unsigned nibble;
+        for (i = 0; i < 8; i++) {
+                nibble = ((x >> (i * 4)) & 0xf);
+
+                __raw_writeb(nibble + ((nibble > 9) ? 55 : 48),
+                          HDSP2534_ADDR + 0xe0 + ((7 - i) << 2));
+        }
+}
+
+void
+panic_handler(unsigned long panicPC, unsigned long panicSSR,
+              unsigned long panicEXPEVT)
+{
+        while (1) {
+                /* This piece of code displays the PC on the LED display */
+                show_value(panicPC);
+                poor_mans_delay();
+                show_value(panicSSR);
+                poor_mans_delay();
+                show_value(panicEXPEVT);
+                poor_mans_delay();
+        }
+}
diff --git a/arch/sh/lib64/panic.c b/arch/sh/lib64/panic.c
index da32ba7b5fcc..38c954e04f6a 100644
--- a/arch/sh/lib64/panic.c
+++ b/arch/sh/lib64/panic.c
@@ -6,53 +6,10 @@
  * for more details.
  */
 
-#include <linux/kernel.h>
-#include <asm/io.h>
-#include <cpu/registers.h>
-
-/* THIS IS A PHYSICAL ADDRESS */
-#define HDSP2534_ADDR (0x04002100)
-
-#ifdef CONFIG_SH_CAYMAN
-
-static void poor_mans_delay(void)
-{
-        int i;
-        for (i = 0; i < 2500000; i++) {
-        }               /* poor man's delay */
-}
-
-static void show_value(unsigned long x)
-{
-        int i;
-        unsigned nibble;
-        for (i = 0; i < 8; i++) {
-                nibble = ((x >> (i * 4)) & 0xf);
-
-                ctrl_outb(nibble + ((nibble > 9) ? 55 : 48),
-                          HDSP2534_ADDR + 0xe0 + ((7 - i) << 2));
-        }
-}
-
-#endif
-
 void
 panic_handler(unsigned long panicPC, unsigned long panicSSR,
               unsigned long panicEXPEVT)
 {
-#ifdef CONFIG_SH_CAYMAN
-        while (1) {
-                /* This piece of code displays the PC on the LED display */
-                show_value(panicPC);
-                poor_mans_delay();
-                show_value(panicSSR);
-                poor_mans_delay();
-                show_value(panicEXPEVT);
-                poor_mans_delay();
-        }
-#endif
-
         /* Never return from the panic handler */
         for (;;) ;
-
 }