sh: Kill off the cayman and microdev special heartbeat code.

These can use the generic code instead.

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

diff --git a/arch/sh/boards/mach-cayman/Makefile b/arch/sh/boards/mach-cayman/Makefile
index 489a8f8673681e94e5d63654627e9bf8d4dbfc3f..cafe1ac3b29c288570e0ac5cd14743b35174e7fe 100644 (file)
--- a/arch/sh/boards/mach-cayman/Makefile
+++ b/arch/sh/boards/mach-cayman/Makefile
@@ -2,4 +2,3 @@
 # Makefile for the Hitachi Cayman specific parts of the kernel
 #
 obj-y := setup.o irq.o
-obj-$(CONFIG_HEARTBEAT)        += led.o

diff --git a/arch/sh/boards/mach-cayman/led.c b/arch/sh/boards/mach-cayman/led.c
deleted file mode 100644 (file)
index a808eac..0000000
--- a/arch/sh/boards/mach-cayman/led.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * arch/sh/boards/cayman/led.c
- *
- * Copyright (C) 2002 Stuart Menefy <stuart.menefy@st.com>
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * Flash the LEDs
- */
-#include <asm/io.h>
-
-/*
-** It is supposed these functions to be used for a low level
-** debugging (via Cayman LEDs), hence to be available as soon
-** as possible.
-** Unfortunately Cayman LEDs relies on Cayman EPLD to be mapped
-** (this happen when IRQ are initialized... quite late).
-** These triky dependencies should be removed. Temporary, it
-** may be enough to NOP until EPLD is mapped.
-*/
-
-extern unsigned long epld_virt;
-
-#define LED_ADDR      (epld_virt + 0x008)
-#define HDSP2534_ADDR (epld_virt + 0x100)
-
-void mach_led(int position, int value)
-{
-       if (!epld_virt)
-               return;
-
-       if (value)
-               ctrl_outl(0, LED_ADDR);
-       else
-               ctrl_outl(1, LED_ADDR);
-
-}
-
-void mach_alphanum(int position, unsigned char value)
-{
-       if (!epld_virt)
-               return;
-
-       ctrl_outb(value, HDSP2534_ADDR + 0xe0 + (position << 2));
-}
-
-void mach_alphanum_brightness(int setting)
-{
-       ctrl_outb(setting & 7, HDSP2534_ADDR + 0xc0);
-}

diff --git a/arch/sh/boards/mach-microdev/Makefile b/arch/sh/boards/mach-microdev/Makefile
index 1387dd6c85eb53281a35a296ac6632e6b1db2985..57f6375043f479d3ea25583eba207dbc69a3f673 100644 (file)
--- a/arch/sh/boards/mach-microdev/Makefile
+++ b/arch/sh/boards/mach-microdev/Makefile
@@ -3,6 +3,3 @@
 #
 
 obj-y   := setup.o irq.o io.o
-
-obj-$(CONFIG_HEARTBEAT)        += led.o
-

diff --git a/arch/sh/boards/mach-microdev/led.c b/arch/sh/boards/mach-microdev/led.c
deleted file mode 100644 (file)
index 36e54b4..0000000
--- a/arch/sh/boards/mach-microdev/led.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * linux/arch/sh/boards/superh/microdev/led.c
- *
- * Copyright (C) 2002 Stuart Menefy <stuart.menefy@st.com>
- * Copyright (C) 2003 Richard Curnow (Richard.Curnow@superh.com)
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- */
-
-#include <asm/io.h>
-
-#define LED_REGISTER 0xa6104d20
-
-static void mach_led_d9(int value)
-{
-       unsigned long reg;
-       reg = ctrl_inl(LED_REGISTER);
-       reg &= ~1;
-       reg |= (value & 1);
-       ctrl_outl(reg, LED_REGISTER);
-       return;
-}
-
-static void mach_led_d10(int value)
-{
-       unsigned long reg;
-       reg = ctrl_inl(LED_REGISTER);
-       reg &= ~2;
-       reg |= ((value & 1) << 1);
-       ctrl_outl(reg, LED_REGISTER);
-       return;
-}
-
-
-#ifdef CONFIG_HEARTBEAT
-#include <linux/sched.h>
-
-static unsigned char banner_table[] = {
-       0x11, 0x01, 0x11, 0x01, 0x11, 0x03,
-       0x11, 0x01, 0x11, 0x01, 0x13, 0x03,
-       0x11, 0x01, 0x13, 0x01, 0x13, 0x01, 0x11, 0x03,
-       0x11, 0x03,
-       0x11, 0x01, 0x13, 0x01, 0x11, 0x03,
-       0x11, 0x01, 0x11, 0x01, 0x11, 0x01, 0x11, 0x07,
-       0x13, 0x01, 0x13, 0x03,
-       0x11, 0x01, 0x11, 0x03,
-       0x13, 0x01, 0x11, 0x01, 0x13, 0x01, 0x11, 0x03,
-       0x11, 0x01, 0x13, 0x01, 0x11, 0x03,
-       0x13, 0x01, 0x13, 0x01, 0x13, 0x03,
-       0x13, 0x01, 0x11, 0x01, 0x11, 0x03,
-       0x11, 0x03,
-       0x11, 0x01, 0x11, 0x01, 0x11, 0x01, 0x13, 0x07,
-       0xff
-};
-
-static void banner(void)
-{
-       static int pos = 0;
-       static int count = 0;
-
-       if (count) {
-               count--;
-       } else {
-               int val = banner_table[pos];
-               if (val == 0xff) {
-                       pos = 0;
-                       val = banner_table[pos];
-               }
-               pos++;
-               mach_led_d10((val >> 4) & 1);
-               count = 10 * (val & 0xf);
-       }
-}
-
-/* From heartbeat_harp in the stboards directory */
-/* acts like an actual heart beat -- ie thump-thump-pause... */
-void microdev_heartbeat(void)
-{
-       static unsigned cnt = 0, period = 0, dist = 0;
-
-       if (cnt == 0 || cnt == dist)
-               mach_led_d9(1);
-       else if (cnt == 7 || cnt == dist+7)
-               mach_led_d9(0);
-
-       if (++cnt > period) {
-               cnt = 0;
-               /* The hyperbolic function below modifies the heartbeat period
-                * length in dependency of the current (5min) load. It goes
-                * through the points f(0)=126, f(1)=86, f(5)=51,
-                * f(inf)->30. */
-               period = ((672<<FSHIFT)/(5*avenrun[0]+(7<<FSHIFT))) + 30;
-               dist = period / 4;
-       }
-
-       banner();
-}
-
-#endif

diff --git a/arch/sh/boards/mach-microdev/setup.c b/arch/sh/boards/mach-microdev/setup.c
index a9202fe3cb590b2139ecdc878e6a00b52446b70a..9f5a97812e75223adcdf28bf25c8edc95fe18939 100644 (file)
--- a/arch/sh/boards/mach-microdev/setup.c
+++ b/arch/sh/boards/mach-microdev/setup.c
@@ -18,12 +18,6 @@
 #include <asm/io.h>
 #include <asm/machvec.h>
 
-extern void microdev_heartbeat(void);
-
-
-/****************************************************************************/
-
-
        /*
         * Setup for the SMSC FDC37C93xAPM
         */
@@ -398,8 +392,4 @@ static struct sh_machine_vector mv_sh4202_microdev __initmv = {
        .mv_outsl               = microdev_outsl,
 
        .mv_init_irq            = init_microdev_irq,
-
-#ifdef CONFIG_HEARTBEAT
-       .mv_heartbeat           = microdev_heartbeat,
-#endif
 };