ARM: tegra: Clean up tsensor includes

mach-tegra/tegra3_tsensor.h is used for the parameterized initialization
of the tsensor device. mach-tegra/include/mach/tsensor.h is used for the
tsensor device driver.

Really, mach-tegra/tegra3_tsensor.c should go away - probably becoming a
device driver.

Change-Id: I16edae878f1e97d1654252cfee49cd9dd7f77db7
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Reviewed-on: http://git-master/r/72481
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

8 files changed, 50 insertions, 27 deletions

diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile
index a4d1b217c163..d28a72c08f8f 100644
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@ -96,7 +96,7 @@ obj-$(CONFIG_TEGRA_CLUSTER_CONTROL)     += sysfs-cluster.o
 ifeq ($(CONFIG_TEGRA_MC_PROFILE),y)
 obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += tegra2_mc.o
 endif
-obj-$(CONFIG_ARCH_TEGRA_3x_SOC)         += tegra3_tsensor.o
+obj-$(CONFIG_SENSORS_TEGRA_TSENSOR)     += tegra3_tsensor.o
 obj-$(CONFIG_TEGRA_DYNAMIC_PWRDET)      += powerdetect.o
 obj-$(CONFIG_TEGRA_USB_MODEM_POWER)     += tegra_usb_modem_power.o
 obj-$(CONFIG_TEGRA_PCI)                 += pcie.o
diff --git a/arch/arm/mach-tegra/board-cardhu-pm298-power-rails.c b/arch/arm/mach-tegra/board-cardhu-pm298-power-rails.c
index 9839249d197b..d1ad617b64df 100644
--- a/arch/arm/mach-tegra/board-cardhu-pm298-power-rails.c
+++ b/arch/arm/mach-tegra/board-cardhu-pm298-power-rails.c
@@ -38,7 +38,6 @@
 #include "board-cardhu.h"
 #include "pm.h"
 #include "wakeups-t3.h"
-#include "mach/tsensor.h"
 
 #define PMC_CTRL		0x0
 #define PMC_CTRL_INTR_LOW	BIT(17)
diff --git a/arch/arm/mach-tegra/board-cardhu-pm299-power-rails.c b/arch/arm/mach-tegra/board-cardhu-pm299-power-rails.c
index 866c3c0ff506..76f358cabee5 100644
--- a/arch/arm/mach-tegra/board-cardhu-pm299-power-rails.c
+++ b/arch/arm/mach-tegra/board-cardhu-pm299-power-rails.c
@@ -38,7 +38,6 @@
 #include "board.h"
 #include "board-cardhu.h"
 #include "wakeups-t3.h"
-#include "mach/tsensor.h"
 
 #define PMC_CTRL		0x0
 #define PMC_CTRL_INTR_LOW	(1 << 17)
diff --git a/arch/arm/mach-tegra/board-cardhu-power.c b/arch/arm/mach-tegra/board-cardhu-power.c
index e38c83f9e919..6dd6767cc47d 100644
--- a/arch/arm/mach-tegra/board-cardhu-power.c
+++ b/arch/arm/mach-tegra/board-cardhu-power.c
@@ -37,13 +37,13 @@
 #include <mach/irqs.h>
 #include <mach/pinmux.h>
 #include <mach/edp.h>
-#include <mach/tsensor.h>
 
 #include "gpio-names.h"
 #include "board.h"
 #include "board-cardhu.h"
 #include "pm.h"
 #include "wakeups-t3.h"
+#include "tegra3_tsensor.h"
 
 #define PMC_CTRL		0x0
 #define PMC_CTRL_INTR_LOW	(1 << 17)
diff --git a/arch/arm/mach-tegra/board-enterprise-power.c b/arch/arm/mach-tegra/board-enterprise-power.c
index 98f653a8c668..f0170ca1fb60 100644
--- a/arch/arm/mach-tegra/board-enterprise-power.c
+++ b/arch/arm/mach-tegra/board-enterprise-power.c
@@ -35,13 +35,13 @@
 #include <mach/iomap.h>
 #include <mach/irqs.h>
 #include <mach/pinmux.h>
