Revert "One pin Sensor driver added. Support for proximity sensor (Osram SFH7741) and HAL switch (Samsung HED54XXU11)."

This reverts commit 1f57d527c439850fb011f973b599a97d643f795b.

4 files changed, 0 insertions, 51 deletions

diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig
index df96996d521..1fcca90e04b 100755
--- a/arch/arm/mach-ux500/Kconfig
+++ b/arch/arm/mach-ux500/Kconfig
@@ -65,13 +65,6 @@ config U8500_PM
 config ARCH_HAS_CPU_IDLE_WAIT
     def_bool y
 
-config SENSORS1P_MOP
-	tristate "HAL and Proximity sensors support"
-	depends on GPIO_STMPE2401 || GPIO_TC35892
-	default y
-	help
-		Add support for Osram's SFH7741 Proximity Sensor and Samsumg HED54XXU11 HAL Switch
-
 source "arch/arm/mach-ux500/Kconfig-arch"
 
 config FORCE_MAX_ZONEORDER
diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile
index 6be02d614aa..b3cacce4237 100755
--- a/arch/arm/mach-ux500/Makefile
+++ b/arch/arm/mach-ux500/Makefile
@@ -18,7 +18,6 @@ obj-$(CONFIG_SMP)			+= platsmp.o headsmp.o localtimer.o
 obj-$(CONFIG_U8500_CPUIDLE) += cpuidle.o
 obj-$(CONFIG_U8500_CPUFREQ) += cpufreq.o
 obj-$(CONFIG_U8500_PM)			+= pm.o
-obj-$(CONFIG_SENSORS1P_MOP)            += sensors1p.o
 obj-$(CONFIG_USB)            += musb_db8500.o
 
 ifeq ($(CONFIG_MFD_STE_CONN), m)
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 4cb35897674..0912b2bd3cf 100755
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -29,7 +29,6 @@
 #include <mach/stmpe2401.h>
 #include <mach/stmpe1601.h>
 #include <mach/tc35892.h>
-#include <mach/sensors1p.h>
 #include <mach/av8100_p.h>
 #include <mach/ab8500.h>
 #include <mach/ab8500_bm.h>
@@ -839,30 +838,6 @@ static struct platform_device keypad_device = {
 };
 #endif /* CONFIG_KEYPAD_U8500 */
 
-#ifdef CONFIG_SENSORS1P_MOP
-static struct sensors1p_config sensors1p_config = {
-	/* SFH7741 */
-	.proximity = {
-		.pin = EGPIO_PIN_7,
-		.startup_time = 120, /* ms */
-		.regulator = "v-proximity",
-	},
-	/* HED54XXU11 */
-	.hal = {
-		.pin = EGPIO_PIN_8,
-		.startup_time = 100, /* Actually, I have no clue. */
-		.regulator = "v-hal",
-	},
-};
-
-static struct platform_device sensors1p_device = {
-	.name = "sensors1p",
-	.dev = {
-		.platform_data = (void *)&sensors1p_config,
-	},
-};
-#endif
-
 static struct i2s_board_info stm_i2s_board_info[] __initdata = {
 	{
 	 .modalias = "i2s_device.0",
@@ -961,9 +936,6 @@ static struct platform_device *u8500_platform_devices[] __initdata = {
 #ifdef CONFIG_KEYPAD_U8500
 	&keypad_device,
 #endif
-#ifdef CONFIG_SENSORS1P_MOP
-	&sensors1p_device,
-#endif
 
 };
 
diff --git a/arch/arm/mach-ux500/devices.c b/arch/arm/mach-ux500/devices.c
index 22e7884858a..943a2de145f 100755
--- a/arch/arm/mach-ux500/devices.c
+++ b/arch/arm/mach-ux500/devices.c
@@ -808,10 +808,6 @@ static struct platform_device db8500_vana_regulator_dev = {
 	},
 };
 
-#ifdef CONFIG_SENSORS1P_MOP
-extern struct platform_device sensors1p_device;
-#endif
-
 /* VAUX1 supply */
 #define AB8500_VAUXN_LDO_MIN_VOLTAGE    (1100000)
 #define AB8500_VAUXN_LDO_MAX_VOLTAGE    (3300000)
@@ -841,17 +837,6 @@ static struct regulator_consumer_supply ab8500_vaux1_consumers[] = {
 		.supply = "v-mcde",
 	},
 #endif
-#ifdef CONFIG_SENSORS1P_MOP
-	{
-		.dev = &sensors1p_device.dev,
-		.supply = "v-proximity",
-	},
-	{
-		.dev = &sensors1p_device.dev,
-		.supply = "v-hal",
-	},
-#endif
-
 };
 
 static struct regulator_init_data ab8500_vaux1_init = {