Commit b0156b05 authored by Joachim Eastwood's avatar Joachim Eastwood Committed by Dmitry Torokhov
Browse files

ARM: OMAP2+: remove unused omap4-keypad file and code 



This has been unused since omap4 board files went away.

Signed-off-by: default avatarJoachim Eastwood <manabian@gmail.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 7b961d5b

arch/arm/mach-omap2/devices.c

+0 −33
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <linux/slab.h>

#include <linux/of.h>

#include <linux/pinctrl/machine.h>

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

#include <linux/platform_data/mailbox-omap.h>



#include <asm/mach-types.h>
@@ -29,7 +28,6 @@ 
#include "iomap.h"

#include "omap_hwmod.h"

#include "omap_device.h"

#include "omap4-keypad.h"



#include "soc.h"

#include "common.h"
@@ -255,37 +253,6 @@ static inline void omap_init_camera(void) 
#endif

}



int __init omap4_keyboard_init(struct omap4_keypad_platform_data

			*sdp4430_keypad_data, struct omap_board_data *bdata)

{

	struct platform_device *pdev;

	struct omap_hwmod *oh;

	struct omap4_keypad_platform_data *keypad_data;

	unsigned int id = -1;

	char *oh_name = "kbd";

	char *name = "omap4-keypad";



	oh = omap_hwmod_lookup(oh_name);

	if (!oh) {

		pr_err("Could not look up %s\n", oh_name);

		return -ENODEV;

	}



	keypad_data = sdp4430_keypad_data;



	pdev = omap_device_build(name, id, oh, keypad_data,

				 sizeof(struct omap4_keypad_platform_data));



	if (IS_ERR(pdev)) {

		WARN(1, "Can't build omap_device for %s:%s.\n",

						name, oh->name);

		return PTR_ERR(pdev);

	}

	oh->mux = omap_hwmod_mux_init(bdata->pads, bdata->pads_cnt);



	return 0;

}



#if defined(CONFIG_OMAP2PLUS_MBOX) || defined(CONFIG_OMAP2PLUS_MBOX_MODULE)

static inline void __init omap_init_mbox(void)

{

arch/arm/mach-omap2/omap4-keypad.h

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
#ifndef ARCH_ARM_PLAT_OMAP4_KEYPAD_H

#define ARCH_ARM_PLAT_OMAP4_KEYPAD_H



struct omap_board_data;



extern int omap4_keyboard_init(struct omap4_keypad_platform_data *,

				struct omap_board_data *);

#endif