Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54d8ccc3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal 

Pull last minute thermal-SoC management fixes from Eduardo Valentin:
 "Specifics:

   - Minor fixes on ST and RCAR thermal drivers.
   - Avoid flooding kernel log when driver returns -EAGAIN.

  Note: I am sending this pull on Rui's behalf while he fixes issues in
  his Linux box"

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal:
  drivers: thermal: st: remove several sparse warnings
  thermal: constify of_device_id array
  thermal: Do not log an error if thermal_zone_get_temp returns -EAGAIN
  thermal: rcar: Fix typo in r8a73a4 SoC name
parents 56fd85b5 541d529f

Documentation/devicetree/bindings/thermal/rcar-thermal.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,7 @@ Required properties: 
- compatible		: "renesas,thermal-<soctype>", "renesas,rcar-thermal"

- compatible		: "renesas,thermal-<soctype>", "renesas,rcar-thermal"

			  as fallback.

			  as fallback.

			  Examples with soctypes are:

			  Examples with soctypes are:

			    - "renesas,thermal-r8a73a4" (R-Mobile AP6)

			    - "renesas,thermal-r8a73a4" (R-Mobile APE6)

			    - "renesas,thermal-r8a7779" (R-Car H1)

			    - "renesas,thermal-r8a7779" (R-Car H1)

			    - "renesas,thermal-r8a7790" (R-Car H2)

			    - "renesas,thermal-r8a7790" (R-Car H2)

			    - "renesas,thermal-r8a7791" (R-Car M2-W)

			    - "renesas,thermal-r8a7791" (R-Car M2-W)

drivers/thermal/st/st_thermal.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ 
 * Function to allocate regfields which are common

 * Function to allocate regfields which are common

 * between syscfg and memory mapped based sensors

 * between syscfg and memory mapped based sensors

 */

 */

int st_thermal_alloc_regfields(struct st_thermal_sensor *sensor)

static int st_thermal_alloc_regfields(struct st_thermal_sensor *sensor)

