|
|
@@ -72,7 +72,7 @@ index 02bb2cce423f..b123138d3dc0 100644
|
|
|
* Do not enumerate devices with enumeration_by_parent flag set as
|
|
|
* they will be enumerated by their respective parents.
|
|
|
--
|
|
|
-2.43.0
|
|
|
+2.44.0
|
|
|
|
|
|
From eb19f5e13f14a8973920d406125f205945558fb9 Mon Sep 17 00:00:00 2001
|
|
|
From: zouxiaoh <xiaohong.zou@intel.com>
|
|
|
@@ -189,7 +189,7 @@ index cc6569613255..8a532d32efdd 100644
|
|
|
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9D3E, quirk_iommu_ipts);
|
|
|
|
|
|
--
|
|
|
-2.43.0
|
|
|
+2.44.0
|
|
|
|
|
|
From 1b16e7cbcbf699e4d841424568e0de1cee048d93 Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
|
@@ -226,7 +226,7 @@ index 1e107fd49f82..e3e1696e7f0e 100644
|
|
|
|
|
|
return 0;
|
|
|
--
|
|
|
-2.43.0
|
|
|
+2.44.0
|
|
|
|
|
|
From a856e6ec1aa1ce0e88abdd423a151f2bbddb8134 Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <dan.scally@ideasonboard.com>
|
|
|
@@ -281,7 +281,7 @@ index 07b302e09340..1d3097bc7e48 100644
|
|
|
agpio, func, polarity);
|
|
|
if (ret)
|
|
|
--
|
|
|
-2.43.0
|
|
|
+2.44.0
|
|
|
|
|
|
From a7a10c4493fe0a381f12fd6a20a024e7797bd37c Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <dan.scally@ideasonboard.com>
|
|
|
@@ -320,7 +320,7 @@ index 6582cc0e2384..fd0796b6e07e 100644
|
|
|
V4L2_CID_TEST_PATTERN,
|
|
|
ARRAY_SIZE(ov7251_test_pattern_menu) - 1,
|
|
|
--
|
|
|
-2.43.0
|
|
|
+2.44.0
|
|
|
|
|
|
From e96fa67c9172fac9aa6e68199cf7e29d074c21e6 Mon Sep 17 00:00:00 2001
|
|
|
From: Daniel Scally <dan.scally@ideasonboard.com>
|
|
|
@@ -371,7 +371,7 @@ index 7f181fbbb140..1c0347de4e21 100644
|
|
|
if (ret < 0)
|
|
|
goto out_cleanup;
|
|
|
--
|
|
|
-2.43.0
|
|
|
+2.44.0
|
|
|
|
|
|
From 68dac72bec1c99890d35d6bfd1b1f66e0cf8789c Mon Sep 17 00:00:00 2001
|
|
|
From: Kate Hsuan <hpa@redhat.com>
|
|
|
@@ -412,7 +412,7 @@ index e3e1696e7f0e..423dc555093f 100644
|
|
|
for (i = 0; i < board_data->n_gpiod_lookups; i++)
|
|
|
gpiod_add_lookup_table(board_data->tps68470_gpio_lookup_tables[i]);
|
|
|
--
|
|
|
-2.43.0
|
|
|
+2.44.0
|
|
|
|
|
|
From 3f446f24aecaba808693f0173e28972e651fa87d Mon Sep 17 00:00:00 2001
|
|
|
From: Kate Hsuan <hpa@redhat.com>
|
|
|
@@ -453,7 +453,7 @@ index 7807fa329db0..2d2abb25b944 100644
|
|
|
+
|
|
|
#endif /* __LINUX_MFD_TPS68470_H */
|
|
|
--
|
|
|
-2.43.0
|
|
|
+2.44.0
|
|
|
|
|
|
From a0fe4ec438c5edb9f4360c8a2a5f5269d05c44ef Mon Sep 17 00:00:00 2001
|
|
|
From: Kate Hsuan <hpa@redhat.com>
|
|
|
@@ -704,5 +704,547 @@ index 000000000000..35aeb5db89c8
|
|
|
+MODULE_DESCRIPTION("LED driver for TPS68470 PMIC");
|
|
|
+MODULE_LICENSE("GPL v2");
|
|
|
--
|
|
|
-2.43.0
|
|
|
+2.44.0
|
|
|
+
|
|
|
+From 16cc6c6241fb32dcb09bae700dba0b2dc7b6c0df Mon Sep 17 00:00:00 2001
|
|
|
+From: Hidenori Kobayashi <hidenorik@chromium.org>
|
|
|
+Date: Tue, 9 Jan 2024 17:09:09 +0900
|
|
|
+Subject: [PATCH] media: staging: ipu3-imgu: Set fields before
|
|
|
+ media_entity_pads_init()
|
|
|
+
|
|
|
+The imgu driver fails to probe with the following message because it
|
|
|
+does not set the pad's flags before calling media_entity_pads_init().
|
|
|
+
|
|
|
+[ 14.596315] ipu3-imgu 0000:00:05.0: failed initialize subdev media entity (-22)
|
|
|
+[ 14.596322] ipu3-imgu 0000:00:05.0: failed to register subdev0 ret (-22)
|
|
|
+[ 14.596327] ipu3-imgu 0000:00:05.0: failed to register pipes (-22)
|
|
|
+[ 14.596331] ipu3-imgu 0000:00:05.0: failed to create V4L2 devices (-22)
|
|
|
+
|
|
|
+Fix the initialization order so that the driver probe succeeds. The ops
|
|
|
+initialization is also moved together for readability.
|
|
|
+
|
|
|
+Fixes: a0ca1627b450 ("media: staging/intel-ipu3: Add v4l2 driver based on media framework")
|
|
|
+Cc: <stable@vger.kernel.org> # 6.7
|
|
|
+Cc: Dan Carpenter <dan.carpenter@linaro.org>
|
|
|
+Signed-off-by: Hidenori Kobayashi <hidenorik@chromium.org>
|
|
|
+Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
|
|
|
+Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
|
|
|
+---
|
|
|
+ drivers/staging/media/ipu3/ipu3-v4l2.c | 16 ++++++++--------
|
|
|
+ 1 file changed, 8 insertions(+), 8 deletions(-)
|
|
|
+
|
|
|
+diff --git a/drivers/staging/media/ipu3/ipu3-v4l2.c b/drivers/staging/media/ipu3/ipu3-v4l2.c
|
|
|
+index e530767e80a5..55cc44a401bc 100644
|
|
|
+--- a/drivers/staging/media/ipu3/ipu3-v4l2.c
|
|
|
++++ b/drivers/staging/media/ipu3/ipu3-v4l2.c
|
|
|
+@@ -1069,6 +1069,11 @@ static int imgu_v4l2_subdev_register(struct imgu_device *imgu,
|
|
|
+ struct imgu_media_pipe *imgu_pipe = &imgu->imgu_pipe[pipe];
|
|
|
+
|
|
|
+ /* Initialize subdev media entity */
|
|
|
++ imgu_sd->subdev.entity.ops = &imgu_media_ops;
|
|
|
++ for (i = 0; i < IMGU_NODE_NUM; i++) {
|
|
|
++ imgu_sd->subdev_pads[i].flags = imgu_pipe->nodes[i].output ?
|
|
|
++ MEDIA_PAD_FL_SINK : MEDIA_PAD_FL_SOURCE;
|
|
|
++ }
|
|
|
+ r = media_entity_pads_init(&imgu_sd->subdev.entity, IMGU_NODE_NUM,
|
|
|
+ imgu_sd->subdev_pads);
|
|
|
+ if (r) {
|
|
|
+@@ -1076,11 +1081,6 @@ static int imgu_v4l2_subdev_register(struct imgu_device *imgu,
|
|
|
+ "failed initialize subdev media entity (%d)\n", r);
|
|
|
+ return r;
|
|
|
+ }
|
|
|
+- imgu_sd->subdev.entity.ops = &imgu_media_ops;
|
|
|
+- for (i = 0; i < IMGU_NODE_NUM; i++) {
|
|
|
+- imgu_sd->subdev_pads[i].flags = imgu_pipe->nodes[i].output ?
|
|
|
+- MEDIA_PAD_FL_SINK : MEDIA_PAD_FL_SOURCE;
|
|
|
+- }
|
|
|
+
|
|
|
+ /* Initialize subdev */
|
|
|
+ v4l2_subdev_init(&imgu_sd->subdev, &imgu_subdev_ops);
|
|
|
+@@ -1177,15 +1177,15 @@ static int imgu_v4l2_node_setup(struct imgu_device *imgu, unsigned int pipe,
|
|
|
+ }
|
|
|
+
|
|
|
+ /* Initialize media entities */
|
|
|
++ node->vdev_pad.flags = node->output ?
|
|
|
++ MEDIA_PAD_FL_SOURCE : MEDIA_PAD_FL_SINK;
|
|
|
++ vdev->entity.ops = NULL;
|
|
|
+ r = media_entity_pads_init(&vdev->entity, 1, &node->vdev_pad);
|
|
|
+ if (r) {
|
|
|
+ dev_err(dev, "failed initialize media entity (%d)\n", r);
|
|
|
+ mutex_destroy(&node->lock);
|
|
|
+ return r;
|
|
|
+ }
|
|
|
+- node->vdev_pad.flags = node->output ?
|
|
|
+- MEDIA_PAD_FL_SOURCE : MEDIA_PAD_FL_SINK;
|
|
|
+- vdev->entity.ops = NULL;
|
|
|
+
|
|
|
+ /* Initialize vbq */
|
|
|
+ vbq->type = node->vdev_fmt.type;
|
|
|
+--
|
|
|
+2.44.0
|
|
|
+
|
|
|
+From 2c1c03f035d43f5642f2985980cb4700ac9b7912 Mon Sep 17 00:00:00 2001
|
|
|
+From: Sakari Ailus <sakari.ailus@linux.intel.com>
|
|
|
+Date: Thu, 25 May 2023 14:12:04 +0300
|
|
|
+Subject: [PATCH] media: ipu3-cio2: Further clean up async subdev link creation
|
|
|
+
|
|
|
+Use v4l2_create_fwnode_links_to_pad() to create links from async
|
|
|
+sub-devices to the CSI-2 receiver subdevs.
|
|
|
+
|
|
|
+Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
|
|
|
+Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
|
|
|
+Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
|
|
|
+---
|
|
|
+ drivers/media/pci/intel/ipu3/ipu3-cio2.c | 22 +++++-----------------
|
|
|
+ 1 file changed, 5 insertions(+), 17 deletions(-)
|
|
|
+
|
|
|
+diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2.c b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
|
|
|
+index 5dd69a251b6a..c6c31215967b 100644
|
|
|
+--- a/drivers/media/pci/intel/ipu3/ipu3-cio2.c
|
|
|
++++ b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
|
|
|
+@@ -28,6 +28,7 @@
|
|
|
+ #include <media/v4l2-device.h>
|
|
|
+ #include <media/v4l2-event.h>
|
|
|
+ #include <media/v4l2-fwnode.h>
|
|
|
++#include <media/v4l2-mc.h>
|
|
|
+ #include <media/v4l2-ioctl.h>
|
|
|
+ #include <media/videobuf2-dma-sg.h>
|
|
|
+
|
|
|
+@@ -1421,7 +1422,6 @@ static void cio2_notifier_unbind(struct v4l2_async_notifier *notifier,
|
|
|
+ static int cio2_notifier_complete(struct v4l2_async_notifier *notifier)
|
|
|
+ {
|
|
|
+ struct cio2_device *cio2 = to_cio2_device(notifier);
|
|
|
+- struct device *dev = &cio2->pci_dev->dev;
|
|
|
+ struct sensor_async_subdev *s_asd;
|
|
|
+ struct v4l2_async_connection *asd;
|
|
|
+ struct cio2_queue *q;
|
|
|
+@@ -1431,23 +1431,10 @@ static int cio2_notifier_complete(struct v4l2_async_notifier *notifier)
|
|
|
+ s_asd = to_sensor_asd(asd);
|
|
|
+ q = &cio2->queue[s_asd->csi2.port];
|
|
|
+
|
|
|
+- ret = media_entity_get_fwnode_pad(&q->sensor->entity,
|
|
|
+- s_asd->asd.match.fwnode,
|
|
|
+- MEDIA_PAD_FL_SOURCE);
|
|
|
+- if (ret < 0) {
|
|
|
+- dev_err(dev, "no pad for endpoint %pfw (%d)\n",
|
|
|
+- s_asd->asd.match.fwnode, ret);
|
|
|
+- return ret;
|
|
|
+- }
|
|
|
+-
|
|
|
+- ret = media_create_pad_link(&q->sensor->entity, ret,
|
|
|
+- &q->subdev.entity, CIO2_PAD_SINK,
|
|
|
+- 0);
|
|
|
+- if (ret) {
|
|
|
+- dev_err(dev, "failed to create link for %s (endpoint %pfw, error %d)\n",
|
|
|
+- q->sensor->name, s_asd->asd.match.fwnode, ret);
|
|
|
++ ret = v4l2_create_fwnode_links_to_pad(asd->sd,
|
|
|
++ &q->subdev_pads[CIO2_PAD_SINK], 0);
|
|
|
++ if (ret)
|
|
|
+ return ret;
|
|
|
+- }
|
|
|
+ }
|
|
|
+
|
|
|
+ return v4l2_device_register_subdev_nodes(&cio2->v4l2_dev);
|
|
|
+@@ -1586,6 +1573,7 @@ static int cio2_queue_init(struct cio2_device *cio2, struct cio2_queue *q)
|
|
|
+ v4l2_subdev_init(subdev, &cio2_subdev_ops);
|
|
|
+ subdev->flags = V4L2_SUBDEV_FL_HAS_DEVNODE | V4L2_SUBDEV_FL_HAS_EVENTS;
|
|
|
+ subdev->owner = THIS_MODULE;
|
|
|
++ subdev->dev = dev;
|
|
|
+ snprintf(subdev->name, sizeof(subdev->name),
|
|
|
+ CIO2_ENTITY_NAME " %td", q - cio2->queue);
|
|
|
+ subdev->entity.function = MEDIA_ENT_F_VID_IF_BRIDGE;
|
|
|
+--
|
|
|
+2.44.0
|
|
|
+
|
|
|
+From f4f07d5f5560318a32311d135ac0463ad81d44c1 Mon Sep 17 00:00:00 2001
|
|
|
+From: mojyack <mojyack@gmail.com>
|
|
|
+Date: Sat, 3 Feb 2024 12:53:33 +0900
|
|
|
+Subject: [PATCH] media: i2c: Revert DW9719 driver
|
|
|
+
|
|
|
+---
|
|
|
+ drivers/media/i2c/dw9719.c | 199 +++++++++++++++++++++++++------------
|
|
|
+ 1 file changed, 137 insertions(+), 62 deletions(-)
|
|
|
+
|
|
|
+diff --git a/drivers/media/i2c/dw9719.c b/drivers/media/i2c/dw9719.c
|
|
|
+index c626ed845928..d5f585dabb60 100644
|
|
|
+--- a/drivers/media/i2c/dw9719.c
|
|
|
++++ b/drivers/media/i2c/dw9719.c
|
|
|
+@@ -6,13 +6,14 @@
|
|
|
+ * https://github.com/ZenfoneArea/android_kernel_asus_zenfone5
|
|
|
+ */
|
|
|
+
|
|
|
++#include <asm/unaligned.h>
|
|
|
++
|
|
|
+ #include <linux/delay.h>
|
|
|
+ #include <linux/i2c.h>
|
|
|
+ #include <linux/pm_runtime.h>
|
|
|
+ #include <linux/regulator/consumer.h>
|
|
|
+ #include <linux/types.h>
|
|
|
+
|
|
|
+-#include <media/v4l2-cci.h>
|
|
|
+ #include <media/v4l2-common.h>
|
|
|
+ #include <media/v4l2-ctrls.h>
|
|
|
+ #include <media/v4l2-subdev.h>
|
|
|
+@@ -20,31 +21,29 @@
|
|
|
+ #define DW9719_MAX_FOCUS_POS 1023
|
|
|
+ #define DW9719_CTRL_STEPS 16
|
|
|
+ #define DW9719_CTRL_DELAY_US 1000
|
|
|
++#define DELAY_MAX_PER_STEP_NS (1000000 * 1023)
|
|
|
+
|
|
|
+-#define DW9719_INFO CCI_REG8(0)
|
|
|
++#define DW9719_INFO 0
|
|
|
+ #define DW9719_ID 0xF1
|
|
|
++#define DW9719_CONTROL 2
|
|
|
++#define DW9719_VCM_CURRENT 3
|
|
|
+
|
|
|
+-#define DW9719_CONTROL CCI_REG8(2)
|
|
|
+-#define DW9719_ENABLE_RINGING 0x02
|
|
|
+-
|
|
|
+-#define DW9719_VCM_CURRENT CCI_REG16(3)
|
|
|
+-
|
|
|
+-#define DW9719_MODE CCI_REG8(6)
|
|
|
+-#define DW9719_MODE_SAC_SHIFT 4
|
|
|
+-#define DW9719_MODE_SAC3 4
|
|
|
++#define DW9719_MODE 6
|
|
|
++#define DW9719_VCM_FREQ 7
|
|
|
+
|
|
|
+-#define DW9719_VCM_FREQ CCI_REG8(7)
|
|
|
++#define DW9719_MODE_SAC3 0x40
|
|
|
+ #define DW9719_DEFAULT_VCM_FREQ 0x60
|
|
|
++#define DW9719_ENABLE_RINGING 0x02
|
|
|
++
|
|
|
++#define NUM_REGULATORS 2
|
|
|
+
|
|
|
+ #define to_dw9719_device(x) container_of(x, struct dw9719_device, sd)
|
|
|
+
|
|
|
+ struct dw9719_device {
|
|
|
+- struct v4l2_subdev sd;
|
|
|
+ struct device *dev;
|
|
|
+- struct regmap *regmap;
|
|
|
+- struct regulator *regulator;
|
|
|
+- u32 sac_mode;
|
|
|
+- u32 vcm_freq;
|
|
|
++ struct i2c_client *client;
|
|
|
++ struct regulator_bulk_data regulators[NUM_REGULATORS];
|
|
|
++ struct v4l2_subdev sd;
|
|
|
+
|
|
|
+ struct dw9719_v4l2_ctrls {
|
|
|
+ struct v4l2_ctrl_handler handler;
|
|
|
+@@ -52,18 +51,79 @@ struct dw9719_device {
|
|
|
+ } ctrls;
|
|
|
+ };
|
|
|
+
|
|
|
++static int dw9719_i2c_rd8(struct i2c_client *client, u8 reg, u8 *val)
|
|
|
++{
|
|
|
++ struct i2c_msg msg[2];
|
|
|
++ u8 buf[2] = { reg };
|
|
|
++ int ret;
|
|
|
++
|
|
|
++ msg[0].addr = client->addr;
|
|
|
++ msg[0].flags = 0;
|
|
|
++ msg[0].len = 1;
|
|
|
++ msg[0].buf = buf;
|
|
|
++
|
|
|
++ msg[1].addr = client->addr;
|
|
|
++ msg[1].flags = I2C_M_RD;
|
|
|
++ msg[1].len = 1;
|
|
|
++ msg[1].buf = &buf[1];
|
|
|
++ *val = 0;
|
|
|
++
|
|
|
++ ret = i2c_transfer(client->adapter, msg, 2);
|
|
|
++ if (ret < 0)
|
|
|
++ return ret;
|
|
|
++
|
|
|
++ *val = buf[1];
|
|
|
++
|
|
|
++ return 0;
|
|
|
++}
|
|
|
++
|
|
|
++static int dw9719_i2c_wr8(struct i2c_client *client, u8 reg, u8 val)
|
|
|
++{
|
|
|
++ struct i2c_msg msg;
|
|
|
++ int ret;
|
|
|
++
|
|
|
++ u8 buf[2] = { reg, val };
|
|
|
++
|
|
|
++ msg.addr = client->addr;
|
|
|
++ msg.flags = 0;
|
|
|
++ msg.len = sizeof(buf);
|
|
|
++ msg.buf = buf;
|
|
|
++
|
|
|
++ ret = i2c_transfer(client->adapter, &msg, 1);
|
|
|
++
|
|
|
++ return ret < 0 ? ret : 0;
|
|
|
++}
|
|
|
++
|
|
|
++static int dw9719_i2c_wr16(struct i2c_client *client, u8 reg, u16 val)
|
|
|
++{
|
|
|
++ struct i2c_msg msg;
|
|
|
++ u8 buf[3] = { reg };
|
|
|
++ int ret;
|
|
|
++
|
|
|
++ put_unaligned_be16(val, buf + 1);
|
|
|
++
|
|
|
++ msg.addr = client->addr;
|
|
|
++ msg.flags = 0;
|
|
|
++ msg.len = sizeof(buf);
|
|
|
++ msg.buf = buf;
|
|
|
++
|
|
|
++ ret = i2c_transfer(client->adapter, &msg, 1);
|
|
|
++
|
|
|
++ return ret < 0 ? ret : 0;
|
|
|
++}
|
|
|
++
|
|
|
+ static int dw9719_detect(struct dw9719_device *dw9719)
|
|
|
+ {
|
|
|
+ int ret;
|
|
|
+- u64 val;
|
|
|
++ u8 val;
|
|
|
+
|
|
|
+- ret = cci_read(dw9719->regmap, DW9719_INFO, &val, NULL);
|
|
|
++ ret = dw9719_i2c_rd8(dw9719->client, DW9719_INFO, &val);
|
|
|
+ if (ret < 0)
|
|
|
+ return ret;
|
|
|
+
|
|
|
+ if (val != DW9719_ID) {
|
|
|
+ dev_err(dw9719->dev, "Failed to detect correct id\n");
|
|
|
+- return -ENXIO;
|
|
|
++ ret = -ENXIO;
|
|
|
+ }
|
|
|
+
|
|
|
+ return 0;
|
|
|
+@@ -71,37 +131,54 @@ static int dw9719_detect(struct dw9719_device *dw9719)
|
|
|
+
|
|
|
+ static int dw9719_power_down(struct dw9719_device *dw9719)
|
|
|
+ {
|
|
|
+- return regulator_disable(dw9719->regulator);
|
|
|
++ return regulator_bulk_disable(NUM_REGULATORS, dw9719->regulators);
|
|
|
+ }
|
|
|
+
|
|
|
+ static int dw9719_power_up(struct dw9719_device *dw9719)
|
|
|
+ {
|
|
|
+ int ret;
|
|
|
+
|
|
|
+- ret = regulator_enable(dw9719->regulator);
|
|
|
++ ret = regulator_bulk_enable(NUM_REGULATORS, dw9719->regulators);
|
|
|
+ if (ret)
|
|
|
+ return ret;
|
|
|
+
|
|
|
+ /* Jiggle SCL pin to wake up device */
|
|
|
+- cci_write(dw9719->regmap, DW9719_CONTROL, 1, &ret);
|
|
|
++ ret = dw9719_i2c_wr8(dw9719->client, DW9719_CONTROL, 1);
|
|
|
+
|
|
|
+- /* Need 100us to transit from SHUTDOWN to STANDBY */
|
|
|
+- fsleep(100);
|
|
|
++ /* Need 100us to transit from SHUTDOWN to STANDBY*/
|
|
|
++ usleep_range(100, 1000);
|
|
|
+
|
|
|
+- cci_write(dw9719->regmap, DW9719_CONTROL, DW9719_ENABLE_RINGING, &ret);
|
|
|
+- cci_write(dw9719->regmap, DW9719_MODE,
|
|
|
+- dw9719->sac_mode << DW9719_MODE_SAC_SHIFT, &ret);
|
|
|
+- cci_write(dw9719->regmap, DW9719_VCM_FREQ, dw9719->vcm_freq, &ret);
|
|
|
++ ret = dw9719_i2c_wr8(dw9719->client, DW9719_CONTROL,
|
|
|
++ DW9719_ENABLE_RINGING);
|
|
|
++ if (ret < 0)
|
|
|
++ goto fail_powerdown;
|
|
|
+
|
|
|
+- if (ret)
|
|
|
+- dw9719_power_down(dw9719);
|
|
|
++ ret = dw9719_i2c_wr8(dw9719->client, DW9719_MODE, DW9719_MODE_SAC3);
|
|
|
++ if (ret < 0)
|
|
|
++ goto fail_powerdown;
|
|
|
++
|
|
|
++ ret = dw9719_i2c_wr8(dw9719->client, DW9719_VCM_FREQ,
|
|
|
++ DW9719_DEFAULT_VCM_FREQ);
|
|
|
++ if (ret < 0)
|
|
|
++ goto fail_powerdown;
|
|
|
++
|
|
|
++ return 0;
|
|
|
+
|
|
|
++fail_powerdown:
|
|
|
++ dw9719_power_down(dw9719);
|
|
|
+ return ret;
|
|
|
+ }
|
|
|
+
|
|
|
+ static int dw9719_t_focus_abs(struct dw9719_device *dw9719, s32 value)
|
|
|
+ {
|
|
|
+- return cci_write(dw9719->regmap, DW9719_VCM_CURRENT, value, NULL);
|
|
|
++ int ret;
|
|
|
++
|
|
|
++ value = clamp(value, 0, DW9719_MAX_FOCUS_POS);
|
|
|
++ ret = dw9719_i2c_wr16(dw9719->client, DW9719_VCM_CURRENT, value);
|
|
|
++ if (ret < 0)
|
|
|
++ return ret;
|
|
|
++
|
|
|
++ return 0;
|
|
|
+ }
|
|
|
+
|
|
|
+ static int dw9719_set_ctrl(struct v4l2_ctrl *ctrl)
|
|
|
+@@ -132,7 +209,7 @@ static const struct v4l2_ctrl_ops dw9719_ctrl_ops = {
|
|
|
+ .s_ctrl = dw9719_set_ctrl,
|
|
|
+ };
|
|
|
+
|
|
|
+-static int dw9719_suspend(struct device *dev)
|
|
|
++static int __maybe_unused dw9719_suspend(struct device *dev)
|
|
|
+ {
|
|
|
+ struct v4l2_subdev *sd = dev_get_drvdata(dev);
|
|
|
+ struct dw9719_device *dw9719 = to_dw9719_device(sd);
|
|
|
+@@ -151,7 +228,7 @@ static int dw9719_suspend(struct device *dev)
|
|
|
+ return dw9719_power_down(dw9719);
|
|
|
+ }
|
|
|
+
|
|
|
+-static int dw9719_resume(struct device *dev)
|
|
|
++static int __maybe_unused dw9719_resume(struct device *dev)
|
|
|
+ {
|
|
|
+ struct v4l2_subdev *sd = dev_get_drvdata(dev);
|
|
|
+ struct dw9719_device *dw9719 = to_dw9719_device(sd);
|
|
|
+@@ -201,7 +278,9 @@ static int dw9719_init_controls(struct dw9719_device *dw9719)
|
|
|
+ const struct v4l2_ctrl_ops *ops = &dw9719_ctrl_ops;
|
|
|
+ int ret;
|
|
|
+
|
|
|
+- v4l2_ctrl_handler_init(&dw9719->ctrls.handler, 1);
|
|
|
++ ret = v4l2_ctrl_handler_init(&dw9719->ctrls.handler, 1);
|
|
|
++ if (ret)
|
|
|
++ return ret;
|
|
|
+
|
|
|
+ dw9719->ctrls.focus = v4l2_ctrl_new_std(&dw9719->ctrls.handler, ops,
|
|
|
+ V4L2_CID_FOCUS_ABSOLUTE, 0,
|
|
|
+@@ -214,7 +293,8 @@ static int dw9719_init_controls(struct dw9719_device *dw9719)
|
|
|
+ }
|
|
|
+
|
|
|
+ dw9719->sd.ctrl_handler = &dw9719->ctrls.handler;
|
|
|
+- return 0;
|
|
|
++
|
|
|
++ return ret;
|
|
|
+
|
|
|
+ err_free_handler:
|
|
|
+ v4l2_ctrl_handler_free(&dw9719->ctrls.handler);
|
|
|
+@@ -232,26 +312,24 @@ static int dw9719_probe(struct i2c_client *client)
|
|
|
+ if (!dw9719)
|
|
|
+ return -ENOMEM;
|
|
|
+
|
|
|
+- dw9719->regmap = devm_cci_regmap_init_i2c(client, 8);
|
|
|
+- if (IS_ERR(dw9719->regmap))
|
|
|
+- return PTR_ERR(dw9719->regmap);
|
|
|
+-
|
|
|
++ dw9719->client = client;
|
|
|
+ dw9719->dev = &client->dev;
|
|
|
+- dw9719->sac_mode = DW9719_MODE_SAC3;
|
|
|
+- dw9719->vcm_freq = DW9719_DEFAULT_VCM_FREQ;
|
|
|
+
|
|
|
+- /* Optional indication of SAC mode select */
|
|
|
+- device_property_read_u32(&client->dev, "dongwoon,sac-mode",
|
|
|
+- &dw9719->sac_mode);
|
|
|
+-
|
|
|
+- /* Optional indication of VCM frequency */
|
|
|
+- device_property_read_u32(&client->dev, "dongwoon,vcm-freq",
|
|
|
+- &dw9719->vcm_freq);
|
|
|
++ dw9719->regulators[0].supply = "vdd";
|
|
|
++ /*
|
|
|
++ * The DW9719 has only the 1 VDD voltage input, but some PMICs such as
|
|
|
++ * the TPS68470 PMIC have I2C passthrough capability, to disconnect the
|
|
|
++ * sensor's I2C pins from the I2C bus when the sensors VSIO (Sensor-IO)
|
|
|
++ * is off, because some sensors then short these pins to ground;
|
|
|
++ * and the DW9719 might sit behind this passthrough, this it needs to
|
|
|
++ * enable VSIO as that will also enable the I2C passthrough.
|
|
|
++ */
|
|
|
++ dw9719->regulators[1].supply = "vsio";
|
|
|
+
|
|
|
+- dw9719->regulator = devm_regulator_get(&client->dev, "vdd");
|
|
|
+- if (IS_ERR(dw9719->regulator))
|
|
|
+- return dev_err_probe(&client->dev, PTR_ERR(dw9719->regulator),
|
|
|
+- "getting regulator\n");
|
|
|
++ ret = devm_regulator_bulk_get(&client->dev, NUM_REGULATORS,
|
|
|
++ dw9719->regulators);
|
|
|
++ if (ret)
|
|
|
++ return dev_err_probe(&client->dev, ret, "getting regulators\n");
|
|
|
+
|
|
|
+ v4l2_i2c_subdev_init(&dw9719->sd, client, &dw9719_ops);
|
|
|
+ dw9719->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
|
|
|
+@@ -312,17 +390,13 @@ static int dw9719_probe(struct i2c_client *client)
|
|
|
+ static void dw9719_remove(struct i2c_client *client)
|
|
|
+ {
|
|
|
+ struct v4l2_subdev *sd = i2c_get_clientdata(client);
|
|
|
+- struct dw9719_device *dw9719 =
|
|
|
+- container_of(sd, struct dw9719_device, sd);
|
|
|
++ struct dw9719_device *dw9719 = container_of(sd, struct dw9719_device,
|
|
|
++ sd);
|
|
|
+
|
|
|
++ pm_runtime_disable(&client->dev);
|
|
|
+ v4l2_async_unregister_subdev(sd);
|
|
|
+ v4l2_ctrl_handler_free(&dw9719->ctrls.handler);
|
|
|
+ media_entity_cleanup(&dw9719->sd.entity);
|
|
|
+-
|
|
|
+- pm_runtime_disable(&client->dev);
|
|
|
+- if (!pm_runtime_status_suspended(&client->dev))
|
|
|
+- dw9719_power_down(dw9719);
|
|
|
+- pm_runtime_set_suspended(&client->dev);
|
|
|
+ }
|
|
|
+
|
|
|
+ static const struct i2c_device_id dw9719_id_table[] = {
|
|
|
+@@ -331,13 +405,14 @@ static const struct i2c_device_id dw9719_id_table[] = {
|
|
|
+ };
|
|
|
+ MODULE_DEVICE_TABLE(i2c, dw9719_id_table);
|
|
|
+
|
|
|
+-static DEFINE_RUNTIME_DEV_PM_OPS(dw9719_pm_ops, dw9719_suspend, dw9719_resume,
|
|
|
+- NULL);
|
|
|
++static const struct dev_pm_ops dw9719_pm_ops = {
|
|
|
++ SET_RUNTIME_PM_OPS(dw9719_suspend, dw9719_resume, NULL)
|
|
|
++};
|
|
|
+
|
|
|
+ static struct i2c_driver dw9719_i2c_driver = {
|
|
|
+ .driver = {
|
|
|
+ .name = "dw9719",
|
|
|
+- .pm = pm_sleep_ptr(&dw9719_pm_ops),
|
|
|
++ .pm = &dw9719_pm_ops,
|
|
|
+ },
|
|
|
+ .probe = dw9719_probe,
|
|
|
+ .remove = dw9719_remove,
|
|
|
+--
|
|
|
+2.44.0
|
|
|
+
|
|
|
+From bdbff69075918d01d32a57820aa845bde7be7611 Mon Sep 17 00:00:00 2001
|
|
|
+From: mojyack <mojyack@gmail.com>
|
|
|
+Date: Sat, 3 Feb 2024 12:59:53 +0900
|
|
|
+Subject: [PATCH] media: staging: ipu3-imgu: Fix multiple calls of s_stream on
|
|
|
+ stream stop
|
|
|
+
|
|
|
+Adapt to 009905e "media: v4l2-subdev: Document and enforce .s_stream() requirements"
|
|
|
+---
|
|
|
+ drivers/staging/media/ipu3/ipu3-v4l2.c | 16 ++++++++--------
|
|
|
+ 1 file changed, 8 insertions(+), 8 deletions(-)
|
|
|
+
|
|
|
+diff --git a/drivers/staging/media/ipu3/ipu3-v4l2.c b/drivers/staging/media/ipu3/ipu3-v4l2.c
|
|
|
+index 55cc44a401bc..9c5627c48cf2 100644
|
|
|
+--- a/drivers/staging/media/ipu3/ipu3-v4l2.c
|
|
|
++++ b/drivers/staging/media/ipu3/ipu3-v4l2.c
|
|
|
+@@ -538,18 +538,18 @@ static void imgu_vb2_stop_streaming(struct vb2_queue *vq)
|
|
|
+
|
|
|
+ WARN_ON(!node->enabled);
|
|
|
+
|
|
|
+- pipe = node->pipe;
|
|
|
+- dev_dbg(dev, "Try to stream off node [%u][%u]", pipe, node->id);
|
|
|
+- imgu_pipe = &imgu->imgu_pipe[pipe];
|
|
|
+- r = v4l2_subdev_call(&imgu_pipe->imgu_sd.subdev, video, s_stream, 0);
|
|
|
+- if (r)
|
|
|
+- dev_err(&imgu->pci_dev->dev,
|
|
|
+- "failed to stop subdev streaming\n");
|
|
|
+-
|
|
|
+ mutex_lock(&imgu->streaming_lock);
|
|
|
+ /* Was this the first node with streaming disabled? */
|
|
|
+ if (imgu->streaming && imgu_all_nodes_streaming(imgu, node)) {
|
|
|
+ /* Yes, really stop streaming now */
|
|
|
++ pipe = node->pipe;
|
|
|
++ dev_dbg(dev, "Try to stream off node [%u][%u]", pipe, node->id);
|
|
|
++ imgu_pipe = &imgu->imgu_pipe[pipe];
|
|
|
++ r = v4l2_subdev_call(&imgu_pipe->imgu_sd.subdev, video, s_stream, 0);
|
|
|
++ if (r)
|
|
|
++ dev_err(&imgu->pci_dev->dev,
|
|
|
++ "failed to stop subdev streaming\n");
|
|
|
++
|
|
|
+ dev_dbg(dev, "IMGU streaming is ready to stop");
|
|
|
+ r = imgu_s_stream(imgu, false);
|
|
|
+ if (!r)
|
|
|
+--
|
|
|
+2.44.0
|
|
|
|
Dorian Stoll