Commit dfb6db00 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Olof Johansson
Browse files

ARM: ep93xx: keypad: stop using mach/platform.h 



We can communicate the clock rate using platform data rather than setting
a flag to use a particular value in the driver, which is cleaner and
avoids the dependency.

No platform in the kernel currently defines the ep93xx keypad device
structure, so this is a rather pointless excercise.  Any out of tree
users are probably dead now, but if not, they have to change their
platform code to match the new platform_data structure.

Acked-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 1b8c8136

drivers/input/keyboard/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ config KEYBOARD_LKKBD 


config KEYBOARD_EP93XX

	tristate "EP93xx Matrix Keypad support"

	depends on ARCH_EP93XX

	depends on ARCH_EP93XX || COMPILE_TEST

	select INPUT_MATRIXKMAP

	help

	  Say Y here to enable the matrix keypad on the Cirrus EP93XX.

drivers/input/keyboard/ep93xx_keypad.c

+1 −4
Original line number Diff line number Diff line
@@ -137,10 +137,7 @@ static void ep93xx_keypad_config(struct ep93xx_keypad *keypad) 
	struct ep93xx_keypad_platform_data *pdata = keypad->pdata;

	unsigned int val = 0;



	if (pdata->flags & EP93XX_KEYPAD_KDIV)

		clk_set_rate(keypad->clk, EP93XX_KEYTCHCLK_DIV4);

	else

		clk_set_rate(keypad->clk, EP93XX_KEYTCHCLK_DIV16);

	clk_set_rate(keypad->clk, pdata->clk_rate);



	if (pdata->flags & EP93XX_KEYPAD_DISABLE_3_KEY)

		val |= KEY_INIT_DIS3KY;

include/linux/platform_data/keypad-ep93xx.h

+2 −2
Original line number Diff line number Diff line
@@ -9,8 +9,7 @@ struct matrix_keymap_data; 
#define EP93XX_KEYPAD_DIAG_MODE		(1<<1)	/* diagnostic mode */

#define EP93XX_KEYPAD_BACK_DRIVE	(1<<2)	/* back driving mode */

#define EP93XX_KEYPAD_TEST_MODE		(1<<3)	/* scan only column 0 */

#define EP93XX_KEYPAD_KDIV		(1<<4)	/* 1/4 clock or 1/16 clock */

#define EP93XX_KEYPAD_AUTOREPEAT	(1<<5)	/* enable key autorepeat */

#define EP93XX_KEYPAD_AUTOREPEAT	(1<<4)	/* enable key autorepeat */



/**

 * struct ep93xx_keypad_platform_data - platform specific device structure
@@ -24,6 +23,7 @@ struct ep93xx_keypad_platform_data { 
	unsigned int	debounce;

	unsigned int	prescale;

	unsigned int	flags;

	unsigned int	clk_rate;

};



#define EP93XX_MATRIX_ROWS		(8)

CRA Git | Maintained and supported by SUSTech CRA and CCSE