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

Commit c422a8ed authored by Zhang Rui's avatar Zhang Rui
Browse files

Merge branch 'linus' of... 

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc
parents c75960aa e35dbb4d

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

+9 −2
Original line number Diff line number Diff line
@@ -12,6 +12,11 @@ Required properties: 
- resets : Must contain an entry for each entry in reset-names.

	   See ../reset/reset.txt for details.

- reset-names : Must include the name "tsadc-apb".

- pinctrl-names : The pin control state names;

- pinctrl-0 : The "init" pinctrl state, it will be set before device probe.

- pinctrl-1 : The "default" pinctrl state, it will be set after reset the

	      TSADC controller.

- pinctrl-2 : The "sleep" pinctrl state, it will be in for suspend.

- #thermal-sensor-cells : Should be 1. See ./thermal.txt for a description.

- rockchip,hw-tshut-temp : The hardware-controlled shutdown temperature value.

- rockchip,hw-tshut-mode : The hardware-controlled shutdown mode 0:CRU 1:GPIO.
@@ -27,8 +32,10 @@ tsadc: tsadc@ff280000 { 
	clock-names = "tsadc", "apb_pclk";

	resets = <&cru SRST_TSADC>;

	reset-names = "tsadc-apb";

	pinctrl-names = "default";

	pinctrl-0 = <&otp_out>;

	pinctrl-names = "init", "default", "sleep";

	pinctrl-0 = <&otp_gpio>;

	pinctrl-1 = <&otp_out>;

	pinctrl-2 = <&otp_gpio>;

	#thermal-sensor-cells = <1>;

	rockchip,hw-tshut-temp = <95000>;

	rockchip,hw-tshut-mode = <0>;

drivers/thermal/devfreq_cooling.c

+12 −8
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ static unsigned long 
get_dynamic_power(struct devfreq_cooling_device *dfc, unsigned long freq,

		  unsigned long voltage)

{

	unsigned long power;

	u64 power;

	u32 freq_mhz;

	struct devfreq_cooling_power *dfc_power = dfc->power_ops;
@@ -397,7 +397,7 @@ static int devfreq_cooling_gen_tables(struct devfreq_cooling_device *dfc) 
		power_table = kcalloc(num_opps, sizeof(*power_table),

				      GFP_KERNEL);

		if (!power_table)

			ret = -ENOMEM;

			return -ENOMEM;

	}



	freq_table = kcalloc(num_opps, sizeof(*freq_table),
@@ -467,7 +467,7 @@ static int devfreq_cooling_gen_tables(struct devfreq_cooling_device *dfc) 
 * devfreq should use the simple_ondemand governor, other governors

 * are not currently supported.

 */

struct devfreq_cooling_device *

struct thermal_cooling_device *

of_devfreq_cooling_register_power(struct device_node *np, struct devfreq *df,

				  struct devfreq_cooling_power *dfc_power)

{
@@ -513,7 +513,7 @@ of_devfreq_cooling_register_power(struct device_node *np, struct devfreq *df, 


	dfc->cdev = cdev;



	return dfc;

	return cdev;



release_idr:

	release_idr(&devfreq_idr, dfc->id);
@@ -533,7 +533,7 @@ EXPORT_SYMBOL_GPL(of_devfreq_cooling_register_power); 
 * @np: Pointer to OF device_node.

 * @df: Pointer to devfreq device.

 */

struct devfreq_cooling_device *

struct thermal_cooling_device *

of_devfreq_cooling_register(struct device_node *np, struct devfreq *df)

{

	return of_devfreq_cooling_register_power(np, df, NULL);
@@ -544,7 +544,7 @@ EXPORT_SYMBOL_GPL(of_devfreq_cooling_register); 
 * devfreq_cooling_register() - Register devfreq cooling device.

 * @df: Pointer to devfreq device.

 */

struct devfreq_cooling_device *devfreq_cooling_register(struct devfreq *df)

struct thermal_cooling_device *devfreq_cooling_register(struct devfreq *df)

{

	return of_devfreq_cooling_register(NULL, df);

}
@@ -554,11 +554,15 @@ EXPORT_SYMBOL_GPL(devfreq_cooling_register); 
 * devfreq_cooling_unregister() - Unregister devfreq cooling device.

 * @dfc: Pointer to devfreq cooling device to unregister.

 */

void devfreq_cooling_unregister(struct devfreq_cooling_device *dfc)

void devfreq_cooling_unregister(struct thermal_cooling_device *cdev)

{

	if (!dfc)

	struct devfreq_cooling_device *dfc;



	if (!cdev)

		return;



	dfc = cdev->devdata;



	thermal_cooling_device_unregister(dfc->cdev);

	release_idr(&devfreq_idr, dfc->id);

	kfree(dfc->power_table);

drivers/thermal/rockchip_thermal.c

+4 −0
Original line number Diff line number Diff line
@@ -638,6 +638,8 @@ static int __maybe_unused rockchip_thermal_suspend(struct device *dev) 
	clk_disable(thermal->pclk);

	clk_disable(thermal->clk);



	pinctrl_pm_select_sleep_state(dev);



	return 0;

}
@@ -674,6 +676,8 @@ static int __maybe_unused rockchip_thermal_resume(struct device *dev) 
	for (i = 0; i < ARRAY_SIZE(thermal->sensors); i++)

		rockchip_thermal_toggle_sensor(&thermal->sensors[i], true);



	pinctrl_pm_select_default_state(dev);



	return 0;

}

drivers/thermal/samsung/exynos_tmu.c

+38 −30
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ static int exynos5433_tmu_initialize(struct platform_device *pdev) 
	default:

		pdata->cal_type = TYPE_ONE_POINT_TRIMMING;

		break;

	};

	}



	dev_info(&pdev->dev, "Calibration type is %d-point calibration\n",

			cal_type ?  2 : 1);
@@ -608,7 +608,7 @@ static int exynos5440_tmu_initialize(struct platform_device *pdev) 
{

	struct exynos_tmu_data *data = platform_get_drvdata(pdev);

	unsigned int trim_info = 0, con, rising_threshold;

	int ret = 0, threshold_code;

	int threshold_code;

	int crit_temp = 0;



	/*
@@ -651,7 +651,8 @@ static int exynos5440_tmu_initialize(struct platform_device *pdev) 
	/* Clear the PMIN in the common TMU register */

	if (!data->id)

		writel(0, data->base_second + EXYNOS5440_TMU_PMIN);

	return ret;



	return 0;

}



static int exynos7_tmu_initialize(struct platform_device *pdev)
@@ -1168,27 +1169,10 @@ static int exynos_map_dt_data(struct platform_device *pdev) 
	struct exynos_tmu_data *data = platform_get_drvdata(pdev);

	struct exynos_tmu_platform_data *pdata;

	struct resource res;

	int ret;



	if (!data || !pdev->dev.of_node)

		return -ENODEV;



	/*

	 * Try enabling the regulator if found

	 * TODO: Add regulator as an SOC feature, so that regulator enable

	 * is a compulsory call.

	 */

	data->regulator = devm_regulator_get(&pdev->dev, "vtmu");

	if (!IS_ERR(data->regulator)) {

		ret = regulator_enable(data->regulator);

		if (ret) {

			dev_err(&pdev->dev, "failed to enable vtmu\n");

			return ret;

		}

	} else {

		dev_info(&pdev->dev, "Regulator node (vtmu) not found\n");

	}



	data->id = of_alias_get_id(pdev->dev.of_node, "tmuctrl");

	if (data->id < 0)

		data->id = 0;
@@ -1306,12 +1290,22 @@ static int exynos_tmu_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, data);

	mutex_init(&data->lock);



	data->tzd = thermal_zone_of_sensor_register(&pdev->dev, 0, data,

						    &exynos_sensor_ops);

	if (IS_ERR(data->tzd)) {

		pr_err("thermal: tz: %p ERROR\n", data->tzd);

		return PTR_ERR(data->tzd);

	/*

	 * Try enabling the regulator if found

	 * TODO: Add regulator as an SOC feature, so that regulator enable

	 * is a compulsory call.

	 */

	data->regulator = devm_regulator_get(&pdev->dev, "vtmu");

	if (!IS_ERR(data->regulator)) {

		ret = regulator_enable(data->regulator);

		if (ret) {

			dev_err(&pdev->dev, "failed to enable vtmu\n");

			return ret;

		}

	} else {

		dev_info(&pdev->dev, "Regulator node (vtmu) not found\n");

	}



	ret = exynos_map_dt_data(pdev);

	if (ret)

		goto err_sensor;
@@ -1363,23 +1357,38 @@ static int exynos_tmu_probe(struct platform_device *pdev) 
		break;

	default:

		break;

	};

	}



	/*

	 * data->tzd must be registered before calling exynos_tmu_initialize(),

	 * requesting irq and calling exynos_tmu_control().

	 */

	data->tzd = thermal_zone_of_sensor_register(&pdev->dev, 0, data,

						    &exynos_sensor_ops);

	if (IS_ERR(data->tzd)) {

		ret = PTR_ERR(data->tzd);

		dev_err(&pdev->dev, "Failed to register sensor: %d\n", ret);

		goto err_sclk;

	}



	ret = exynos_tmu_initialize(pdev);

	if (ret) {

		dev_err(&pdev->dev, "Failed to initialize TMU\n");

		goto err_sclk;

		goto err_thermal;

	}



	ret = devm_request_irq(&pdev->dev, data->irq, exynos_tmu_irq,

		IRQF_TRIGGER_RISING | IRQF_SHARED, dev_name(&pdev->dev), data);

	if (ret) {

		dev_err(&pdev->dev, "Failed to request irq: %d\n", data->irq);

		goto err_sclk;

		goto err_thermal;

	}



	exynos_tmu_control(pdev, true);

	return 0;



