ipuustin
diff --git a/‎arch/x86/include/asm/intel_mid_thermal.h‎
Lines changed: 77 additions & 0 deletions b/‎arch/x86/include/asm/intel_mid_thermal.h‎
Lines changed: 77 additions & 0 deletions
diff --git a/‎arch/x86/platform/intel-mid/device_libs/platform_msic_thermal.c‎
Lines changed: 170 additions & 1 deletion b/‎arch/x86/platform/intel-mid/device_libs/platform_msic_thermal.c‎
Lines changed: 170 additions & 1 deletion
diff --git a/‎arch/x86/platform/intel-mid/device_libs/platform_msic_thermal.h‎
Lines changed: 9 additions & 0 deletions b/‎arch/x86/platform/intel-mid/device_libs/platform_msic_thermal.h‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎drivers/platform/x86/Makefile‎
Lines changed: 0 additions & 1 deletion b/‎drivers/platform/x86/Makefile‎
Lines changed: 0 additions & 1 deletion
@@ -0,0 +1,77 @@
+#ifndef __INTEL_MID_THERMAL_H__
+#define __INTEL_MID_THERMAL_H__
+
+#include <linux/thermal.h>
+
+#define BPTHERM_NAME	"bptherm"
+#define SKIN0_NAME	"skin0"
+#define SKIN1_NAME	"skin1"
+#define MSIC_DIE_NAME	"msicdie"
+#define MSIC_SYS_NAME	"sys"
+#define SYSTHERM2       "systherm2"
+/**
+ * struct intel_mid_thermal_sensor - intel_mid_thermal sensor information
+ * @name:		name of the sensor
+ * @index:		index number of sensor
+ * @slope:		slope used for temp calculation
+ * @intercept:		intercept used for temp calculation
+ * @adc_channel:	adc channel id|flags
+ * @direct:		If true then direct conversion is used.
+ * @priv:		private sensor data
+ * @temp_correlation:	temp correlation function
+ */
+struct intel_mid_thermal_sensor {
+	char name[THERMAL_NAME_LENGTH];
+	int index;
+	long slope;
+	long intercept;
+	int adc_channel;
+	bool direct;
+	void *priv;
+	int (*temp_correlation)(void *info, long temp, long *res);
+};
+
+/**
+ * struct soc_throttle_data - SoC level power limits for thermal throttling
+ * @power_limit:	power limit value
+ * @floor_freq:		The CPU frequency may not go below this value
+ */
+struct soc_throttle_data {
+	int power_limit;
+	int floor_freq;
+};
+
+/**
+ * struct intel_mid_thermal_platform_data - Platform data for
+ *		intel mid thermal driver
+ *
+ * @num_sensors:	Maximum number of sensors supported
+ * @sensors:		sensor info
+ * @soc_cooling:	True or false
+ */
+struct intel_mid_thermal_platform_data {
+	int num_sensors;
+	struct intel_mid_thermal_sensor *sensors;
+	bool soc_cooling;
+};
+
+/**
+ * struct skin1_private_info - skin1 sensor private data
+ *
+ * @dependent:		dependency on other sensors
+			0   - no dependency,
+			> 0 - depends on other sensors
+ * @sensors:		dependent sensor address.
+ */
+struct skin1_private_info {
+	int dependent;
+	struct intel_mid_thermal_sensor **sensors;
+};
+
+/* skin0 sensor temperature correlation function*/
+int skin0_temp_correlation(void *info, long temp, long *res);
+/* skin1 sensor temperature correlation function*/
+int skin1_temp_correlation(void *info, long temp, long *res);
+/* bptherm sensor temperature correlation function*/
+int bptherm_temp_correlation(void *info, long temp, long *res);
+#endif
@@ -17,10 +17,179 @@
 #include <linux/platform_device.h>
 #include <linux/mfd/intel_msic.h>
 #include <asm/intel-mid.h>
+#include <asm/intel_mid_gpadc.h>
+#include <asm/intel_mid_thermal.h>
+#include <linux/platform_data/intel_mid_remoteproc.h>
 #include "platform_msic.h"
 #include "platform_msic_thermal.h"
 
