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, 143 insertions, 0 deletions

diff --git a/arch/sh/boards/mach-landisk/psw.c b/arch/sh/boards/mach-landisk/psw.c
new file mode 100644
index 000000000000..e6b0efa098d1
--- /dev/null
+++ b/arch/sh/boards/mach-landisk/psw.c
@@ -0,0 +1,143 @@
+/*
+ * arch/sh/boards/landisk/psw.c
+ *
+ * push switch support for LANDISK and USL-5P
+ *
+ * Copyright (C) 2006-2007  Paul Mundt
+ * Copyright (C) 2007  kogiidena
+ *
+ * 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/io.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/platform_device.h>
+#include <mach-landisk/mach/iodata_landisk.h>
+#include <asm/push-switch.h>
+
+static irqreturn_t psw_irq_handler(int irq, void *arg)
+{
+        struct platform_device *pdev = arg;
+        struct push_switch *psw = platform_get_drvdata(pdev);
+        struct push_switch_platform_info *psw_info = pdev->dev.platform_data;
+        unsigned int sw_value;
+        int ret = 0;
+
+        sw_value = (0x0ff & (~ctrl_inb(PA_STATUS)));
+
+        /* Nothing to do if there's no state change */
+        if (psw->state) {
+                ret = 1;
+                goto out;
+        }
+
+        /* Figure out who raised it */
+        if (sw_value & (1 << psw_info->bit)) {
+                psw->state = 1;
+                mod_timer(&psw->debounce, jiffies + 50);
+                ret = 1;
+        }
+
+out:
+        /* Clear the switch IRQs */
+        ctrl_outb(0x00, PA_PWRINT_CLR);
+
+        return IRQ_RETVAL(ret);
+}
+
+static struct resource psw_power_resources[] = {
+        [0] = {
+                .start = IRQ_POWER,
+                .flags = IORESOURCE_IRQ,
+       },
+};
+
+static struct resource psw_usl5p_resources[] = {
+        [0] = {
+                .start = IRQ_BUTTON,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
+static struct push_switch_platform_info psw_power_platform_data = {
+        .name           = "psw_power",
+        .bit            = 4,
+        .irq_flags      = IRQF_SHARED,
+        .irq_handler    = psw_irq_handler,
+};
+
+static struct push_switch_platform_info psw1_platform_data = {
+        .name           = "psw1",
+        .bit            = 0,
+        .irq_flags      = IRQF_SHARED,
+        .irq_handler    = psw_irq_handler,
+};
+
+static struct push_switch_platform_info psw2_platform_data = {
+        .name           = "psw2",
+        .bit            = 2,
+        .irq_flags      = IRQF_SHARED,
+        .irq_handler    = psw_irq_handler,
+};
+
+static struct push_switch_platform_info psw3_platform_data = {
+        .name           = "psw3",
+        .bit            = 1,
+        .irq_flags      = IRQF_SHARED,
+        .irq_handler    = psw_irq_handler,
+};
+
+static struct platform_device psw_power_switch_device = {
+        .name           = "push-switch",
+        .id             = 0,
+        .num_resources  = ARRAY_SIZE(psw_power_resources),
+        .resource       = psw_power_resources,
+        .dev            = {
+                .platform_data = &psw_power_platform_data,
+        },
+};
+
+static struct platform_device psw1_switch_device = {
+        .name           = "push-switch",
+        .id             = 1,
+        .num_resources  = ARRAY_SIZE(psw_usl5p_resources),
+        .resource       = psw_usl5p_resources,
+        .dev            = {
+                .platform_data = &psw1_platform_data,
+        },
+};
+
+static struct platform_device psw2_switch_device = {
+        .name           = "push-switch",
+        .id             = 2,
+        .num_resources  = ARRAY_SIZE(psw_usl5p_resources),
+        .resource       = psw_usl5p_resources,
+        .dev            = {
+                .platform_data = &psw2_platform_data,
+        },
+};
+
+static struct platform_device psw3_switch_device = {
+        .name           = "push-switch",
+        .id             = 3,
+        .num_resources  = ARRAY_SIZE(psw_usl5p_resources),
+        .resource       = psw_usl5p_resources,
+        .dev = {
+                .platform_data = &psw3_platform_data,
+        },
+};
+
+static struct platform_device *psw_devices[] = {
+        &psw_power_switch_device,
+        &psw1_switch_device,
+        &psw2_switch_device,
+        &psw3_switch_device,
+};
+
+static int __init psw_init(void)
+{
+        return platform_add_devices(psw_devices, ARRAY_SIZE(psw_devices));
+}
+module_init(psw_init);