err_thermal:

	thermal_zone_of_sensor_unregister(&pdev->dev, data->tzd);

err_sclk:

	clk_disable_unprepare(data->sclk);

err_clk:
@@ -1388,9 +1397,8 @@ static int exynos_tmu_probe(struct platform_device *pdev) 
	if (!IS_ERR(data->clk_sec))

		clk_unprepare(data->clk_sec);

err_sensor:

	if (!IS_ERR_OR_NULL(data->regulator))

	if (!IS_ERR(data->regulator))

		regulator_disable(data->regulator);

	thermal_zone_of_sensor_unregister(&pdev->dev, data->tzd);



	return ret;

}

include/linux/devfreq_cooling.h

+8 −8
Original line number Diff line number Diff line
@@ -43,37 +43,37 @@ struct devfreq_cooling_power { 
	unsigned long dyn_power_coeff;

};



struct devfreq_cooling_device *

struct thermal_cooling_device *

of_devfreq_cooling_register_power(struct device_node *np, struct devfreq *df,

				  struct devfreq_cooling_power *dfc_power);

struct devfreq_cooling_device *

struct thermal_cooling_device *

of_devfreq_cooling_register(struct device_node *np, struct devfreq *df);

struct devfreq_cooling_device *devfreq_cooling_register(struct devfreq *df);

void devfreq_cooling_unregister(struct devfreq_cooling_device *dfc);

struct thermal_cooling_device *devfreq_cooling_register(struct devfreq *df);

void devfreq_cooling_unregister(struct thermal_cooling_device *dfc);



#else /* !CONFIG_DEVFREQ_THERMAL */



struct devfreq_cooling_device *

struct thermal_cooling_device *

of_devfreq_cooling_register_power(struct device_node *np, struct devfreq *df,

				  struct devfreq_cooling_power *dfc_power)

{

	return ERR_PTR(-EINVAL);

}



static inline struct devfreq_cooling_device *

static inline struct thermal_cooling_device *

of_devfreq_cooling_register(struct device_node *np, struct devfreq *df)

{

	return ERR_PTR(-EINVAL);

}



static inline struct devfreq_cooling_device *

static inline struct thermal_cooling_device *

devfreq_cooling_register(struct devfreq *df)

{

	return ERR_PTR(-EINVAL);

}



static inline void

devfreq_cooling_unregister(struct devfreq_cooling_device *dfc)

devfreq_cooling_unregister(struct thermal_cooling_device *dfc)

{

}