Skip to content

Commit

Permalink
Input: samsung-keypad - enable compiling on other platforms
Browse files Browse the repository at this point in the history
There is nothing in keypad platform definitions that requires
the driver be complied on Samsung platform only, so let's move them
out of the platform subdirectory and relax the dependencies.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  • Loading branch information
Dmitry Torokhov committed Nov 15, 2011
1 parent 400bf29 commit 8d964a2
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 29 deletions.
27 changes: 1 addition & 26 deletions arch/arm/plat-samsung/include/plat/keypad.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,32 +13,7 @@
#ifndef __PLAT_SAMSUNG_KEYPAD_H
#define __PLAT_SAMSUNG_KEYPAD_H

#include <linux/input/matrix_keypad.h>

#define SAMSUNG_MAX_ROWS 8
#define SAMSUNG_MAX_COLS 8

/**
* struct samsung_keypad_platdata - Platform device data for Samsung Keypad.
* @keymap_data: pointer to &matrix_keymap_data.
* @rows: number of keypad row supported.
* @cols: number of keypad col supported.
* @no_autorepeat: disable key autorepeat.
* @wakeup: controls whether the device should be set up as wakeup source.
* @cfg_gpio: configure the GPIO.
*
* Initialisation data specific to either the machine or the platform
* for the device driver to use or call-back when configuring gpio.
*/
struct samsung_keypad_platdata {
const struct matrix_keymap_data *keymap_data;
unsigned int rows;
unsigned int cols;
bool no_autorepeat;
bool wakeup;

void (*cfg_gpio)(unsigned int rows, unsigned int cols);
};
#include <linux/input/samsung-keypad.h>

/**
* samsung_keypad_set_platdata - Set platform data for Samsung Keypad device.
Expand Down
5 changes: 3 additions & 2 deletions drivers/input/keyboard/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -441,9 +441,10 @@ config KEYBOARD_PMIC8XXX

config KEYBOARD_SAMSUNG
tristate "Samsung keypad support"
depends on SAMSUNG_DEV_KEYPAD
depends on HAVE_CLK
help
Say Y here if you want to use the Samsung keypad.
Say Y here if you want to use the keypad on your Samsung mobile
device.

To compile this driver as a module, choose M here: the
module will be called samsung-keypad.
Expand Down
2 changes: 1 addition & 1 deletion drivers/input/keyboard/samsung-keypad.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <linux/sched.h>
#include <plat/keypad.h>
#include <linux/input/samsung-keypad.h>

#define SAMSUNG_KEYIFCON 0x00
#define SAMSUNG_KEYIFSTSCLR 0x04
Expand Down
43 changes: 43 additions & 0 deletions include/linux/input/samsung-keypad.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/*
* Samsung Keypad platform data definitions
*
* Copyright (C) 2010 Samsung Electronics Co.Ltd
* Author: Joonyoung Shim <jy0922.shim@samsung.com>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*/

#ifndef __SAMSUNG_KEYPAD_H
#define __SAMSUNG_KEYPAD_H

#include <linux/input/matrix_keypad.h>

#define SAMSUNG_MAX_ROWS 8
#define SAMSUNG_MAX_COLS 8

/**
* struct samsung_keypad_platdata - Platform device data for Samsung Keypad.
* @keymap_data: pointer to &matrix_keymap_data.
* @rows: number of keypad row supported.
* @cols: number of keypad col supported.
* @no_autorepeat: disable key autorepeat.
* @wakeup: controls whether the device should be set up as wakeup source.
* @cfg_gpio: configure the GPIO.
*
* Initialisation data specific to either the machine or the platform
* for the device driver to use or call-back when configuring gpio.
*/
struct samsung_keypad_platdata {
const struct matrix_keymap_data *keymap_data;
unsigned int rows;
unsigned int cols;
bool no_autorepeat;
bool wakeup;

void (*cfg_gpio)(unsigned int rows, unsigned int cols);
};

#endif /* __SAMSUNG_KEYPAD_H */

0 comments on commit 8d964a2

Please sign in to comment.