From: Daniel Lezcano <daniel.lezcano@linaro.org> To: edubezval@gmail.com, rui.zhang@intel.com Cc: vincent.guittot@linarol.org, john.stultz@linaro.org, linux-pm@vger.kernel.org (open list:THERMAL), linux-kernel@vger.kernel.org (open list) Subject: [PATCH] thermal/drivers/hisi: Fix bad initialization Date: Thu, 29 Nov 2018 19:26:56 +0100 [thread overview] Message-ID: <1543516016-28186-1-git-send-email-daniel.lezcano@linaro.org> (raw) Without this patch, the thermal driver on hi6220 and hi3660 is broken. That is due because part of the posted patchset was merged but a small change in the DT was dropped. The hi6220 and hi3660 do not have an interrupt name in the DT, so finding interrupt by name fails. In addition, the hi3660 only defines one thermal zone in the DT and we are trying to register two sensors assuming we have two thermal zones in the DT. Fix this by adding a couple of line of code to add back compatibility with older DT and change the sensors number to 1 for the hi3660. Fixes: 2cffaeff083f (thermal/drivers/hisi: Use platform_get_irq_byname) Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> --- drivers/thermal/hisi_thermal.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c index c4111a9..3ab0e63 100644 --- a/drivers/thermal/hisi_thermal.c +++ b/drivers/thermal/hisi_thermal.c @@ -424,7 +424,7 @@ static int hi3660_thermal_probe(struct hisi_thermal_data *data) struct platform_device *pdev = data->pdev; struct device *dev = &pdev->dev; - data->nr_sensors = 2; + data->nr_sensors = 1; data->sensor = devm_kzalloc(dev, sizeof(*data->sensor) * data->nr_sensors, GFP_KERNEL); @@ -590,8 +590,13 @@ static int hisi_thermal_probe(struct platform_device *pdev) } ret = platform_get_irq_byname(pdev, sensor->irq_name); - if (ret < 0) - return ret; + if (ret <= 0) { + ret = platform_get_irq(pdev, 0); + if (ret <= 0) { + dev_err(dev, "Failed get interrupt: %d\n", ret); + return ret; + } + } ret = devm_request_threaded_irq(dev, ret, NULL, hisi_thermal_alarm_irq_thread, -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Lezcano <daniel.lezcano@linaro.org> To: edubezval@gmail.com, rui.zhang@intel.com Cc: vincent.guittot@linarol.org, john.stultz@linaro.org, "open list:THERMAL" <linux-pm@vger.kernel.org>, open list <linux-kernel@vger.kernel.org> Subject: [PATCH] thermal/drivers/hisi: Fix bad initialization Date: Thu, 29 Nov 2018 19:26:56 +0100 [thread overview] Message-ID: <1543516016-28186-1-git-send-email-daniel.lezcano@linaro.org> (raw) Without this patch, the thermal driver on hi6220 and hi3660 is broken. That is due because part of the posted patchset was merged but a small change in the DT was dropped. The hi6220 and hi3660 do not have an interrupt name in the DT, so finding interrupt by name fails. In addition, the hi3660 only defines one thermal zone in the DT and we are trying to register two sensors assuming we have two thermal zones in the DT. Fix this by adding a couple of line of code to add back compatibility with older DT and change the sensors number to 1 for the hi3660. Fixes: 2cffaeff083f (thermal/drivers/hisi: Use platform_get_irq_byname) Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> --- drivers/thermal/hisi_thermal.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c index c4111a9..3ab0e63 100644 --- a/drivers/thermal/hisi_thermal.c +++ b/drivers/thermal/hisi_thermal.c @@ -424,7 +424,7 @@ static int hi3660_thermal_probe(struct hisi_thermal_data *data) struct platform_device *pdev = data->pdev; struct device *dev = &pdev->dev; - data->nr_sensors = 2; + data->nr_sensors = 1; data->sensor = devm_kzalloc(dev, sizeof(*data->sensor) * data->nr_sensors, GFP_KERNEL); @@ -590,8 +590,13 @@ static int hisi_thermal_probe(struct platform_device *pdev) } ret = platform_get_irq_byname(pdev, sensor->irq_name); - if (ret < 0) - return ret; + if (ret <= 0) { + ret = platform_get_irq(pdev, 0); + if (ret <= 0) { + dev_err(dev, "Failed get interrupt: %d\n", ret); + return ret; + } + } ret = devm_request_threaded_irq(dev, ret, NULL, hisi_thermal_alarm_irq_thread, -- 2.7.4
next reply other threads:[~2018-11-29 18:27 UTC|newest] Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-11-29 18:26 Daniel Lezcano [this message] 2018-11-29 18:26 ` [PATCH] thermal/drivers/hisi: Fix bad initialization Daniel Lezcano 2018-11-29 18:28 ` Daniel Lezcano 2018-11-29 19:36 ` Eduardo Valentin 2018-11-29 21:43 ` Daniel Lezcano
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1543516016-28186-1-git-send-email-daniel.lezcano@linaro.org \ --to=daniel.lezcano@linaro.org \ --cc=edubezval@gmail.com \ --cc=john.stultz@linaro.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pm@vger.kernel.org \ --cc=rui.zhang@intel.com \ --cc=vincent.guittot@linarol.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.