diff options
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-minnow-sensors.c | 90 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-minnow.c | 1 | 
3 files changed, 0 insertions, 92 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 82101b07e8f..73577b3589a 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -255,7 +255,6 @@ obj-$(CONFIG_MACH_OMAP_4430SDP)		+= board-4430sdp.o  obj-$(CONFIG_MACH_OMAP4_PANDA)		+= board-omap4panda.o  obj-$(CONFIG_MACH_MINNOW)		+= board-minnow.o \                                             board-minnow-wireless.o \ -                                           board-minnow-sensors.o \                                             board-minnow-cpcap-client.o  obj-$(CONFIG_MACH_OMAP3517EVM)		+= board-am3517evm.o diff --git a/arch/arm/mach-omap2/board-minnow-sensors.c b/arch/arm/mach-omap2/board-minnow-sensors.c deleted file mode 100644 index 512c4448f1d..00000000000 --- a/arch/arm/mach-omap2/board-minnow-sensors.c +++ /dev/null @@ -1,90 +0,0 @@ -/* - * linux/arch/arm/mach-omap2/board-minnow-sensors.c - * - * Copyright (C) 2009 Google, Inc. - * Copyright (C) 2009-2012 Motorola, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - */ - -#include <linux/delay.h> -#include <linux/kernel.h> -#include <linux/platform_device.h> - -#if defined(CONFIG_MFD_M4SENSORHUB) || defined(CONFIG_MFD_M4SENSORHUB_MODULE) -#include <linux/m4sensorhub.h> -#include <linux/m4sensorhub_gpio.h> -#endif -#include <linux/regulator/consumer.h> -#include <linux/vib-gpio.h> - -#include <linux/gpio.h> - -#ifdef CONFIG_ARM_OF -#include <mach/dt_path.h> -#include <asm/prom.h> -#endif - -static struct regulator *minnow_vibrator_regulator; -static int minnow_vibrator_initialization(void) -{ -	struct regulator *reg; -	reg = regulator_get(NULL, "vvib"); -	if (IS_ERR(reg)) -		return PTR_ERR(reg); -	minnow_vibrator_regulator = reg; -	return 0; -} - -static void minnow_vibrator_exit(void) -{ -	regulator_put(minnow_vibrator_regulator); -} - -static int minnow_vibrator_power_on(void) -{ -	if (minnow_vibrator_regulator) -		return regulator_enable(minnow_vibrator_regulator); -	return 0; -} - -static int minnow_vibrator_power_off(void) -{ -	if (minnow_vibrator_regulator) -		return regulator_disable(minnow_vibrator_regulator); -	return 0; -} - -static struct vib_gpio_platform_data minnow_vib_gpio_data = { -	.gpio = -1, -	.max_timeout = 15000, -	.active_low = 0, -	.initial_vibrate = 0, - -	.init = minnow_vibrator_initialization, -	.exit = minnow_vibrator_exit, -	.power_on = minnow_vibrator_power_on, -	.power_off = minnow_vibrator_power_off, -}; - -static struct platform_device minnow_vib_gpio = { -	.name           = "vib-gpio", -	.id             = -1, -	.dev            = { -		.platform_data  = &minnow_vib_gpio_data, -	}, -}; - - - -/* - * Sensors - */ - -void __init minnow_sensors_init(void) -{ -	platform_device_register(&minnow_vib_gpio); -} diff --git a/arch/arm/mach-omap2/board-minnow.c b/arch/arm/mach-omap2/board-minnow.c index 7f6f8f29748..209bd9031b5 100644 --- a/arch/arm/mach-omap2/board-minnow.c +++ b/arch/arm/mach-omap2/board-minnow.c @@ -49,7 +49,6 @@ static void __init minnow_init(void)  	omap3_enable_usim_buffer(); /* Needed for GPIOs in USIM block */  	omap_minnow_display_init();  	minnow_bt_init(); -	minnow_sensors_init();  	minnow_cpcap_client_init();  	minnow_musb_init();  }  |