@@ -172,6 +172,9 @@ struct rockchip_thermal_data {
int tshut_temp;
enum tshut_mode tshut_mode;
enum tshut_polarity tshut_polarity;
+ struct pinctrl *pinctrl;
+ struct pinctrl_state *gpio_state;
+ struct pinctrl_state *otp_state;
};
/**
@@ -1242,6 +1245,8 @@ static int rockchip_thermal_probe(struct platform_device *pdev)
return error;
}
+ thermal->chip->control(thermal->regs, false);
+
error = clk_prepare_enable(thermal->clk);
if (error) {
dev_err(&pdev->dev, "failed to enable converter clock: %d\n",
@@ -1267,6 +1272,30 @@ static int rockchip_thermal_probe(struct platform_device *pdev)
thermal->chip->initialize(thermal->grf, thermal->regs,
thermal->tshut_polarity);
+ if (thermal->tshut_mode == TSHUT_MODE_GPIO) {
+ thermal->pinctrl = devm_pinctrl_get(&pdev->dev);
+ if (IS_ERR(thermal->pinctrl)) {
+ dev_err(&pdev->dev, "failed to find thermal pinctrl\n");
+ return PTR_ERR(thermal->pinctrl);
+ }
+
+ thermal->gpio_state = pinctrl_lookup_state(thermal->pinctrl,
+ "gpio");
+ if (IS_ERR_OR_NULL(thermal->gpio_state)) {
+ dev_err(&pdev->dev, "failed to find thermal gpio state\n");
+ return -EINVAL;
+ }
+
+ thermal->otp_state = pinctrl_lookup_state(thermal->pinctrl,
+ "otpout");
+ if (IS_ERR_OR_NULL(thermal->otp_state)) {
+ dev_err(&pdev->dev, "failed to find thermal otpout state\n");
+ return -EINVAL;
+ }
+
+ pinctrl_select_state(thermal->pinctrl, thermal->otp_state);
+ }
+
for (i = 0; i < thermal->chip->chn_num; i++) {
error = rockchip_thermal_register_sensor(pdev, thermal,
&thermal->sensors[i],
@@ -1337,8 +1366,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);
+ if (thermal->tshut_mode == TSHUT_MODE_GPIO)
+ pinctrl_select_state(thermal->pinctrl, thermal->gpio_state);
return 0;
}
@@ -1383,7 +1412,8 @@ static int __maybe_unused rockchip_thermal_resume(struct device *dev)
for (i = 0; i < thermal->chip->chn_num; i++)
rockchip_thermal_toggle_sensor(&thermal->sensors[i], true);
- pinctrl_pm_select_default_state(dev);
+ if (thermal->tshut_mode == TSHUT_MODE_GPIO)
+ pinctrl_select_state(thermal->pinctrl, thermal->otp_state);
return 0;
}
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * This automated bisection report was sent to you on the basis * * that you may be involved with the breaking commit it has * * found. No manual investigation has been done to verify it, * * and the root cause of the problem may be somewhere else. * * Hope this helps! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * next/master boot bisection: next-20190513 on rk3288-veyron-jaq Summary: Start: 04c4b6775d34 Add linux-next specific files for 20190513 Details: https://kernelci.org/boot/id/5cd91b7859b514af767a3628 Plain log: https://storage.kernelci.org//next/master/next-20190513/arm/multi_v7_defconfig+CONFIG_EFI=y+CONFIG_ARM_LPAE=y/gcc-8/lab-collabora/boot-rk3288-veyron-jaq.txt HTML log: https://storage.kernelci.org//next/master/next-20190513/arm/multi_v7_defconfig+CONFIG_EFI=y+CONFIG_ARM_LPAE=y/gcc-8/lab-collabora/boot-rk3288-veyron-jaq.html Result: 691d4947face thermal: rockchip: fix up the tsadc pinctrl setting error Checks: revert: PASS verify: PASS Parameters: Tree: next URL: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git Branch: master Target: rk3288-veyron-jaq CPU arch: arm Lab: lab-collabora Compiler: gcc-8 Config: multi_v7_defconfig+CONFIG_EFI=y+CONFIG_ARM_LPAE=y Test suite: boot Breaking commit found: ------------------------------------------------------------------------------- commit 691d4947faceb8bd841900049e07c81c95ca4b0d Author: Elaine Zhang <zhangqing@rock-chips.com> Date: Tue Apr 30 18:09:44 2019 +0800 thermal: rockchip: fix up the tsadc pinctrl setting error Explicitly use the pinctrl to set/unset the right mode instead of relying on the pinctrl init mode. And it requires setting the tshut polarity before select pinctrl. When the temperature sensor mode is set to 0, it will automatically reset the board via the Clock-Reset-Unit (CRU) if the over temperature threshold is reached. However, when the pinctrl initializes, it does a transition to "otp_out" which may lead the SoC restart all the time. "otp_out" IO may be connected to the RESET circuit on the hardware. If the IO is in the wrong state, it will trigger RESET. (similar to the effect of pressing the RESET button) which will cause the soc to restart all the time. Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com> Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org> Signed-off-by: Eduardo Valentin <edubezval@gmail.com> ------------------------------------------------------------------------------- Git bisection log: ------------------------------------------------------------------------------- git bisect start # good: [d7a02fa0a8f9ec1b81d57628ca9834563208ef33] Merge tag 'upstream-5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/rw/ubifs git bisect good d7a02fa0a8f9ec1b81d57628ca9834563208ef33 # bad: [04c4b6775d34f12f196e056debed9e8718585342] Add linux-next specific files for 20190513 git bisect bad 04c4b6775d34f12f196e056debed9e8718585342 # good: [c5d6b0b49382b9a81ac76e680af9d0d8943640e7] Merge remote-tracking branch 'pci/next' git bisect good c5d6b0b49382b9a81ac76e680af9d0d8943640e7 # bad: [a8f3999da21582f933c597a5489e415b51195322] Merge remote-tracking branch 'watchdog/master' git bisect bad a8f3999da21582f933c597a5489e415b51195322 # bad: [8018a14af78918f9cc3ec419b87c8e3fa3f3a9ca] Merge remote-tracking branch 'input/next' git bisect bad 8018a14af78918f9cc3ec419b87c8e3fa3f3a9ca # good: [f1bc5d2316d1b88675dcf799d88cb973f6508bee] Merge remote-tracking branch 'cpupower/cpupower' git bisect good f1bc5d2316d1b88675dcf799d88cb973f6508bee # bad: [a7257dd808e08b65ac8c3bee267c8a9d2e26e2b9] Merge remote-tracking branch 'drm/drm-next' git bisect bad a7257dd808e08b65ac8c3bee267c8a9d2e26e2b9 # bad: [be827ffd38ea1de8f61b1fce0b25801321a20b2e] thermal: rcar_gen3_thermal: Fix to show correct trip points number git bisect bad be827ffd38ea1de8f61b1fce0b25801321a20b2e # good: [901c7225ca1170e5bcaca48cbbc580b18f754c0c] drivers: thermal: tsens: Introduce IP-specific max_sensor count git bisect good 901c7225ca1170e5bcaca48cbbc580b18f754c0c # good: [4e211e068ae955811ecfd1584275c704251637fe] thermal: Introduce devm_thermal_of_cooling_device_register git bisect good 4e211e068ae955811ecfd1584275c704251637fe # good: [01dfda3fcc01c8f9989915742fc43ff137c58970] thermal: Fix build error of missing devm_ioremap_resource on UM git bisect good 01dfda3fcc01c8f9989915742fc43ff137c58970 # bad: [fb27a6c55da7475509589a5fc4799c058679c5a7] dt-bindings: rockchip-thermal: Support the PX30 SoC compatible git bisect bad fb27a6c55da7475509589a5fc4799c058679c5a7 # bad: [691d4947faceb8bd841900049e07c81c95ca4b0d] thermal: rockchip: fix up the tsadc pinctrl setting error git bisect bad 691d4947faceb8bd841900049e07c81c95ca4b0d # good: [f88f39be23c6cd65674e6d39ae268c7341960d96] thermal: broadcom: Remove ACPI support git bisect good f88f39be23c6cd65674e6d39ae268c7341960d96 # first bad commit: [691d4947faceb8bd841900049e07c81c95ca4b0d] thermal: rockchip: fix up the tsadc pinctrl setting error -------------------------------------------------------------------------------