-#include <mach/tsensor.h>
 
 #include "gpio-names.h"
 #include "board.h"
 #include "board-enterprise.h"
 #include "pm.h"
 #include "wakeups-t3.h"
+#include "tegra3_tsensor.h"
 
 #define PMC_CTRL		0x0
 #define PMC_CTRL_INTR_LOW	(1 << 17)
diff --git a/arch/arm/mach-tegra/include/mach/tsensor.h b/arch/arm/mach-tegra/include/mach/tsensor.h
index 10a33217bc98..190a38586c52 100644
--- a/arch/arm/mach-tegra/include/mach/tsensor.h
+++ b/arch/arm/mach-tegra/include/mach/tsensor.h
@@ -25,25 +25,12 @@
 
 #define MAX_ZONES	16
 
-struct tegra_tsensor_pmu_data {
-	u8 poweroff_reg_data;
-	u8 poweroff_reg_addr;
-	u8 reset_tegra;
-	u8 controller_type;
-	u8 i2c_controller_id;
-	u8 pinmux;
-	u8 pmu_16bit_ops;
-	u8 pmu_i2c_addr;
-};
-
 struct tegra_tsensor_data;
 
 struct tegra_tsensor_platform_data {
 	void (*probe_callback)(struct tegra_tsensor_data *);
 };
 
-void __init tegra3_tsensor_init(struct tegra_tsensor_pmu_data *);
-
 int tsensor_thermal_get_temp(struct tegra_tsensor_data *data,
 				long *milli_temp);
 int tsensor_thermal_get_temp_low(struct tegra_tsensor_data *data,
diff --git a/arch/arm/mach-tegra/tegra3_tsensor.c b/arch/arm/mach-tegra/tegra3_tsensor.c
index a19a99785ae7..4bcd81d4bc29 100644
--- a/arch/arm/mach-tegra/tegra3_tsensor.c
+++ b/arch/arm/mach-tegra/tegra3_tsensor.c
@@ -16,16 +16,18 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/io.h>
+#include <linux/ioport.h>
+#include <linux/slab.h>
 
-#ifdef CONFIG_SENSORS_TEGRA_TSENSOR
 #include <mach/tsensor.h>
 #include <mach/tegra_fuse.h>
-#include <devices.h>
 #include <mach/iomap.h>
 #include <mach/thermal.h>
-#include <linux/io.h>
-#include <linux/ioport.h>
-#include <linux/slab.h>
+#include <mach/tsensor.h>
+
+#include "devices.h"
+#include "tegra3_tsensor.h"
 
 /* fuse revision constants used for tsensor */
 #define TSENSOR_FUSE_REVISION_DECIMAL 8
@@ -188,7 +190,3 @@ labelEnd:
 	return;
 }
 
-#else
-void __init tegra3_tsensor_init(void) { }
-#endif
-
diff --git a/arch/arm/mach-tegra/tegra3_tsensor.h b/arch/arm/mach-tegra/tegra3_tsensor.h
new file mode 100644
index 000000000000..d6bd1182fa6f
--- /dev/null
+++ b/arch/arm/mach-tegra/tegra3_tsensor.h
@@ -0,0 +1,40 @@
+/*
+ * arch/arm/mach-tegra/tegra3_tsensor.h
+ *
+ * Tegra tsensor header file
+ *
+ * Copyright (c) 2011, NVIDIA Corporation.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#ifndef __MACH_TEGRA_TEGRA3_TSENSOR_H
+#define __MACH_TEGRA_TEGRA3_TSENSOR_H
+
+struct tegra_tsensor_pmu_data {
+	u8 poweroff_reg_data;
+	u8 poweroff_reg_addr;
+	u8 reset_tegra;
+	u8 controller_type;
+	u8 i2c_controller_id;
+	u8 pinmux;
+	u8 pmu_16bit_ops;
+	u8 pmu_i2c_addr;
+};
+
+#ifdef CONFIG_SENSORS_TEGRA_TSENSOR
+void __init tegra3_tsensor_init(struct tegra_tsensor_pmu_data *data);
+#else
+static inline void tegra3_tsensor_init(struct tegra_tsensor_pmu_data *data)
+{}
+#endif
+
+#endif