All of lore.kernel.org
 help / color / mirror / Atom feed
From: Yangtao Li <tiny.windzz@gmail.com>
To: rui.zhang@intel.com, edubezval@gmail.com,
	daniel.lezcano@linaro.org, robh+dt@kernel.org,
	mark.rutland@arm.com, maxime.ripard@bootlin.com, wens@csie.org,
	davem@davemloft.net, gregkh@linuxfoundation.org,
	mchehab+samsung@kernel.org, linus.walleij@linaro.org,
	nicolas.ferre@microchip.com, paulmck@linux.ibm.com
Cc: linux-pm@vger.kernel.org, devicetree@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, Yangtao Li <tiny.windzz@gmail.com>
Subject: [PATCH v4 07/11] thermal: sun8i: rework for ths irq handler func
Date: Sun, 23 Jun 2019 12:42:02 -0400	[thread overview]
Message-ID: <20190623164206.7467-8-tiny.windzz@gmail.com> (raw)
In-Reply-To: <20190623164206.7467-1-tiny.windzz@gmail.com>

Here, we do something to prepare for the subsequent
support of multiple platforms.

1) rename sun50i_h6_irq_thread to sun8i_irq_thread, because
   this function should be suitable for all platforms.

2) introduce irq_ack callback to mask interrupt register
   differences.

Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
---
 drivers/thermal/sun8i_thermal.c | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/drivers/thermal/sun8i_thermal.c b/drivers/thermal/sun8i_thermal.c
index 59acbbac76e4..ed1c19bb27cf 100644
--- a/drivers/thermal/sun8i_thermal.c
+++ b/drivers/thermal/sun8i_thermal.c
@@ -60,6 +60,7 @@ struct ths_thermal_chip {
 	int		ft_deviation;
 	int		temp_data_base;
 	int		(*init)(struct ths_device *tmdev);
+	int             (*irq_ack)(struct ths_device *tmdev);
 };
 
 struct ths_device {
@@ -116,23 +117,34 @@ static const struct regmap_config config = {
 	.fast_io = true,
 };
 
-static irqreturn_t sun50i_h6_irq_thread(int irq, void *data)
+static int sun50i_h6_irq_ack(struct ths_device *tmdev)
 {
-	struct ths_device *tmdev = data;
-	int i, state;
+	int i, state, ret = 0;
 
 	regmap_read(tmdev->regmap, SUN50I_H6_THS_DIS, &state);
 
 	for (i = 0; i < tmdev->chip->sensor_num; i++) {
-
 		if (state & SUN50I_H6_THS_DATA_IRQ_STS(i)) {
-			/* clear data irq pending */
 			regmap_write(tmdev->regmap, SUN50I_H6_THS_DIS,
 				     SUN50I_H6_THS_DATA_IRQ_STS(i));
+			ret |= BIT(i);
+		}
+	}
+
+	return ret;
+}
 
+static irqreturn_t sun8i_irq_thread(int irq, void *data)
+{
+	struct ths_device *tmdev = data;
+	int i, state;
+
+	state = tmdev->chip->irq_ack(tmdev);
+
+	for (i = 0; i < tmdev->chip->sensor_num; i++) {
+		if (state & BIT(i))
 			thermal_zone_device_update(tmdev->sensor[i].tzd,
 						   THERMAL_EVENT_UNSPECIFIED);
-		}
 	}
 
 	return IRQ_HANDLED;
@@ -377,7 +389,7 @@ static int sun8i_ths_probe(struct platform_device *pdev)
 	 * the end.
 	 */
 	ret = devm_request_threaded_irq(dev, irq, NULL,
-					sun50i_h6_irq_thread,
+					sun8i_irq_thread,
 					IRQF_ONESHOT, "ths", tmdev);
 	if (ret)
 		return ret;
@@ -402,6 +414,7 @@ static const struct ths_thermal_chip sun50i_h6_ths = {
 	.ft_deviation = SUN50I_H6_FT_DEVIATION,
 	.temp_data_base = SUN50I_H6_THS_TEMP_DATA,
 	.init = sun50i_thermal_init,
+	.irq_ack = sun50i_h6_irq_ack,
 };
 
 static const struct of_device_id of_ths_match[] = {
-- 
2.17.1


WARNING: multiple messages have this Message-ID (diff)
From: Yangtao Li <tiny.windzz@gmail.com>
To: rui.zhang@intel.com, edubezval@gmail.com,
	daniel.lezcano@linaro.org, robh+dt@kernel.org,
	mark.rutland@arm.com, maxime.ripard@bootlin.com, wens@csie.org,
	davem@davemloft.net, gregkh@linuxfoundation.org,
	mchehab+samsung@kernel.org, linus.walleij@linaro.org,
	nicolas.ferre@microchip.com, paulmck@linux.ibm.com
Cc: Yangtao Li <tiny.windzz@gmail.com>,
	devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org
Subject: [PATCH v4 07/11] thermal: sun8i: rework for ths irq handler func
Date: Sun, 23 Jun 2019 12:42:02 -0400	[thread overview]
Message-ID: <20190623164206.7467-8-tiny.windzz@gmail.com> (raw)
In-Reply-To: <20190623164206.7467-1-tiny.windzz@gmail.com>

Here, we do something to prepare for the subsequent
support of multiple platforms.

1) rename sun50i_h6_irq_thread to sun8i_irq_thread, because
   this function should be suitable for all platforms.

2) introduce irq_ack callback to mask interrupt register
   differences.

Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
---
 drivers/thermal/sun8i_thermal.c | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/drivers/thermal/sun8i_thermal.c b/drivers/thermal/sun8i_thermal.c
