IKXCLOCK-436 minnow: remove support for CPCAP PMIC

Disable CPCAP drivers.  The old hardware with CPCAP PMIC has been deprecated.

Change-Id: I729b23fc9858ced14a2b43f63b61ab94b5f8a9ed

5 files changed, 3 insertions, 80 deletions

diff --git a/arch/arm/configs/minnow_defconfig b/arch/arm/configs/minnow_defconfig
index a1c55abc184..396909a7dc6 100644
--- a/arch/arm/configs/minnow_defconfig
+++ b/arch/arm/configs/minnow_defconfig
@@ -1451,8 +1451,6 @@ CONFIG_BATTERY_MAX17042=y
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_SMB347 is not set
 # CONFIG_BATTERY_GOLDFISH is not set
-CONFIG_CHARGER_CPCAP=y
-CONFIG_BATTERY_CPCAP=y
 CONFIG_POWER_RESET=y
 # CONFIG_POWER_RESET_GPIO is not set
 # CONFIG_POWER_RESET_RESTART is not set
@@ -1517,7 +1515,7 @@ CONFIG_MFD_CORE=y
 # CONFIG_MFD_MAX8997 is not set
 # CONFIG_MFD_MAX8998 is not set
 # CONFIG_EZX_PCAP is not set
-CONFIG_MFD_CPCAP=y
+# CONFIG_MFD_CPCAP is not set
 # CONFIG_MFD_VIPERBOARD is not set
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_PCF50633 is not set
@@ -1586,7 +1584,6 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_REGULATOR_TPS6507X is not set
 # CONFIG_REGULATOR_TPS6524X is not set
 CONFIG_REGULATOR_TPS65912=y
-CONFIG_REGULATOR_CPCAP=y
 # CONFIG_MEDIA_SUPPORT is not set
 
 #
@@ -1908,7 +1905,7 @@ CONFIG_USB_OTG_WAKELOCK=y
 # CONFIG_USB_RCAR_PHY is not set
 # CONFIG_USB_ULPI is not set
 CONFIG_USB_TUSB=y
-CONFIG_CPCAP_USB=y
+# CONFIG_CPCAP_USB is not set
 CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 7cd16a65a8b..50daf4181a7 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -253,8 +253,7 @@ obj-$(CONFIG_MACH_IGEP0020)		+= board-igep0020.o
 obj-$(CONFIG_MACH_TOUCHBOOK)		+= board-omap3touchbook.o
 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-cpcap-client.o
+obj-$(CONFIG_MACH_MINNOW)		+= board-minnow.o
 
 obj-$(CONFIG_MACH_OMAP3517EVM)		+= board-am3517evm.o
 
diff --git a/arch/arm/mach-omap2/board-minnow-cpcap-client.c b/arch/arm/mach-omap2/board-minnow-cpcap-client.c
deleted file mode 100644
index 2f2e9dde3b4..00000000000
--- a/arch/arm/mach-omap2/board-minnow-cpcap-client.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * arch/arm/mach-omap2/board-minnow-cpcap-client.c
- *
- * Copyright (C) 2009-2010 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/kernel.h>
-#include <linux/device.h>
-#include <linux/irq.h>
-#include <linux/platform_device.h>
-#include <linux/spi/cpcap.h>
-#include "omap34xx.h"
-
-/*
- * CPCAP devcies are common for different HW Rev.
- *
- */
-
-
-static struct platform_device cpcap_usb_device = {
-	.name           = "cpcap_usb",
-	.id             = -1,
-	.dev.platform_data = NULL,
-};
-static struct platform_device cpcap_usb_det_device = {
-	.name   = "cpcap_usb_det",
-	.id     = -1,
-	.dev    = {
-		.platform_data  = NULL,
-	},
-};
-
-static struct platform_device *cpcap_devices[] = {
-	&cpcap_usb_device,
-	&cpcap_usb_det_device,
-};
-
-
-void __init minnow_cpcap_client_init(void)
-{
-	int i;
-
-	for (i = 0; i < ARRAY_SIZE(cpcap_devices); i++)
-		cpcap_device_register(cpcap_devices[i]);
-
-}
diff --git a/arch/arm/mach-omap2/board-minnow.c b/arch/arm/mach-omap2/board-minnow.c
index afe71d8809e..6aaffd2950d 100644
--- a/arch/arm/mach-omap2/board-minnow.c
+++ b/arch/arm/mach-omap2/board-minnow.c
@@ -20,7 +20,6 @@
 #include "mux.h"
 #include "common.h"
 #include "dss-common.h"
-#include "board-minnow.h"
 #include "control.h"
 
 #include "sdram-toshiba-hynix-numonyx.h"
@@ -43,7 +42,6 @@ static void __init minnow_init(void)
 	omap_sdrc_init(JEDEC_JESD209A_sdrc_params, JEDEC_JESD209A_sdrc_params);
 	omap3_enable_usim_buffer(); /* Needed for GPIOs in USIM block */
 	omap_minnow_display_init();
-	minnow_cpcap_client_init();
 }
 
 MACHINE_START(MINNOW, "minnow")
diff --git a/arch/arm/mach-omap2/board-minnow.h b/arch/arm/mach-omap2/board-minnow.h
deleted file mode 100644
index d34eda34fe0..00000000000
--- a/arch/arm/mach-omap2/board-minnow.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * linux/arch/arm/mach-omap2/board-minnow.h
- *
- * Copyright (C) 2013 Motorola Mobility, 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/i2c.h>
-
-extern void __init minnow_spi_init(void);
-extern void __init minnow_sensors_init(void);
-extern void __init minnow_touch_init(struct i2c_board_info *i2c_info);
-extern void __init minnow_cpcap_client_init(void);
-
-#if defined(CONFIG_MFD_M4SENSORHUB) || defined(CONFIG_MFD_M4SENSORHUB_MODULE)
-extern int m4sensorhub_stillmode_exit(void);
-/* m4_ctrl == 0 OMAP and 1 Sensorhub */
-extern int m4sensorhub_set_display_control(int m4_ctrl, int gpio_mipi_mux);
-#endif