7 files changed, 151 insertions, 3 deletions

diff --git a/include/asm-sh/apm.h b/include/asm-sh/apm.h
new file mode 100644
index 000000000000..8b091e93651f
--- /dev/null
+++ b/include/asm-sh/apm.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2006 (c) Andriy Skulysh <askulysh@gmail.com>
+ *
+ * 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.
+ *
+ */
+
+#ifndef __ASM_SH_APM_H
+#define __ASM_SH_APM_H
+
+#define APM_AC_OFFLINE                  0
+#define APM_AC_ONLINE                   1
+#define APM_AC_BACKUP                   2
+#define APM_AC_UNKNOWN                  0xff
+
+#define APM_BATTERY_STATUS_HIGH         0
+#define APM_BATTERY_STATUS_LOW          1
+#define APM_BATTERY_STATUS_CRITICAL     2
+#define APM_BATTERY_STATUS_CHARGING     3
+#define APM_BATTERY_STATUS_NOT_PRESENT  4
+#define APM_BATTERY_STATUS_UNKNOWN      0xff
+
+#define APM_BATTERY_LIFE_UNKNOWN        0xFFFF
+#define APM_BATTERY_LIFE_MINUTES        0x8000
+#define APM_BATTERY_LIFE_VALUE_MASK     0x7FFF
+
+#define APM_BATTERY_FLAG_HIGH           (1 << 0)
+#define APM_BATTERY_FLAG_LOW            (1 << 1)
+#define APM_BATTERY_FLAG_CRITICAL       (1 << 2)
+#define APM_BATTERY_FLAG_CHARGING       (1 << 3)
+#define APM_BATTERY_FLAG_NOT_PRESENT    (1 << 7)
+#define APM_BATTERY_FLAG_UNKNOWN        0xff
+
+#define APM_UNITS_MINS                  0
+#define APM_UNITS_SECS                  1
+#define APM_UNITS_UNKNOWN               -1
+
+
+extern int (*apm_get_info)(char *buf, char **start, off_t fpos, int length);
+extern int apm_suspended;
+
+void apm_queue_event(apm_event_t event);
+
+#endif
diff --git a/include/asm-sh/cpu-sh3/freq.h b/include/asm-sh/cpu-sh3/freq.h
index b61b6e331df0..273f3229785c 100644
--- a/include/asm-sh/cpu-sh3/freq.h
+++ b/include/asm-sh/cpu-sh3/freq.h
@@ -18,5 +18,9 @@
 #define MIN_DIVISOR_NR          0
 #define MAX_DIVISOR_NR          4
 
+#define FRQCR_CKOEN     0x0100
+#define FRQCR_PLLEN     0x0080
+#define FRQCR_PSTBY     0x0040
+
 #endif /* __ASM_CPU_SH3_FREQ_H */
 
diff --git a/include/asm-sh/hd64461.h b/include/asm-sh/hd64461.h
index 0f2e2132cc35..27e5c34e2659 100644
--- a/include/asm-sh/hd64461.h
+++ b/include/asm-sh/hd64461.h
@@ -40,7 +40,12 @@
 #define HD64461_LCDCBAR         0x11000
 #define HD64461_LCDCLOR         0x11002
 #define HD64461_LCDCCR          0x11004
-#define HD64461_LCDCCR_MOFF     0x80
+#define HD64461_LCDCCR_STBACK   0x0400
+#define HD64461_LCDCCR_STREQ    0x0100
+#define HD64461_LCDCCR_MOFF     0x0080
+#define HD64461_LCDCCR_REFSEL   0x0040
+#define HD64461_LCDCCR_EPON     0x0020
+#define HD64461_LCDCCR_SPON     0x0010
 
 #define HD64461_LDR1            0x11010
 #define HD64461_LDR1_DON        0x01
diff --git a/include/asm-sh/hp6xx/hp6xx.h b/include/asm-sh/hp6xx/hp6xx.h
index a26247fd3d87..f35134c159dd 100644
--- a/include/asm-sh/hp6xx/hp6xx.h
+++ b/include/asm-sh/hp6xx/hp6xx.h
@@ -2,16 +2,33 @@
 #define __ASM_SH_HP6XX_H
 
 /*
- * Copyright (C) 2003  Andriy Skulysh
+ * Copyright (C) 2003, 2004, 2005  Andriy Skulysh
+ *
+ * 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.
+ *
  */
 
-#define HP680_TS_IRQ IRQ3_IRQ
+#define HP680_BTN_IRQ           IRQ0_IRQ
+#define HP680_TS_IRQ            IRQ3_IRQ
+#define HP680_HD64461_IRQ       IRQ4_IRQ
 
 #define DAC_LCD_BRIGHTNESS      0
 #define DAC_SPEAKER_VOLUME      1
 
