|
@@ -1289,13 +1289,6 @@ 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
|
|
@@ -1365,21 +1358,36 @@ static int exynos_tmu_probe(struct platform_device *pdev)
|
|
|
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:
|
|
@@ -1390,7 +1398,6 @@ err_clk_sec:
|
|
|
err_sensor:
|
|
|
if (!IS_ERR_OR_NULL(data->regulator))
|
|
|
regulator_disable(data->regulator);
|
|
|
- thermal_zone_of_sensor_unregister(&pdev->dev, data->tzd);
|
|
|
|
|
|
return ret;
|
|
|
}
|