diff options
author | Michael Büsch <mb@bu3sch.de> | 2011-02-06 21:06:43 +0000 |
---|---|---|
committer | Michael Büsch <mb@bu3sch.de> | 2011-02-06 21:06:43 +0000 |
commit | 817390fd03087710107ca9fb3bce6d96ab0006d5 (patch) | |
tree | ac28942bf877576cb5d7b54387e224d547d04b40 /target/linux/omap24xx/patches-2.6.36/310-n8x0-gpioswitch-input.patch | |
parent | 7e4a29fbe2dd57584b54e367574d6bcb72614db8 (diff) | |
download | upstream-817390fd03087710107ca9fb3bce6d96ab0006d5.tar.gz upstream-817390fd03087710107ca9fb3bce6d96ab0006d5.tar.bz2 upstream-817390fd03087710107ca9fb3bce6d96ab0006d5.zip |
omap24xx: Remove 2.6.36
SVN-Revision: 25395
Diffstat (limited to 'target/linux/omap24xx/patches-2.6.36/310-n8x0-gpioswitch-input.patch')
-rw-r--r-- | target/linux/omap24xx/patches-2.6.36/310-n8x0-gpioswitch-input.patch | 98 |
1 files changed, 0 insertions, 98 deletions
diff --git a/target/linux/omap24xx/patches-2.6.36/310-n8x0-gpioswitch-input.patch b/target/linux/omap24xx/patches-2.6.36/310-n8x0-gpioswitch-input.patch deleted file mode 100644 index 474829a64b..0000000000 --- a/target/linux/omap24xx/patches-2.6.36/310-n8x0-gpioswitch-input.patch +++ /dev/null @@ -1,98 +0,0 @@ ---- - arch/arm/mach-omap2/board-n8x0.c | 73 +++++++++++++++++++++++++++++++++++++++ - 1 file changed, 73 insertions(+) - ---- linux-2.6.36-rc5.orig/arch/arm/mach-omap2/board-n8x0.c -+++ linux-2.6.36-rc5/arch/arm/mach-omap2/board-n8x0.c -@@ -796,6 +796,77 @@ extern void n8x0_blizzard_init(void); - - extern void n8x0_usb_init(void); - -+struct gpio_switch_input_dev { -+ struct input_dev *idev; -+ unsigned int swcode; -+}; -+ -+static struct gpio_switch_input_dev *slide_input; -+static struct gpio_switch_input_dev *kblock_input; -+ -+static void n8x0_gpio_switch_input_notify(struct gpio_switch_input_dev *gdev, -+ int state) -+{ -+ if (gdev) { -+ input_report_switch(gdev->idev, gdev->swcode, state); -+ input_sync(gdev->idev); -+ } -+} -+ -+static void n8x0_slide_notify(void *data, int state) -+{ -+ n8x0_gpio_switch_input_notify(slide_input, state); -+} -+ -+static void n8x0_kb_lock_notify(void *data, int state) -+{ -+ n8x0_gpio_switch_input_notify(kblock_input, state); -+} -+ -+static struct gpio_switch_input_dev * __init gpioswitch_input_init( -+ const char *name, -+ unsigned int swcode) -+{ -+ struct gpio_switch_input_dev *gdev; -+ int err; -+ -+ gdev = kzalloc(sizeof(*gdev), GFP_KERNEL); -+ if (!gdev) -+ goto error; -+ gdev->swcode = swcode; -+ -+ gdev->idev = input_allocate_device(); -+ if (!gdev->idev) -+ goto err_free; -+ -+ gdev->idev->evbit[0] = BIT_MASK(EV_SW); -+ gdev->idev->swbit[BIT_WORD(swcode)] = BIT_MASK(swcode); -+ gdev->idev->name = name; -+ -+ err = input_register_device(gdev->idev); -+ if (err) -+ goto err_free_idev; -+ -+ return gdev; -+ -+err_free_idev: -+ input_free_device(gdev->idev); -+err_free: -+ kfree(gdev); -+error: -+ return NULL; -+} -+ -+static int __init n8x0_gpio_switches_input_init(void) -+{ -+ slide_input = gpioswitch_input_init("slide", SW_KEYPAD_SLIDE); -+ kblock_input = gpioswitch_input_init("kb_lock", SW_LID); -+ if (WARN_ON(!slide_input || !kblock_input)) -+ return -ENODEV; -+ return 0; -+} -+late_initcall(n8x0_gpio_switches_input_init); -+ - static struct omap_gpio_switch n8x0_gpio_switches[] __initdata = { - { - .name = "headphone", -@@ -817,11 +888,13 @@ static struct omap_gpio_switch n8x0_gpio - .gpio = -1, - .debounce_rising = 200, - .debounce_falling = 200, -+ .notify = n8x0_slide_notify, - }, { - .name = "kb_lock", - .gpio = -1, - .debounce_rising = 200, - .debounce_falling = 200, -+ .notify = n8x0_kb_lock_notify, - }, - }; - |