From: Linus Torvalds Date: Thu, 16 May 2019 14:56:57 +0000 (-0700) Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux... X-Git-Tag: v5.4-rc1~970 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a455eda33faafcaac1effb31d682765b14ef868c;p=platform%2Fkernel%2Flinux-rpi.git Merge branch 'linus' of git://git./linux/kernel/git/evalenti/linux-soc-thermal Pull thermal soc updates from Eduardo Valentin: - thermal core has a new devm_* API for registering cooling devices. I took the entire series, that is why you see changes on drivers/hwmon in this pull (Guenter Roeck) - rockchip thermal driver gains support to PX30 SoC (Elaine Zhang) - the generic-adc thermal driver now considers the lookup table DT property as optional (Jean-Francois Dagenais) - Refactoring of tsens thermal driver (Amit Kucheria) - Cleanups on cpu cooling driver (Daniel Lezcano) - broadcom thermal driver dropped support to ACPI (Srinath Mannam) - tegra thermal driver gains support to OC hw throttle and GPU throtle (Wei Ni) - Fixes in several thermal drivers. * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal: (59 commits) hwmon: (pwm-fan) Use devm_thermal_of_cooling_device_register hwmon: (npcm750-pwm-fan) Use devm_thermal_of_cooling_device_register hwmon: (mlxreg-fan) Use devm_thermal_of_cooling_device_register hwmon: (gpio-fan) Use devm_thermal_of_cooling_device_register hwmon: (aspeed-pwm-tacho) Use devm_thermal_of_cooling_device_register thermal: rcar_gen3_thermal: Fix to show correct trip points number thermal: rcar_thermal: update calculation formula for R-Car Gen3 SoCs thermal: cpu_cooling: Actually trace CPU load in thermal_power_cpu_get_power thermal: rockchip: Support the PX30 SoC in thermal driver dt-bindings: rockchip-thermal: Support the PX30 SoC compatible thermal: rockchip: fix up the tsadc pinctrl setting error thermal: broadcom: Remove ACPI support thermal: Fix build error of missing devm_ioremap_resource on UM thermal/drivers/cpu_cooling: Remove pointless field thermal/drivers/cpu_cooling: Add Software Package Data Exchange (SPDX) thermal/drivers/cpu_cooling: Fixup the header and copyright thermal/drivers/cpu_cooling: Remove pointless test in power2state() thermal: rcar_gen3_thermal: disable interrupt in .remove thermal: rcar_gen3_thermal: fix interrupt type thermal: Introduce devm_thermal_of_cooling_device_register ... --- a455eda33faafcaac1effb31d682765b14ef868c diff --cc MAINTAINERS index ee6cf4d,4d08f59..59efb8b --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -742,6 -735,6 +742,12 @@@ F: drivers/tty/serial/altera_jtaguart. F: include/linux/altera_uart.h F: include/linux/altera_jtaguart.h ++AMAZON ANNAPURNA LABS THERMAL MMIO DRIVER ++M: Talel Shenhar ++S: Maintained ++F: Documentation/devicetree/bindings/thermal/amazon,al-thermal.txt ++F: drivers/thermal/thermal_mmio.c ++ AMAZON ETHERNET DRIVERS M: Netanel Belgazal R: Saeed Bishara diff --cc drivers/hwmon/pwm-fan.c index eead8af,0243ba7..5fb2745 --- a/drivers/hwmon/pwm-fan.c +++ b/drivers/hwmon/pwm-fan.c @@@ -273,6 -207,16 +273,18 @@@ static int pwm_fan_of_get_cooling_data( return 0; } + static void pwm_fan_regulator_disable(void *data) + { + regulator_disable(data); + } + -static void pwm_fan_pwm_disable(void *data) ++static void pwm_fan_pwm_disable(void *__ctx) + { - pwm_disable(data); ++ struct pwm_fan_ctx *ctx = __ctx; ++ pwm_disable(ctx->pwm); ++ del_timer_sync(&ctx->rpm_timer); + } + static int pwm_fan_probe(struct platform_device *pdev) { struct thermal_cooling_device *cdev; @@@ -280,9 -225,8 +293,9 @@@ struct device *hwmon; int ret; struct pwm_state state = { }; + u32 ppr = 2; - ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL); + ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL); if (!ctx) return -ENOMEM; @@@ -300,11 -244,7 +313,11 @@@ platform_set_drvdata(pdev, ctx); + ctx->irq = platform_get_irq(pdev, 0); + if (ctx->irq == -EPROBE_DEFER) + return ctx->irq; + - ctx->reg_en = devm_regulator_get_optional(&pdev->dev, "fan"); + ctx->reg_en = devm_regulator_get_optional(dev, "fan"); if (IS_ERR(ctx->reg_en)) { if (PTR_ERR(ctx->reg_en) != -ENODEV) return PTR_ERR(ctx->reg_en); @@@ -328,56 -269,30 +342,51 @@@ ret = pwm_apply_state(ctx->pwm, &state); if (ret) { - dev_err(&pdev->dev, "Failed to configure PWM: %d\n", ret); - goto err_reg_disable; - dev_err(dev, "Failed to configure PWM\n"); ++ dev_err(dev, "Failed to configure PWM: %d\n", ret); + return ret; } - - devm_add_action_or_reset(dev, pwm_fan_pwm_disable, ctx->pwm); + timer_setup(&ctx->rpm_timer, sample_timer, 0); ++ devm_add_action_or_reset(dev, pwm_fan_pwm_disable, ctx); + - of_property_read_u32(pdev->dev.of_node, "pulses-per-revolution", &ppr); ++ of_property_read_u32(dev->of_node, "pulses-per-revolution", &ppr); + ctx->pulses_per_revolution = ppr; + if (!ctx->pulses_per_revolution) { - dev_err(&pdev->dev, "pulses-per-revolution can't be zero.\n"); - ret = -EINVAL; - goto err_pwm_disable; ++ dev_err(dev, "pulses-per-revolution can't be zero.\n"); ++ return -EINVAL; + } + + if (ctx->irq > 0) { - ret = devm_request_irq(&pdev->dev, ctx->irq, pulse_handler, 0, ++ ret = devm_request_irq(dev, ctx->irq, pulse_handler, 0, + pdev->name, ctx); + if (ret) { - dev_err(&pdev->dev, - "Failed to request interrupt: %d\n", ret); - goto err_pwm_disable; ++ dev_err(dev, "Failed to request interrupt: %d\n", ret); ++ return ret; + } + ctx->sample_start = ktime_get(); + mod_timer(&ctx->rpm_timer, jiffies + HZ); + } - hwmon = devm_hwmon_device_register_with_groups(&pdev->dev, "pwmfan", + hwmon = devm_hwmon_device_register_with_groups(dev, "pwmfan", ctx, pwm_fan_groups); if (IS_ERR(hwmon)) { - ret = PTR_ERR(hwmon); - dev_err(&pdev->dev, - "Failed to register hwmon device: %d\n", ret); - goto err_del_timer; + dev_err(dev, "Failed to register hwmon device\n"); + return PTR_ERR(hwmon); } - ret = pwm_fan_of_get_cooling_data(&pdev->dev, ctx); + ret = pwm_fan_of_get_cooling_data(dev, ctx); if (ret) - goto err_del_timer; + return ret; ctx->pwm_fan_state = ctx->pwm_fan_max_state; if (IS_ENABLED(CONFIG_THERMAL)) { - cdev = thermal_of_cooling_device_register(pdev->dev.of_node, - "pwm-fan", ctx, - &pwm_fan_cooling_ops); + cdev = devm_thermal_of_cooling_device_register(dev, + dev->of_node, "pwm-fan", ctx, &pwm_fan_cooling_ops); if (IS_ERR(cdev)) { + ret = PTR_ERR(cdev); - dev_err(&pdev->dev, + dev_err(dev, - "Failed to register pwm-fan as cooling device"); - return PTR_ERR(cdev); + "Failed to register pwm-fan as cooling device: %d\n", + ret); - goto err_del_timer; ++ return ret; } ctx->cdev = cdev; thermal_cdev_update(cdev);