From: Marco Felsch <m.felsch@pengutronix.de>
To: mchehab@kernel.org, sakari.ailus@linux.intel.com,
hans.verkuil@cisco.com, jacopo+renesas@jmondi.org,
robh+dt@kernel.org, laurent.pinchart@ideasonboard.com
Cc: devicetree@vger.kernel.org, kernel@pengutronix.de,
linux-media@vger.kernel.org
Subject: [PATCH v13 15/21] media: tvp5150: move irq en-/disable into runtime-pm ops
Date: Thu, 12 Mar 2020 11:31:50 +0100 [thread overview]
Message-ID: <20200312103156.3178-16-m.felsch@pengutronix.de> (raw)
In-Reply-To: <20200312103156.3178-1-m.felsch@pengutronix.de>
As documented in [1] the runtime-pm ops are used to set the device into
a fully 'workable' state. Therefore it can be used to enable or disable
the irqs.
[1] https://www.kernel.org/doc/html/latest/power/runtime_pm.html
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
v12:
- change commit header and message -> former "media: tvp5150: add s_power callback"
- drop s_power() callback and use pm_runtime callbacks instead
---
drivers/media/i2c/tvp5150.c | 61 +++++++++++++++++++++++++++++++++----
1 file changed, 55 insertions(+), 6 deletions(-)
diff --git a/drivers/media/i2c/tvp5150.c b/drivers/media/i2c/tvp5150.c
index 3a8998d4610d..06ca3081f3d1 100644
--- a/drivers/media/i2c/tvp5150.c
+++ b/drivers/media/i2c/tvp5150.c
@@ -13,6 +13,7 @@
#include <linux/interrupt.h>
#include <linux/module.h>
#include <linux/of_graph.h>
+#include <linux/pm_runtime.h>
#include <linux/regmap.h>
#include <media/v4l2-async.h>
#include <media/v4l2-device.h>
@@ -1356,16 +1357,51 @@ static const struct media_entity_operations tvp5150_sd_media_ops = {
/****************************************************************************
I2C Command
****************************************************************************/
+static int __maybe_unused tvp5150_runtime_suspend(struct device *dev)
+{
+ struct i2c_client *client = to_i2c_client(dev);
+ struct v4l2_subdev *sd = i2c_get_clientdata(client);
+ struct tvp5150 *decoder = to_tvp5150(sd);
+
+ if (decoder->irq)
+ /* Disable lock interrupt */
+ return regmap_update_bits(decoder->regmap,
+ TVP5150_INT_ENABLE_REG_A,
+ TVP5150_INT_A_LOCK, 0);
+ return 0;
+}
+
+static int __maybe_unused tvp5150_runtime_resume(struct device *dev)
+{
+ struct i2c_client *client = to_i2c_client(dev);
+ struct v4l2_subdev *sd = i2c_get_clientdata(client);
+ struct tvp5150 *decoder = to_tvp5150(sd);
+
+ if (decoder->irq)
+ /* Enable lock interrupt */
+ return regmap_update_bits(decoder->regmap,
+ TVP5150_INT_ENABLE_REG_A,
+ TVP5150_INT_A_LOCK,
+ TVP5150_INT_A_LOCK);
+ return 0;
+}
static int tvp5150_s_stream(struct v4l2_subdev *sd, int enable)
{
struct tvp5150 *decoder = to_tvp5150(sd);
- unsigned int mask, val = 0, int_val = 0;
+ unsigned int mask, val = 0;
+ int ret;
mask = TVP5150_MISC_CTL_YCBCR_OE | TVP5150_MISC_CTL_SYNC_OE |
TVP5150_MISC_CTL_CLOCK_OE;
if (enable) {
+ ret = pm_runtime_get_sync(sd->dev);
+ if (ret < 0) {
+ pm_runtime_put_noidle(sd->dev);
+ return ret;
+ }
+
tvp5150_enable(sd);
/* Enable outputs if decoder is locked */
@@ -1373,15 +1409,13 @@ static int tvp5150_s_stream(struct v4l2_subdev *sd, int enable)
val = decoder->lock ? decoder->oe : 0;
else
val = decoder->oe;
- int_val = TVP5150_INT_A_LOCK;
+
v4l2_subdev_notify_event(&decoder->sd, &tvp5150_ev_fmt);
+ } else {
+ pm_runtime_put(sd->dev);
}
regmap_update_bits(decoder->regmap, TVP5150_MISC_CTL, mask, val);
- if (decoder->irq)
- /* Enable / Disable lock interrupt */
- regmap_update_bits(decoder->regmap, TVP5150_INT_ENABLE_REG_A,
- TVP5150_INT_A_LOCK, int_val);
return 0;
}
@@ -2077,6 +2111,11 @@ static int tvp5150_probe(struct i2c_client *c)
if (debug > 1)
tvp5150_log_status(sd);
+
+ pm_runtime_set_active(&c->dev);
+ pm_runtime_enable(&c->dev);
+ pm_runtime_idle(&c->dev);
+
return 0;
err:
@@ -2100,11 +2139,20 @@ static int tvp5150_remove(struct i2c_client *c)
media_device_unregister_entity(&decoder->connectors[i].ent);
v4l2_async_unregister_subdev(sd);
v4l2_ctrl_handler_free(&decoder->hdl);
+ pm_runtime_disable(&c->dev);
+ pm_runtime_set_suspended(&c->dev);
+
return 0;
}
/* ----------------------------------------------------------------------- */
+static const struct dev_pm_ops tvp5150_pm_ops = {
+ SET_RUNTIME_PM_OPS(tvp5150_runtime_suspend,
+ tvp5150_runtime_resume,
+ NULL)
+};
+
static const struct i2c_device_id tvp5150_id[] = {
{ "tvp5150", 0 },
{ }
@@ -2123,6 +2171,7 @@ static struct i2c_driver tvp5150_driver = {
.driver = {
.of_match_table = of_match_ptr(tvp5150_of_match),
.name = "tvp5150",
+ .pm = &tvp5150_pm_ops,
},
.probe_new = tvp5150_probe,
.remove = tvp5150_remove,
--
2.20.1
next prev parent reply other threads:[~2020-03-12 10:32 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-12 10:31 [PATCH v13 00/19] TVP5150 Features and Fixes Marco Felsch
2020-03-12 10:31 ` [PATCH v13 01/21] dt-bindings: connector: analog: add sdtv standards property Marco Felsch
2020-03-12 10:31 ` [PATCH v13 02/21] dt-bindings: display: add sdtv-standards defines Marco Felsch
2020-03-12 10:31 ` [PATCH v13 03/21] media: v4l: link dt-bindings and uapi Marco Felsch
2020-03-12 10:31 ` [PATCH v13 04/21] media: v4l2-fwnode: fix v4l2_fwnode_parse_link handling Marco Felsch
2020-03-12 10:37 ` Sakari Ailus
2020-03-12 10:42 ` Sakari Ailus
2020-03-12 10:43 ` Sakari Ailus
2020-03-12 11:14 ` Marco Felsch
2020-03-12 10:31 ` [PATCH v13 05/21] media: v4l2-fwnode: simplify v4l2_fwnode_parse_link Marco Felsch
2020-03-12 10:31 ` [PATCH v13 06/21] media: v4l2-fwnode: add endpoint id field to v4l2_fwnode_link Marco Felsch
2020-03-12 10:31 ` [PATCH v13 07/21] media: v4l2-fwnode: add v4l2_fwnode_connector Marco Felsch
2020-03-12 10:31 ` [PATCH v13 08/21] media: v4l2-fwnode: add initial connector parsing support Marco Felsch
2020-03-12 10:31 ` [PATCH v13 09/21] partial revert of "[media] tvp5150: add HW input connectors support" Marco Felsch
2020-03-12 10:31 ` [PATCH v13 10/21] media: tvp5150: add input source selection of_graph support Marco Felsch
2020-03-12 10:31 ` [PATCH v13 11/21] media: dt-bindings: tvp5150: Add input port connectors DT bindings Marco Felsch
2020-03-12 10:31 ` [PATCH v13 12/21] media: tvp5150: fix set_selection rectangle handling Marco Felsch
2020-03-12 10:31 ` [PATCH v13 13/21] media: tvp5150: add FORMAT_TRY support for get/set selection handlers Marco Felsch
2020-03-12 10:31 ` [PATCH v13 14/21] media: tvp5150: initialize subdev before parsing device tree Marco Felsch
2020-03-12 10:31 ` Marco Felsch [this message]
2020-03-12 10:31 ` [PATCH v13 16/21] media: tvp5150: add v4l2-event support Marco Felsch
2020-03-12 10:31 ` [PATCH v13 17/21] media: tvp5150: add subdev open/close callbacks Marco Felsch
2020-03-12 10:31 ` [PATCH v13 18/21] media: dt-bindings: tvp5150: cleanup bindings stlye Marco Felsch
2020-03-12 10:31 ` [PATCH v13 19/21] media: dt-bindings: tvp5150: add optional sdtv standards documentation Marco Felsch
2020-03-12 10:31 ` [PATCH v13 20/21] media: tvp5150: add support to limit sdtv standards Marco Felsch
2020-03-12 10:31 ` [PATCH v13 21/21] media: tvp5150: make debug output more readable Marco Felsch
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=20200312103156.3178-16-m.felsch@pengutronix.de \
--to=m.felsch@pengutronix.de \
--cc=devicetree@vger.kernel.org \
--cc=hans.verkuil@cisco.com \
--cc=jacopo+renesas@jmondi.org \
--cc=kernel@pengutronix.de \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=robh+dt@kernel.org \
--cc=sakari.ailus@linux.intel.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox