MX27 DPTC: Remove Vestigal Code

The Dynamic Processor Temperature Control Module is significantly different on
the MX27 as compared to the MX31.  It seems that some MX31 code slipped into
the MX27 devices file, but essentially did nothing except try to register a
device that didn't have a driver.  I removed this code.

I also fixed an issue with the Kconfig where you could select the DPTC module
without the power management chip enabled, which causes a compilation error.

Signed-off-by: Justin Waters <justin.waters@timesys.com>

3 files changed, 2 insertions, 74 deletions

diff --git a/arch/arm/mach-mx27/devices.c b/arch/arm/mach-mx27/devices.c
index cdde8069c9c3..e8fec3357487 100644
--- a/arch/arm/mach-mx27/devices.c
+++ b/arch/arm/mach-mx27/devices.c
@@ -32,10 +32,6 @@
   * @ingroup MSL_MX27
   */
 
-#ifndef CONFIG_MX27_DPTC
-extern struct dptc_wp dptc_wp_allfreq[DPTC_WP_SUPPORTED];
-#endif
-
 static void mxc_nop_release(struct device *dev)
 {
 	/* Nothing */
@@ -591,22 +587,6 @@ struct mxc_gpio_port mxc_gpio_ports[GPIO_PORT_NUM] = {
 	 },
 };
 
-#ifndef CONFIG_MX27_DPTC
-/*! Device Definition for DPTC */
-static struct platform_device mxc_dptc_device = {
-	.name = "mxc_dptc",
-	.dev = {
-		.release = mxc_nop_release,
-		.platform_data = &dptc_wp_allfreq,
-		},
-};
-
-static inline void mxc_init_dptc(void)
-{
-	(void)platform_device_register(&mxc_dptc_device);
-}
-#endif
-
 #if defined(CONFIG_PATA_FSL) || defined(CONFIG_PATA_FSL_MODULE)
 static struct clk *ata_clk;
 extern void gpio_ata_active(void);
@@ -697,9 +677,6 @@ static int __init mxc_init_devices(void)
 	mxc_init_scc();
 	mxc_init_owire();
 	mxc_init_vpu();
-#ifndef CONFIG_MX27_DPTC
-	mxc_init_dptc();
-#endif
 	mxc_init_pata();
 
 	return 0;
diff --git a/arch/arm/mach-mx27/dptc.c b/arch/arm/mach-mx27/dptc.c
deleted file mode 100644
index 5edc1cb733d1..000000000000
--- a/arch/arm/mach-mx27/dptc.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2005-2007 Freescale Semiconductor, Inc. All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-/*!
- * @file dptc.c
- *
- * @brief DPTC table for the Freescale Semiconductor MXC DPTC module.
- *
- * @ingroup PM
- */
-
-#include <asm/arch/pmic_power.h>
-#include <asm/arch/hardware.h>
-
-struct dptc_wp dptc_wp_allfreq[DPTC_WP_SUPPORTED] = {
-	/* 532MHz */
-	/* dcvr0      dcvr1       dcvr2       dcvr3       regulator voltage */
-	/* wp0 */
-	{0xffe00000, 0x18e2e85b, 0xffe00000, 0x25c4688a, SW_SW1A, SW1A_1_6V},
-	{0xffe00000, 0x18e2e85b, 0xffe00000, 0x25c4688a, SW_SW1A, SW1A_1_575V},
-	{0xffe00000, 0x1902e85b, 0xffe00000, 0x25e4688a, SW_SW1A, SW1A_1_55V},
-	{0xffe00000, 0x1922e85b, 0xffe00000, 0x25e4688a, SW_SW1A, SW1A_1_525V},
-	{0xffe00000, 0x1942ec5b, 0xffe00000, 0x2604688a, SW_SW1A, SW1A_1_5V},
-	/* wp5 */
-	{0xffe00000, 0x1942ec5b, 0xffe00000, 0x26646c8a, SW_SW1A, SW1A_1_475V},
-	{0xffe00000, 0x1962ec5b, 0xffe00000, 0x26c4708b, SW_SW1A, SW1A_1_45V},
-	{0xffe00000, 0x1962ec5b, 0xffe00000, 0x26e4708b, SW_SW1A, SW1A_1_425V},
-	{0xffe00000, 0x1982f05c, 0xffe00000, 0x2704748b, SW_SW1A, SW1A_1_4V},
-	{0xffe00000, 0x19c2f05c, 0xffe00000, 0x2744748b, SW_SW1A, SW1A_1_375V},
-	/* wp10 */
-	{0xffe00000, 0x1a02f45c, 0xffe00000, 0x2784788b, SW_SW1A, SW1A_1_35V},
-	{0xffe00000, 0x1a42f45c, 0xffe00000, 0x27c47c8b, SW_SW1A, SW1A_1_325V},
-	{0xffe00000, 0x1a82f85c, 0xffe00000, 0x2824808c, SW_SW1A, SW1A_1_3V},
-	{0xffe00000, 0x1aa2f85c, 0xffe00000, 0x2884848c, SW_SW1A, SW1A_1_275V},
-	{0xffe00000, 0x1ac2fc5c, 0xffe00000, 0x28e4888c, SW_SW1A, SW1A_1_25V},
-	/* wp15 */
-	{0xffe00000, 0x1ae2fc5c, 0xffe00000, 0x2924888c, SW_SW1A, SW1A_1_225V},
-	{0xffe00000, 0x1b23005d, 0xffe00000, 0x29648c8c, SW_SW1A, SW1A_1_2V},
-};
diff --git a/drivers/mxc/pm/Kconfig b/drivers/mxc/pm/Kconfig
index ccf444e057ea..111ec61b1c9f 100644
--- a/drivers/mxc/pm/Kconfig
+++ b/drivers/mxc/pm/Kconfig
@@ -6,7 +6,7 @@ menu "Advanced Power Management devices"
 
 config MXC_DPTC
 	bool "MXC DPTC driver"
-	depends on ARCH_MX3 && MXC_PMIC_MC13783
+	depends on ARCH_MX3 && MXC_MC13783_POWER
 	default y
 	help
 	   This selects the Freescale MXC Internal DPTC driver.
@@ -14,7 +14,7 @@ config MXC_DPTC
 
 config MX27_DPTC
 	bool "MXC DPTC driver"
-	depends on ARCH_MX27 && MXC_PMIC_MC13783
+	depends on ARCH_MX27 && MXC_MC13783_POWER
 	default y
 	help
 	   This selects the Freescale MX27 Internal DPTC driver.