+#define PGDR_OPENED             0x01
+#define PGDR_MAIN_BATTERY_OUT   0x04
+#define PGDR_PLAY_BUTTON        0x08
+#define PGDR_REWIND_BUTTON      0x10
+#define PGDR_RECORD_BUTTON      0x20
+
 #define PHDR_TS_PEN_DOWN        0x08
 
+#define PJDR_LED_BLINK          0x02
+
+#define PKDR_LED_GREEN          0x10
+
 #define SCPDR_TS_SCAN_ENABLE    0x20
 #define SCPDR_TS_SCAN_Y         0x02
 #define SCPDR_TS_SCAN_X         0x01
@@ -21,11 +38,43 @@
 
 #define ADC_CHANNEL_TS_Y        1
 #define ADC_CHANNEL_TS_X        2
+#define ADC_CHANNEL_BATTERY     3
+#define ADC_CHANNEL_BACKUP      4
+#define ADC_CHANNEL_CHARGE      5
 
 #define HD64461_GPADR_SPEAKER   0x01
 #define HD64461_GPADR_PCMCIA0   (0x02|0x08)
+
 #define HD64461_GPBDR_LCDOFF    0x01
+#define HD64461_GPBDR_LCD_CONTRAST_MASK 0x78
 #define HD64461_GPBDR_LED_RED   0x80
 
+#include <asm/hd64461.h>
+#include <asm/io.h>
+
+#define PJDR    0xa4000130
+#define PKDR    0xa4000132
+
+static inline void hp6xx_led_red(int on)
+{
+        u16 v16;
+        v16 = ctrl_inw(CONFIG_HD64461_IOBASE + HD64461_GPBDR - 0x10000);
+        if (on)
+            ctrl_outw(v16 & (~HD64461_GPBDR_LED_RED), CONFIG_HD64461_IOBASE + HD64461_GPBDR - 0x10000);
+        else
+            ctrl_outw(v16 | HD64461_GPBDR_LED_RED, CONFIG_HD64461_IOBASE + HD64461_GPBDR - 0x10000);
+}
+
+static inline void hp6xx_led_green(int on)
+{
+        u8 v8;
+
+        v8 = ctrl_inb(PKDR);
+        if (on)
+            ctrl_outb(v8 & (~PKDR_LED_GREEN), PKDR);
+        else
+            ctrl_outb(v8 | PKDR_LED_GREEN, PKDR);
+}
+
 
 #endif /* __ASM_SH_HP6XX_H */
diff --git a/include/asm-sh/pm.h b/include/asm-sh/pm.h
new file mode 100644
index 000000000000..56fdbd6b1c94
--- /dev/null
+++ b/include/asm-sh/pm.h
@@ -0,0 +1,17 @@
+/*
+ * 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.
+ *
+ * Copyright 2006 (c) Andriy Skulysh <askulysh@gmail.com>
+ *
+ */
+#ifndef __ASM_SH_PM_H
+#define __ASM_SH_PM_H
+
+extern u8 wakeup_start;
+extern u8 wakeup_end;
+
+void pm_enter(void);
+
+#endif
diff --git a/include/asm-sh/system.h b/include/asm-sh/system.h
index bd7dc0554b11..477422afeb0d 100644
--- a/include/asm-sh/system.h
+++ b/include/asm-sh/system.h
@@ -172,6 +172,31 @@ static __inline__ void local_irq_disable(void)
                              : "memory");
 }
 
+static __inline__ void set_bl_bit(void)
+{
+        unsigned long __dummy0, __dummy1;
+
+        __asm__ __volatile__ ("stc      sr, %0\n\t"
+                             "or        %2, %0\n\t"
+                             "and       %3, %0\n\t"
+                             "ldc       %0, sr"
+                             : "=&r" (__dummy0), "=r" (__dummy1)
+                             : "r" (0x10000000), "r" (0xffffff0f)
+                             : "memory");
+}
+
+static __inline__ void clear_bl_bit(void)
+{
+        unsigned long __dummy0, __dummy1;
+
+        __asm__ __volatile__ ("stc      sr, %0\n\t"
+                             "and       %2, %0\n\t"
+                             "ldc       %0, sr"
+                             : "=&r" (__dummy0), "=r" (__dummy1)
+                             : "1" (~0x10000000)
+                             : "memory");
+}
+
 #define local_save_flags(x) \
         __asm__("stc sr, %0; and #0xf0, %0" : "=&z" (x) :/**/: "memory" )
 
diff --git a/include/asm-sh/timer.h b/include/asm-sh/timer.h
index dd6579c0b04c..c7ab28095ba0 100644
--- a/include/asm-sh/timer.h
+++ b/include/asm-sh/timer.h
@@ -6,6 +6,8 @@
 
 struct sys_timer_ops {
         int (*init)(void);
+        int (*start)(void);
+        int (*stop)(void);
         unsigned long (*get_offset)(void);
         unsigned long (*get_frequency)(void);
 };