index 59acbbac76e4..ed1c19bb27cf 100644
--- a/drivers/thermal/sun8i_thermal.c
+++ b/drivers/thermal/sun8i_thermal.c
@@ -60,6 +60,7 @@ struct ths_thermal_chip {
 	int		ft_deviation;
 	int		temp_data_base;
 	int		(*init)(struct ths_device *tmdev);
+	int             (*irq_ack)(struct ths_device *tmdev);
 };
 
 struct ths_device {
@@ -116,23 +117,34 @@ static const struct regmap_config config = {
 	.fast_io = true,
 };
 
-static irqreturn_t sun50i_h6_irq_thread(int irq, void *data)
+static int sun50i_h6_irq_ack(struct ths_device *tmdev)
 {
-	struct ths_device *tmdev = data;
-	int i, state;
+	int i, state, ret = 0;
 
 	regmap_read(tmdev->regmap, SUN50I_H6_THS_DIS, &state);
 
 	for (i = 0; i < tmdev->chip->sensor_num; i++) {
-
 		if (state & SUN50I_H6_THS_DATA_IRQ_STS(i)) {
-			/* clear data irq pending */
 			regmap_write(tmdev->regmap, SUN50I_H6_THS_DIS,
 				     SUN50I_H6_THS_DATA_IRQ_STS(i));
+			ret |= BIT(i);
+		}
+	}
+
+	return ret;
+}
 
+static irqreturn_t sun8i_irq_thread(int irq, void *data)
+{
+	struct ths_device *tmdev = data;
+	int i, state;
+
+	state = tmdev->chip->irq_ack(tmdev);
+
+	for (i = 0; i < tmdev->chip->sensor_num; i++) {
+		if (state & BIT(i))
 			thermal_zone_device_update(tmdev->sensor[i].tzd,
 						   THERMAL_EVENT_UNSPECIFIED);
-		}
 	}
 
 	return IRQ_HANDLED;
@@ -377,7 +389,7 @@ static int sun8i_ths_probe(struct platform_device *pdev)
 	 * the end.
 	 */
 	ret = devm_request_threaded_irq(dev, irq, NULL,
-					sun50i_h6_irq_thread,
+					sun8i_irq_thread,
 					IRQF_ONESHOT, "ths", tmdev);
 	if (ret)
 		return ret;
@@ -402,6 +414,7 @@ static const struct ths_thermal_chip sun50i_h6_ths = {
 	.ft_deviation = SUN50I_H6_FT_DEVIATION,
 	.temp_data_base = SUN50I_H6_THS_TEMP_DATA,
 	.init = sun50i_thermal_init,
+	.irq_ack = sun50i_h6_irq_ack,
 };
 
 static const struct of_device_id of_ths_match[] = {
-- 
2.17.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2019-06-23 16:42 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-23 16:41 [PATCH v4 00/11] add thermal driver for h6 Yangtao Li
2019-06-23 16:41 ` Yangtao Li
2019-06-23 16:41 ` Yangtao Li
2019-06-23 16:41 ` [PATCH v4 01/11] thermal: sun8i: " Yangtao Li
2019-06-23 16:41   ` Yangtao Li
2019-06-23 16:41   ` Yangtao Li
2019-06-24 12:07   ` Ondřej Jirman
2019-06-24 12:07     ` Ondřej Jirman
2019-06-23 16:41 ` [PATCH v4 02/11] dt-bindings: thermal: add binding document for h6 thermal controller Yangtao Li
2019-06-23 16:41   ` Yangtao Li
2019-06-24  8:47   ` Maxime Ripard
2019-06-24  8:47     ` Maxime Ripard
2019-06-23 16:41 ` [PATCH v4 03/11] thermal: fix indentation in makefile Yangtao Li
2019-06-23 16:41   ` Yangtao Li
2019-06-23 16:41 ` [PATCH v4 04/11] thermal: sun8i: get ths sensor number from device compatible Yangtao Li
2019-06-23 16:41   ` Yangtao Li
2019-06-23 16:42 ` [PATCH v4 05/11] thermal: sun8i: rework for sun8i_ths_get_temp() Yangtao Li
2019-06-23 16:42   ` Yangtao Li
2019-06-23 16:42 ` [PATCH v4 06/11] thermal: sun8i: get ths init func from device compatible Yangtao Li
2019-06-23 16:42   ` Yangtao Li
2019-06-23 16:42 ` Yangtao Li [this message]
2019-06-23 16:42   ` [PATCH v4 07/11] thermal: sun8i: rework for ths irq handler func Yangtao Li
2019-06-23 16:42 ` [PATCH v4 08/11] thermal: sun8i: support ahb clocks Yangtao Li
2019-06-23 16:42   ` Yangtao Li
2019-06-24 18:23   ` Maxime Ripard
2019-06-24 18:23     ` Maxime Ripard
2019-06-25  0:34     ` Ondřej Jirman
2019-06-25  0:34       ` Ondřej Jirman
2019-06-25  8:25       ` Maxime Ripard
2019-06-25  8:25         ` Maxime Ripard
2019-06-23 16:42 ` [PATCH v4 09/11] thermal: sun8i: rework for ths calibrate func Yangtao Li
2019-06-23 16:42   ` Yangtao Li
2019-06-23 16:42 ` [PATCH v4 10/11] dt-bindings: thermal: add binding document for h3 thermal controller Yangtao Li
2019-06-23 16:42   ` Yangtao Li
2019-06-24  8:50   ` Maxime Ripard
2019-06-24  8:50     ` Maxime Ripard
2019-06-23 16:42 ` [PATCH v4 11/11] thermal: sun8i: add thermal driver for h3 Yangtao Li
2019-06-23 16:42   ` Yangtao Li
2019-06-24 12:05   ` Ondřej Jirman
2019-06-24 12:05     ` Ondřej Jirman
2019-07-10 23:09 ` [PATCH v4 00/11] add thermal driver for h6 Vasily Khoruzhick
2019-07-10 23:09   ` Vasily Khoruzhick
2019-07-13 18:01   ` Vasily Khoruzhick
2019-07-13 18:01     ` Vasily Khoruzhick
2019-07-26 17:46     ` Vasily Khoruzhick
2019-07-26 17:46       ` Vasily Khoruzhick
2019-07-28 12:11       ` Frank Lee
2019-07-28 12:11         ` Frank Lee

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=20190623164206.7467-8-tiny.windzz@gmail.com \
    --to=tiny.windzz@gmail.com \
    --cc=daniel.lezcano@linaro.org \
    --cc=davem@davemloft.net \
    --cc=devicetree@vger.kernel.org \
    --cc=edubezval@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linus.walleij@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=maxime.ripard@bootlin.com \
    --cc=mchehab+samsung@kernel.org \
    --cc=nicolas.ferre@microchip.com \
    --cc=paulmck@linux.ibm.com \
    --cc=robh+dt@kernel.org \
    --cc=rui.zhang@intel.com \
    --cc=wens@csie.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: link
Be 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.