{

{

	struct device *dev = sensor->dev;

	struct device *dev = sensor->dev;

	struct regmap *regmap = sensor->regmap;

	struct regmap *regmap = sensor->regmap;

drivers/thermal/st/st_thermal_memmap.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -157,7 +157,7 @@ static const struct st_thermal_sensor_ops st_mmap_sensor_ops = { 
};

};





/* Compatible device data stih416 mpe thermal sensor */

/* Compatible device data stih416 mpe thermal sensor */

const struct st_thermal_compat_data st_416mpe_cdata = {

static const struct st_thermal_compat_data st_416mpe_cdata = {

	.reg_fields		= st_mmap_thermal_regfields,

	.reg_fields		= st_mmap_thermal_regfields,

	.ops			= &st_mmap_sensor_ops,

	.ops			= &st_mmap_sensor_ops,

	.calibration_val	= 14,

	.calibration_val	= 14,
@@ -166,7 +166,7 @@ const struct st_thermal_compat_data st_416mpe_cdata = { 
};

};





/* Compatible device data stih407 thermal sensor */

/* Compatible device data stih407 thermal sensor */

const struct st_thermal_compat_data st_407_cdata = {

static const struct st_thermal_compat_data st_407_cdata = {

	.reg_fields		= st_mmap_thermal_regfields,

	.reg_fields		= st_mmap_thermal_regfields,

	.ops			= &st_mmap_sensor_ops,

	.ops			= &st_mmap_sensor_ops,

	.calibration_val	= 16,

	.calibration_val	= 16,
@@ -174,19 +174,19 @@ const struct st_thermal_compat_data st_407_cdata = { 
	.crit_temp		= 120,

	.crit_temp		= 120,

};

};





static struct of_device_id st_mmap_thermal_of_match[] = {

static const struct of_device_id st_mmap_thermal_of_match[] = {

	{ .compatible = "st,stih416-mpe-thermal", .data = &st_416mpe_cdata },

	{ .compatible = "st,stih416-mpe-thermal", .data = &st_416mpe_cdata },

	{ .compatible = "st,stih407-thermal",     .data = &st_407_cdata },

	{ .compatible = "st,stih407-thermal",     .data = &st_407_cdata },

	{ /* sentinel */ }

	{ /* sentinel */ }

};

};

MODULE_DEVICE_TABLE(of, st_mmap_thermal_of_match);

MODULE_DEVICE_TABLE(of, st_mmap_thermal_of_match);





int st_mmap_probe(struct platform_device *pdev)

static int st_mmap_probe(struct platform_device *pdev)

{

{

	return st_thermal_register(pdev,  st_mmap_thermal_of_match);

	return st_thermal_register(pdev,  st_mmap_thermal_of_match);

}

}





int st_mmap_remove(struct platform_device *pdev)

static int st_mmap_remove(struct platform_device *pdev)

{

{

	return st_thermal_unregister(pdev);

	return st_thermal_unregister(pdev);

}

}

drivers/thermal/st/st_thermal_syscfg.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -104,7 +104,7 @@ static const struct st_thermal_sensor_ops st_syscfg_sensor_ops = { 
};

};





/* Compatible device data for stih415 sas thermal sensor */

/* Compatible device data for stih415 sas thermal sensor */

const struct st_thermal_compat_data st_415sas_cdata = {

static const struct st_thermal_compat_data st_415sas_cdata = {

	.sys_compat		= "st,stih415-front-syscfg",

	.sys_compat		= "st,stih415-front-syscfg",

	.reg_fields		= st_415sas_regfields,

	.reg_fields		= st_415sas_regfields,

	.ops			= &st_syscfg_sensor_ops,

	.ops			= &st_syscfg_sensor_ops,
@@ -114,7 +114,7 @@ const struct st_thermal_compat_data st_415sas_cdata = { 
};

};





/* Compatible device data for stih415 mpe thermal sensor */

/* Compatible device data for stih415 mpe thermal sensor */

const struct st_thermal_compat_data st_415mpe_cdata = {

static const struct st_thermal_compat_data st_415mpe_cdata = {

	.sys_compat		= "st,stih415-system-syscfg",

	.sys_compat		= "st,stih415-system-syscfg",

	.reg_fields		= st_415mpe_regfields,

	.reg_fields		= st_415mpe_regfields,

	.ops			= &st_syscfg_sensor_ops,

	.ops			= &st_syscfg_sensor_ops,
@@ -124,7 +124,7 @@ const struct st_thermal_compat_data st_415mpe_cdata = { 
};

};





/* Compatible device data for stih416 sas thermal sensor */

/* Compatible device data for stih416 sas thermal sensor */

const struct st_thermal_compat_data st_416sas_cdata = {

static const struct st_thermal_compat_data st_416sas_cdata = {

	.sys_compat		= "st,stih416-front-syscfg",

	.sys_compat		= "st,stih416-front-syscfg",

	.reg_fields		= st_416sas_regfields,

	.reg_fields		= st_416sas_regfields,

	.ops			= &st_syscfg_sensor_ops,

	.ops			= &st_syscfg_sensor_ops,
@@ -134,7 +134,7 @@ const struct st_thermal_compat_data st_416sas_cdata = { 
};

};





/* Compatible device data for stid127 thermal sensor */

/* Compatible device data for stid127 thermal sensor */

const struct st_thermal_compat_data st_127_cdata = {

static const struct st_thermal_compat_data st_127_cdata = {

	.sys_compat		= "st,stid127-cpu-syscfg",

	.sys_compat		= "st,stid127-cpu-syscfg",

	.reg_fields		= st_127_regfields,

	.reg_fields		= st_127_regfields,

	.ops			= &st_syscfg_sensor_ops,

	.ops			= &st_syscfg_sensor_ops,
@@ -143,7 +143,7 @@ const struct st_thermal_compat_data st_127_cdata = { 
	.crit_temp		= 120,

	.crit_temp		= 120,

};

};





static struct of_device_id st_syscfg_thermal_of_match[] = {

static const struct of_device_id st_syscfg_thermal_of_match[] = {

	{ .compatible = "st,stih415-sas-thermal", .data = &st_415sas_cdata },

	{ .compatible = "st,stih415-sas-thermal", .data = &st_415sas_cdata },

	{ .compatible = "st,stih415-mpe-thermal", .data = &st_415mpe_cdata },

	{ .compatible = "st,stih415-mpe-thermal", .data = &st_415mpe_cdata },

	{ .compatible = "st,stih416-sas-thermal", .data = &st_416sas_cdata },

	{ .compatible = "st,stih416-sas-thermal", .data = &st_416sas_cdata },
@@ -152,12 +152,12 @@ static struct of_device_id st_syscfg_thermal_of_match[] = { 
};

};

MODULE_DEVICE_TABLE(of, st_syscfg_thermal_of_match);

MODULE_DEVICE_TABLE(of, st_syscfg_thermal_of_match);





int st_syscfg_probe(struct platform_device *pdev)

static int st_syscfg_probe(struct platform_device *pdev)

{

{

	return st_thermal_register(pdev, st_syscfg_thermal_of_match);

	return st_thermal_register(pdev, st_syscfg_thermal_of_match);

}

}





int st_syscfg_remove(struct platform_device *pdev)

static int st_syscfg_remove(struct platform_device *pdev)

{

{

	return st_thermal_unregister(pdev);

	return st_thermal_unregister(pdev);

}

}

drivers/thermal/thermal_core.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -458,8 +458,10 @@ static void update_temperature(struct thermal_zone_device *tz) 




	ret = thermal_zone_get_temp(tz, &temp);

	ret = thermal_zone_get_temp(tz, &temp);

	if (ret) {

	if (ret) {

		dev_warn(&tz->device, "failed to read out thermal zone %d\n",

		if (ret != -EAGAIN)

			 tz->id);

			dev_warn(&tz->device,

				 "failed to read out thermal zone (%d)\n",

				 ret);

		return;

		return;

	}

	}