Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (28 commits)
  mm/hugetlb.c must #include <asm/io.h>
  video: Fix up hp6xx driver build regressions.
  sh: defconfig updates.
  sh: Kill off stray mach-rsk7203 reference.
  serial: sh-sci: Fix up SH7760/SH7780/SH7785 early printk regression.
  sh: Move out individual boards without mach groups.
  sh: Make sure AT_SYSINFO_EHDR is exposed to userspace in asm/auxvec.h.
  sh: Allow SH-3 and SH-5 to use common headers.
  sh: Provide common CPU headers, prune the SH-2 and SH-2A directories.
  sh/maple: clean maple bus code
  sh: More header path fixups for mach dir refactoring.
  sh: Move out the solution engine headers to arch/sh/include/mach-se/
  sh: I2C fix for AP325RXA and Migo-R
  sh: Shuffle the board directories in to mach groups.
  sh: dma-sh: Fix up dreamcast dma.h mach path.
  sh: Switch KBUILD_DEFCONFIG to shx3_defconfig.
  sh: Add ARCH_DEFCONFIG entries for sh and sh64.
  sh: Fix compile error of Solution Engine
  sh: Proper __put_user_asm() size mismatch fix.
  sh: Stub in a dummy ENTRY_OFFSET for uImage offset calculation.
  ...

1 files changed, 81 insertions, 0 deletions

diff --git a/arch/sh/boards/mach-hp6xx/pm.c b/arch/sh/boards/mach-hp6xx/pm.c
new file mode 100644
index 000000000000..e96684def788
--- /dev/null
+++ b/arch/sh/boards/mach-hp6xx/pm.c
@@ -0,0 +1,81 @@
+/*
+ * hp6x0 Power Management Routines
+ *
+ * Copyright (c) 2006 Andriy Skulysh <askulsyh@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License.
+ */
+#include <linux/init.h>
+#include <linux/suspend.h>
+#include <linux/errno.h>
+#include <linux/time.h>
+#include <asm/io.h>
+#include <asm/hd64461.h>
+#include <asm/hp6xx.h>
+#include <cpu/dac.h>
+#include <asm/pm.h>
+
+#define STBCR           0xffffff82
+#define STBCR2          0xffffff88
+
+static int hp6x0_pm_enter(suspend_state_t state)
+{
+        u8 stbcr, stbcr2;
+#ifdef CONFIG_HD64461_ENABLER
+        u8 scr;
+        u16 hd64461_stbcr;
+#endif
+
+#ifdef CONFIG_HD64461_ENABLER
+        outb(0, HD64461_PCC1CSCIER);
+
+        scr = inb(HD64461_PCC1SCR);
+        scr |= HD64461_PCCSCR_VCC1;
+        outb(scr, HD64461_PCC1SCR);
+
+        hd64461_stbcr = inw(HD64461_STBCR);
+        hd64461_stbcr |= HD64461_STBCR_SPC1ST;
+        outw(hd64461_stbcr, HD64461_STBCR);
+#endif
+
+        ctrl_outb(0x1f, DACR);
+
+        stbcr = ctrl_inb(STBCR);
+        ctrl_outb(0x01, STBCR);
+
+        stbcr2 = ctrl_inb(STBCR2);
+        ctrl_outb(0x7f , STBCR2);
+
+        outw(0xf07f, HD64461_SCPUCR);
+
+        pm_enter();
+
+        outw(0, HD64461_SCPUCR);
+        ctrl_outb(stbcr, STBCR);
+        ctrl_outb(stbcr2, STBCR2);
+
+#ifdef CONFIG_HD64461_ENABLER
+        hd64461_stbcr = inw(HD64461_STBCR);
+        hd64461_stbcr &= ~HD64461_STBCR_SPC1ST;
+        outw(hd64461_stbcr, HD64461_STBCR);
+
+        outb(0x4c, HD64461_PCC1CSCIER);
+        outb(0x00, HD64461_PCC1CSCR);
+#endif
+
+        return 0;
+}
+
+static struct platform_suspend_ops hp6x0_pm_ops = {
+        .enter          = hp6x0_pm_enter,
+        .valid          = suspend_valid_only_mem,
+};
+
+static int __init hp6x0_pm_init(void)
+{
+        suspend_set_ops(&hp6x0_pm_ops);
+        return 0;
+}
+
+late_initcall(hp6x0_pm_init);