+/* ctp thermal sensor list */
+static struct intel_mid_thermal_sensor ctp_sensors[] = {
+	{
+		.name = SKIN0_NAME,
+		.index = 0,
+		.slope = 410,
+		.intercept = 16808,
+		.adc_channel = 0x04 | CH_NEED_VREF | CH_NEED_VCALIB,
+		.temp_correlation = skin0_temp_correlation,
+		.direct = false,
+	},
+	{
+		.name = SKIN1_NAME,
+		.index = 1,
+		.slope = 665,
+		.intercept = 8375,
+		.adc_channel = 0x04 | CH_NEED_VREF | CH_NEED_VCALIB,
+		.temp_correlation = skin0_temp_correlation,
+		.direct = false,
+	},
+	{
+		.name = MSIC_DIE_NAME,
+		.index = 2,
+		.slope = 368,
+		.intercept = 219560,
+		.adc_channel = 0x03 | CH_NEED_VCALIB,
+		.direct = true,
+	},
+	{
+		.name = BPTHERM_NAME,
+		.index = 3,
+		.slope = 788,
+		.intercept = 5065,
+		.adc_channel = 0x09 | CH_NEED_VREF | CH_NEED_VCALIB,
+		.temp_correlation = bptherm_temp_correlation,
+		.direct = false,
+	},
+
+};
+
+/* mfld thermal sensor list */
+static struct intel_mid_thermal_sensor mfld_sensors[] = {
+	{
+		.name = SKIN0_NAME,
+		.index = 0,
+		.slope = 851,
+		.intercept = 2800,
+		.adc_channel = 0x08 | CH_NEED_VREF | CH_NEED_VCALIB,
+		.temp_correlation = skin0_temp_correlation,
+		.direct = false,
+	},
+	{
+		.name = SKIN1_NAME,
+		.index = 1,
+		.slope = 806,
+		.intercept = 1800,
+		.adc_channel = 0x08 | CH_NEED_VREF | CH_NEED_VCALIB,
+		.temp_correlation = skin1_temp_correlation,
+		.direct = false,
+	},
+	{
+		.name = MSIC_SYS_NAME,
+		.index = 2,
+		.slope = 0,
+		.intercept = 0,
+		.adc_channel = 0x0A | CH_NEED_VREF | CH_NEED_VCALIB,
+		.direct = false,
+	},
+	{
+		.name = MSIC_DIE_NAME,
+		.index = 3,
+		.slope = 368,
+		.intercept = 219560,
+		.adc_channel = 0x03 | CH_NEED_VCALIB,
+		.direct = true,
+	},
+
+};
+
+/* LEX thermal sensor list */
+static struct intel_mid_thermal_sensor lex_sensors[] = {
+	{
+		.name = SKIN0_NAME,
+		.index = 0,
+		.slope = 851,
+		.intercept = 2800,
+		.adc_channel = 0x08 | CH_NEED_VREF | CH_NEED_VCALIB,
+		.temp_correlation = skin0_temp_correlation,
+		.direct = false,
+	},
+	{
+		.name = SKIN1_NAME,
+		.index = 1,
+		.slope = 806,
+		.intercept = 1800,
+		.adc_channel = 0x08 | CH_NEED_VREF | CH_NEED_VCALIB,
+		.temp_correlation = skin1_temp_correlation,
+		.direct = false,
+	},
+	{
+		.name = MSIC_SYS_NAME,
+		.index = 2,
+		.slope = 0,
+		.intercept = 0,
+		.adc_channel = 0x0A | CH_NEED_VREF | CH_NEED_VCALIB,
+		.direct = false,
+	},
+	{
+		.name = MSIC_DIE_NAME,
+		.index = 3,
+		.slope = 368,
+		.intercept = 219560,
+		.adc_channel = 0x03 | CH_NEED_VCALIB,
+		.direct = true,
+	},
+
+};
+
+
+static struct intel_mid_thermal_platform_data pdata[] = {
+	[mfld_thermal] = {
+		.num_sensors = 4,
+		.sensors = mfld_sensors,
+		.soc_cooling = false,
+	},
+	[ctp_thermal] = {
+		.num_sensors = 4,
+		.sensors = ctp_sensors,
+		.soc_cooling = true,
+	},
+	[lex_thermal] = {
+		.num_sensors = 4,
+		.sensors = lex_sensors,
+		.soc_cooling = false,
+	},
+};
+
 void __init *msic_thermal_platform_data(void *info)
 {
-	return msic_generic_platform_data(info, INTEL_MSIC_BLOCK_THERMAL);
+	struct platform_device *pdev;
+
+	pdev = platform_device_alloc(MSIC_THERM_DEV_NAME, -1);
+	if (!pdev) {
+		pr_err("out of memory for SFI platform dev %s\n",
+			MSIC_THERM_DEV_NAME);
+		return NULL;
+	}
+
+	if (platform_device_add(pdev)) {
+		pr_err("failed to add thermal platform device\n");
+		platform_device_put(pdev);
+		return NULL;
+	}
+
+	if (INTEL_MID_BOARD(2, PHONE, CLVTP, VB, PRO) ||
+		INTEL_MID_BOARD(2, PHONE, CLVTP, VB, ENG))
+		pdev->dev.platform_data = &pdata[vb_thermal];
+	else if (INTEL_MID_BOARD(1, PHONE, CLVTP) ||
+			(INTEL_MID_BOARD(1, TABLET, CLVT)))
+		pdev->dev.platform_data = &pdata[ctp_thermal];
+	else if (INTEL_MID_BOARD(2, PHONE, MFLD, LEX, ENG) ||
+			(INTEL_MID_BOARD(2, PHONE, MFLD, LEX, PRO)))
+		pdev->dev.platform_data = &pdata[lex_thermal];
+	else
+		pdev->dev.platform_data = &pdata[mfld_thermal];
+
+	register_rpmsg_service("rpmsg_mid_thermal", RPROC_SCU, RP_MSIC_THERMAL);
+
+	return 0;
 }
@@ -12,6 +12,15 @@
 #ifndef _PLATFORM_MSIC_THERMAL_H_
 #define _PLATFORM_MSIC_THERMAL_H_
 
+#define MSIC_THERM_DEV_NAME "msic_thermal"
+
 extern void __init *msic_thermal_platform_data(void *info)
 			__attribute__((weak));
+enum {
+	mfld_thermal,
+	ctp_thermal,
+	lex_thermal,
+	vb_thermal,
+};
+
 #endif
@@ -39,7 +39,6 @@ obj-$(CONFIG_TOSHIBA_BT_RFKILL)	+= toshiba_bluetooth.o
 obj-$(CONFIG_INTEL_SCU_IPC)	+= intel_scu_ipc.o intel_scu_pmic.o intel_scu_mip.o intel_scu_fw_update.o
 obj-$(CONFIG_INTEL_SCU_IPC_UTIL) += intel_scu_ipcutil.o
 obj-$(CONFIG_INTEL_SCU_FLIS)	+= intel_scu_flis.o
-obj-$(CONFIG_INTEL_MFLD_THERMAL) += intel_mid_thermal.o
 obj-$(CONFIG_INTEL_IPS)		+= intel_ips.o
 obj-$(CONFIG_GPIO_INTEL_PMIC)	+= intel_pmic_gpio.o
 obj-$(CONFIG_XO1_RFKILL)	+= xo1-rfkill.o