Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d964a28 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: samsung-keypad - enable compiling on other platforms 



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: default avatarDmitry Torokhov <dtor@mail.ru>
parent 400bf299

arch/arm/plat-samsung/include/plat/keypad.h

+1 −26
Original line number Diff line number Diff line
@@ -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.

drivers/input/keyboard/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -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.

drivers/input/keyboard/samsung-keypad.c

+1 −1
Original line number Diff line number Diff line
@@ -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

include/linux/input/samsung-keypad.h

0 → 100644
+43 −0
Original line number Diff line number Diff line 
/*

 * 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 */