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

Commit 0f1142a5 authored by Felipe Balbi's avatar Felipe Balbi Committed by Dmitry Torokhov
Browse files

Input: omap4-keypad - move platform_data to <linux/platform_data> 



This patch allows us to drop the OMAP dependency from the OMAP4 keypad
driver.

Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarSourav Poddar <sourav.poddar@ti.com>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 04391660

arch/arm/mach-omap2/board-4430sdp.c

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/regulator/fixed.h>

#include <linux/leds.h>

#include <linux/leds_pwm.h>

#include <linux/platform_data/omap4-keypad.h>



#include <mach/hardware.h>

#include <asm/hardware/gic.h>

arch/arm/mach-omap2/devices.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/err.h>

#include <linux/slab.h>

#include <linux/of.h>

#include <linux/platform_data/omap4-keypad.h>



#include <mach/hardware.h>

#include <mach/irqs.h>

arch/arm/plat-omap/include/plat/omap4-keypad.h

+0 −9
Original line number Diff line number Diff line 
#ifndef ARCH_ARM_PLAT_OMAP4_KEYPAD_H

#define ARCH_ARM_PLAT_OMAP4_KEYPAD_H



#include <linux/input/matrix_keypad.h>



struct omap4_keypad_platform_data {

	const struct matrix_keymap_data *keymap_data;



	u8 rows;

	u8 cols;

};



extern int omap4_keyboard_init(struct omap4_keypad_platform_data *,

				struct omap_board_data *);

#endif

drivers/input/keyboard/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -513,7 +513,6 @@ config KEYBOARD_OMAP 


config KEYBOARD_OMAP4

	tristate "TI OMAP4 keypad support"

	depends on ARCH_OMAP4

	help

	  Say Y here if you want to use the OMAP4 keypad.

drivers/input/keyboard/omap4-keypad.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include <linux/slab.h>

#include <linux/pm_runtime.h>



#include <plat/omap4-keypad.h>

#include <linux/platform_data/omap4-keypad.h>



/* OMAP4 registers */

#define OMAP4_KBD_REVISION		0x00