14e6c05f4b
Changes: - Update IPTS - Fix allocating the HID descriptor on EDS v2 Links: - kernel:f92d48d191
- IPTS:32622a37f2
1401 lines
42 KiB
Diff
1401 lines
42 KiB
Diff
From d69944e1acb3f417731b5128ba7e9ee1ead0fa8f Mon Sep 17 00:00:00 2001
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
|
Date: Sun, 10 Oct 2021 20:56:57 +0200
|
|
Subject: [PATCH] ACPI: delay enumeration of devices with a _DEP pointing to an
|
|
INT3472 device
|
|
|
|
The clk and regulator frameworks expect clk/regulator consumer-devices
|
|
to have info about the consumed clks/regulators described in the device's
|
|
fw_node.
|
|
|
|
To work around cases where this info is not present in the firmware tables,
|
|
which is often the case on x86/ACPI devices, both frameworks allow the
|
|
provider-driver to attach info about consumers to the clks/regulators
|
|
when registering these.
|
|
|
|
This causes problems with the probe ordering wrt drivers for consumers
|
|
of these clks/regulators. Since the lookups are only registered when the
|
|
provider-driver binds, trying to get these clks/regulators before then
|
|
results in a -ENOENT error for clks and a dummy regulator for regulators.
|
|
|
|
One case where we hit this issue is camera sensors such as e.g. the OV8865
|
|
sensor found on the Microsoft Surface Go. The sensor uses clks, regulators
|
|
and GPIOs provided by a TPS68470 PMIC which is described in an INT3472
|
|
ACPI device. There is special platform code handling this and setting
|
|
platform_data with the necessary consumer info on the MFD cells
|
|
instantiated for the PMIC under: drivers/platform/x86/intel/int3472.
|
|
|
|
For this to work properly the ov8865 driver must not bind to the I2C-client
|
|
for the OV8865 sensor until after the TPS68470 PMIC gpio, regulator and
|
|
clk MFD cells have all been fully setup.
|
|
|
|
The OV8865 on the Microsoft Surface Go is just one example, all X86
|
|
devices using the Intel IPU3 camera block found on recent Intel SoCs
|
|
have similar issues where there is an INT3472 HID ACPI-device, which
|
|
describes the clks and regulators, and the driver for this INT3472 device
|
|
must be fully initialized before the sensor driver (any sensor driver)
|
|
binds for things to work properly.
|
|
|
|
On these devices the ACPI nodes describing the sensors all have a _DEP
|
|
dependency on the matching INT3472 ACPI device (there is one per sensor).
|
|
|
|
This allows solving the probe-ordering problem by delaying the enumeration
|
|
(instantiation of the I2C-client in the ov8865 example) of ACPI-devices
|
|
which have a _DEP dependency on an INT3472 device.
|
|
|
|
The new acpi_dev_ready_for_enumeration() helper used for this is also
|
|
exported because for devices, which have the enumeration_by_parent flag
|
|
set, the parent-driver will do its own scan of child ACPI devices and
|
|
it will try to enumerate those during its probe(). Code doing this such
|
|
as e.g. the i2c-core-acpi.c code must call this new helper to ensure
|
|
that it too delays the enumeration until all the _DEP dependencies are
|
|
met on devices which have the new honor_deps flag set.
|
|
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
Patchset: cameras
|
|
---
|
|
drivers/acpi/scan.c | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
|
|
index 0c6f06abe3f4..4fc320f424e8 100644
|
|
--- a/drivers/acpi/scan.c
|
|
+++ b/drivers/acpi/scan.c
|
|
@@ -2106,6 +2106,9 @@ static acpi_status acpi_bus_check_add_2(acpi_handle handle, u32 lvl_not_used,
|
|
|
|
static void acpi_default_enumeration(struct acpi_device *device)
|
|
{
|
|
+ if (!acpi_dev_ready_for_enumeration(device))
|
|
+ return;
|
|
+
|
|
/*
|
|
* Do not enumerate devices with enumeration_by_parent flag set as
|
|
* they will be enumerated by their respective parents.
|
|
--
|
|
2.41.0
|
|
|
|
From 23a732b89e9a9572095ebc9bc6d79d1f6a0b3d81 Mon Sep 17 00:00:00 2001
|
|
From: zouxiaoh <xiaohong.zou@intel.com>
|
|
Date: Fri, 25 Jun 2021 08:52:59 +0800
|
|
Subject: [PATCH] iommu: intel-ipu: use IOMMU passthrough mode for Intel IPUs
|
|
|
|
Intel IPU(Image Processing Unit) has its own (IO)MMU hardware,
|
|
The IPU driver allocates its own page table that is not mapped
|
|
via the DMA, and thus the Intel IOMMU driver blocks access giving
|
|
this error: DMAR: DRHD: handling fault status reg 3 DMAR:
|
|
[DMA Read] Request device [00:05.0] PASID ffffffff
|
|
fault addr 76406000 [fault reason 06] PTE Read access is not set
|
|
As IPU is not an external facing device which is not risky, so use
|
|
IOMMU passthrough mode for Intel IPUs.
|
|
|
|
Change-Id: I6dcccdadac308cf42e20a18e1b593381391e3e6b
|
|
Depends-On: Iacd67578e8c6a9b9ac73285f52b4081b72fb68a6
|
|
Tracked-On: #JIITL8-411
|
|
Signed-off-by: Bingbu Cao <bingbu.cao@intel.com>
|
|
Signed-off-by: zouxiaoh <xiaohong.zou@intel.com>
|
|
Signed-off-by: Xu Chongyang <chongyang.xu@intel.com>
|
|
Patchset: cameras
|
|
---
|
|
drivers/iommu/intel/iommu.c | 30 ++++++++++++++++++++++++++++++
|
|
1 file changed, 30 insertions(+)
|
|
|
|
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
|
|
index 0d4542b7365d..c96a9baea21c 100644
|
|
--- a/drivers/iommu/intel/iommu.c
|
|
+++ b/drivers/iommu/intel/iommu.c
|
|
@@ -37,6 +37,12 @@
|
|
#define IS_GFX_DEVICE(pdev) ((pdev->class >> 16) == PCI_BASE_CLASS_DISPLAY)
|
|
#define IS_USB_DEVICE(pdev) ((pdev->class >> 8) == PCI_CLASS_SERIAL_USB)
|
|
#define IS_ISA_DEVICE(pdev) ((pdev->class >> 8) == PCI_CLASS_BRIDGE_ISA)
|
|
+#define IS_INTEL_IPU(pdev) ((pdev)->vendor == PCI_VENDOR_ID_INTEL && \
|
|
+ ((pdev)->device == 0x9a19 || \
|
|
+ (pdev)->device == 0x9a39 || \
|
|
+ (pdev)->device == 0x4e19 || \
|
|
+ (pdev)->device == 0x465d || \
|
|
+ (pdev)->device == 0x1919))
|
|
#define IS_IPTS(pdev) ((pdev)->vendor == PCI_VENDOR_ID_INTEL && \
|
|
((pdev)->device == 0x9d3e))
|
|
#define IS_AZALIA(pdev) ((pdev)->vendor == 0x8086 && (pdev)->device == 0x3a3e)
|
|
@@ -290,12 +296,14 @@ EXPORT_SYMBOL_GPL(intel_iommu_enabled);
|
|
|
|
static int dmar_map_gfx = 1;
|
|
static int dmar_map_ipts = 1;
|
|
+static int dmar_map_ipu = 1;
|
|
static int intel_iommu_superpage = 1;
|
|
static int iommu_identity_mapping;
|
|
static int iommu_skip_te_disable;
|
|
|
|
#define IDENTMAP_GFX 2
|
|
#define IDENTMAP_AZALIA 4
|
|
+#define IDENTMAP_IPU 8
|
|
#define IDENTMAP_IPTS 16
|
|
|
|
const struct iommu_ops intel_iommu_ops;
|
|
@@ -2565,6 +2573,9 @@ static int device_def_domain_type(struct device *dev)
|
|
if ((iommu_identity_mapping & IDENTMAP_GFX) && IS_GFX_DEVICE(pdev))
|
|
return IOMMU_DOMAIN_IDENTITY;
|
|
|
|
+ if ((iommu_identity_mapping & IDENTMAP_IPU) && IS_INTEL_IPU(pdev))
|
|
+ return IOMMU_DOMAIN_IDENTITY;
|
|
+
|
|
if ((iommu_identity_mapping & IDENTMAP_IPTS) && IS_IPTS(pdev))
|
|
return IOMMU_DOMAIN_IDENTITY;
|
|
}
|
|
@@ -2874,6 +2885,9 @@ static int __init init_dmars(void)
|
|
if (!dmar_map_gfx)
|
|
iommu_identity_mapping |= IDENTMAP_GFX;
|
|
|
|
+ if (!dmar_map_ipu)
|
|
+ iommu_identity_mapping |= IDENTMAP_IPU;
|
|
+
|
|
if (!dmar_map_ipts)
|
|
iommu_identity_mapping |= IDENTMAP_IPTS;
|
|
|
|
@@ -4788,6 +4802,18 @@ static void quirk_iommu_igfx(struct pci_dev *dev)
|
|
dmar_map_gfx = 0;
|
|
}
|
|
|
|
+static void quirk_iommu_ipu(struct pci_dev *dev)
|
|
+{
|
|
+ if (!IS_INTEL_IPU(dev))
|
|
+ return;
|
|
+
|
|
+ if (risky_device(dev))
|
|
+ return;
|
|
+
|
|
+ pci_info(dev, "Passthrough IOMMU for integrated Intel IPU\n");
|
|
+ dmar_map_ipu = 0;
|
|
+}
|
|
+
|
|
static void quirk_iommu_ipts(struct pci_dev *dev)
|
|
{
|
|
if (!IS_IPTS(dev))
|
|
@@ -4799,6 +4825,7 @@ static void quirk_iommu_ipts(struct pci_dev *dev)
|
|
pci_info(dev, "Passthrough IOMMU for IPTS\n");
|
|
dmar_map_ipts = 0;
|
|
}
|
|
+
|
|
/* G4x/GM45 integrated gfx dmar support is totally busted. */
|
|
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2a40, quirk_iommu_igfx);
|
|
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e00, quirk_iommu_igfx);
|
|
@@ -4834,6 +4861,9 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1632, quirk_iommu_igfx);
|
|
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x163A, quirk_iommu_igfx);
|
|
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x163D, quirk_iommu_igfx);
|
|
|
|
+/* disable IPU dmar support */
|
|
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_ANY_ID, quirk_iommu_ipu);
|
|
+
|
|
/* disable IPTS dmar support */
|
|
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9D3E, quirk_iommu_ipts);
|
|
|
|
--
|
|
2.41.0
|
|
|
|
From cb948321e6e2d4a959b6e7890366028c5b4b7938 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
Date: Sun, 10 Oct 2021 20:57:02 +0200
|
|
Subject: [PATCH] platform/x86: int3472: Enable I2c daisy chain
|
|
|
|
The TPS68470 PMIC has an I2C passthrough mode through which I2C traffic
|
|
can be forwarded to a device connected to the PMIC as though it were
|
|
connected directly to the system bus. Enable this mode when the chip
|
|
is initialised.
|
|
|
|
Signed-off-by: Daniel Scally <djrscally@gmail.com>
|
|
Patchset: cameras
|
|
---
|
|
drivers/platform/x86/intel/int3472/tps68470.c | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
diff --git a/drivers/platform/x86/intel/int3472/tps68470.c b/drivers/platform/x86/intel/int3472/tps68470.c
|
|
index 5b8d1a9620a5..6a0ff035cf20 100644
|
|
--- a/drivers/platform/x86/intel/int3472/tps68470.c
|
|
+++ b/drivers/platform/x86/intel/int3472/tps68470.c
|
|
@@ -46,6 +46,13 @@ static int tps68470_chip_init(struct device *dev, struct regmap *regmap)
|
|
return ret;
|
|
}
|
|
|
|
+ /* Enable I2C daisy chain */
|
|
+ ret = regmap_write(regmap, TPS68470_REG_S_I2C_CTL, 0x03);
|
|
+ if (ret) {
|
|
+ dev_err(dev, "Failed to enable i2c daisy chain\n");
|
|
+ return ret;
|
|
+ }
|
|
+
|
|
dev_info(dev, "TPS68470 REVID: 0x%02x\n", version);
|
|
|
|
return 0;
|
|
--
|
|
2.41.0
|
|
|
|
From c3df3ab4a47d2ebce9e23be3863709480c6f5247 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
Date: Wed, 4 May 2022 23:21:45 +0100
|
|
Subject: [PATCH] media: ipu3-cio2: Move functionality from .complete() to
|
|
.bound()
|
|
|
|
Creating links and registering subdev nodes during the .complete()
|
|
callback has the unfortunate effect of preventing all cameras that
|
|
connect to a notifier from working if any one of their drivers fails
|
|
to probe. Moving the functionality from .complete() to .bound() allows
|
|
those camera sensor drivers that did probe correctly to work regardless.
|
|
|
|
Signed-off-by: Daniel Scally <djrscally@gmail.com>
|
|
Patchset: cameras
|
|
---
|
|
drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 65 +++++++------------
|
|
1 file changed, 23 insertions(+), 42 deletions(-)
|
|
|
|
diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
|
|
index 3c84cb121632..8ba5f78baf9c 100644
|
|
--- a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
|
|
+++ b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
|
|
@@ -1384,7 +1384,10 @@ static int cio2_notifier_bound(struct v4l2_async_notifier *notifier,
|
|
{
|
|
struct cio2_device *cio2 = to_cio2_device(notifier);
|
|
struct sensor_async_subdev *s_asd = to_sensor_asd(asd);
|
|
+ struct device *dev = &cio2->pci_dev->dev;
|
|
struct cio2_queue *q;
|
|
+ unsigned int pad;
|
|
+ int ret;
|
|
|
|
if (cio2->queue[s_asd->csi2.port].sensor)
|
|
return -EBUSY;
|
|
@@ -1395,7 +1398,26 @@ static int cio2_notifier_bound(struct v4l2_async_notifier *notifier,
|
|
q->sensor = sd;
|
|
q->csi_rx_base = cio2->base + CIO2_REG_PIPE_BASE(q->csi2.port);
|
|
|
|
- return 0;
|
|
+ for (pad = 0; pad < q->sensor->entity.num_pads; pad++)
|
|
+ if (q->sensor->entity.pads[pad].flags &
|
|
+ MEDIA_PAD_FL_SOURCE)
|
|
+ break;
|
|
+
|
|
+ if (pad == q->sensor->entity.num_pads) {
|
|
+ dev_err(dev, "failed to find src pad for %s\n",
|
|
+ q->sensor->name);
|
|
+ return -ENXIO;
|
|
+ }
|
|
+
|
|
+ ret = media_create_pad_link(&q->sensor->entity, pad, &q->subdev.entity,
|
|
+ CIO2_PAD_SINK, 0);
|
|
+ if (ret) {
|
|
+ dev_err(dev, "failed to create link for %s\n",
|
|
+ q->sensor->name);
|
|
+ return ret;
|
|
+ }
|
|
+
|
|
+ return v4l2_device_register_subdev_nodes(&cio2->v4l2_dev);
|
|
}
|
|
|
|
/* The .unbind callback */
|
|
@@ -1409,50 +1431,9 @@ static void cio2_notifier_unbind(struct v4l2_async_notifier *notifier,
|
|
cio2->queue[s_asd->csi2.port].sensor = NULL;
|
|
}
|
|
|
|
-/* .complete() is called after all subdevices have been located */
|
|
-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_subdev *asd;
|
|
- struct cio2_queue *q;
|
|
- unsigned int pad;
|
|
- int ret;
|
|
-
|
|
- list_for_each_entry(asd, &cio2->notifier.asd_list, asd_list) {
|
|
- s_asd = to_sensor_asd(asd);
|
|
- q = &cio2->queue[s_asd->csi2.port];
|
|
-
|
|
- for (pad = 0; pad < q->sensor->entity.num_pads; pad++)
|
|
- if (q->sensor->entity.pads[pad].flags &
|
|
- MEDIA_PAD_FL_SOURCE)
|
|
- break;
|
|
-
|
|
- if (pad == q->sensor->entity.num_pads) {
|
|
- dev_err(dev, "failed to find src pad for %s\n",
|
|
- q->sensor->name);
|
|
- return -ENXIO;
|
|
- }
|
|
-
|
|
- ret = media_create_pad_link(
|
|
- &q->sensor->entity, pad,
|
|
- &q->subdev.entity, CIO2_PAD_SINK,
|
|
- 0);
|
|
- if (ret) {
|
|
- dev_err(dev, "failed to create link for %s\n",
|
|
- q->sensor->name);
|
|
- return ret;
|
|
- }
|
|
- }
|
|
-
|
|
- return v4l2_device_register_subdev_nodes(&cio2->v4l2_dev);
|
|
-}
|
|
-
|
|
static const struct v4l2_async_notifier_operations cio2_async_ops = {
|
|
.bound = cio2_notifier_bound,
|
|
.unbind = cio2_notifier_unbind,
|
|
- .complete = cio2_notifier_complete,
|
|
};
|
|
|
|
static int cio2_parse_firmware(struct cio2_device *cio2)
|
|
--
|
|
2.41.0
|
|
|
|
From b551835863227b32672a1d7047f335efe7c1c332 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
Date: Thu, 2 Jun 2022 22:15:56 +0100
|
|
Subject: [PATCH] media: ipu3-cio2: Re-add .complete() to ipu3-cio2
|
|
|
|
Removing the .complete() callback had some unintended consequences.
|
|
Because the VCM driver is not directly linked to the ipu3-cio2
|
|
driver .bound() never gets called for it, which means its devnode
|
|
is never created if it probes late. Because .complete() waits for
|
|
any sub-notifiers to also be complete it is captured in that call.
|
|
|
|
Signed-off-by: Daniel Scally <djrscally@gmail.com>
|
|
Patchset: cameras
|
|
---
|
|
drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 9 +++++++++
|
|
1 file changed, 9 insertions(+)
|
|
|
|
diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
|
|
index 8ba5f78baf9c..f0b77012641b 100644
|
|
--- a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
|
|
+++ b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c
|
|
@@ -1431,9 +1431,18 @@ static void cio2_notifier_unbind(struct v4l2_async_notifier *notifier,
|
|
cio2->queue[s_asd->csi2.port].sensor = NULL;
|
|
}
|
|
|
|
+/* .complete() is called after all subdevices have been located */
|
|
+static int cio2_notifier_complete(struct v4l2_async_notifier *notifier)
|
|
+{
|
|
+ struct cio2_device *cio2 = to_cio2_device(notifier);
|
|
+
|
|
+ return v4l2_device_register_subdev_nodes(&cio2->v4l2_dev);
|
|
+}
|
|
+
|
|
static const struct v4l2_async_notifier_operations cio2_async_ops = {
|
|
.bound = cio2_notifier_bound,
|
|
.unbind = cio2_notifier_unbind,
|
|
+ .complete = cio2_notifier_complete,
|
|
};
|
|
|
|
static int cio2_parse_firmware(struct cio2_device *cio2)
|
|
--
|
|
2.41.0
|
|
|
|
From 134f10f3f9d08098e3b2fed34d894b44bf8b9109 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Scally <djrscally@gmail.com>
|
|
Date: Thu, 28 Oct 2021 21:55:16 +0100
|
|
Subject: [PATCH] media: i2c: Add driver for DW9719 VCM
|
|
|
|
Add a driver for the DW9719 VCM. The driver creates a v4l2 subdevice
|
|
and registers a control to set the desired focus.
|
|
|
|
Signed-off-by: Daniel Scally <djrscally@gmail.com>
|
|
Patchset: cameras
|
|
---
|
|
MAINTAINERS | 7 +
|
|
drivers/media/i2c/Kconfig | 11 +
|
|
drivers/media/i2c/Makefile | 1 +
|
|
drivers/media/i2c/dw9719.c | 425 +++++++++++++++++++++++++++++++++++++
|
|
4 files changed, 444 insertions(+)
|
|
create mode 100644 drivers/media/i2c/dw9719.c
|
|
|
|
diff --git a/MAINTAINERS b/MAINTAINERS
|
|
index 35e19594640d..7e6631f0b55b 100644
|
|
--- a/MAINTAINERS
|
|
+++ b/MAINTAINERS
|
|
@@ -6262,6 +6262,13 @@ T: git git://linuxtv.org/media_tree.git
|
|
F: Documentation/devicetree/bindings/media/i2c/dongwoon,dw9714.yaml
|
|
F: drivers/media/i2c/dw9714.c
|
|
|
|
+DONGWOON DW9719 LENS VOICE COIL DRIVER
|
|
+M: Daniel Scally <djrscally@gmail.com>
|
|
+L: linux-media@vger.kernel.org
|
|
+S: Maintained
|
|
+T: git git://linuxtv.org/media_tree.git
|
|
+F: drivers/media/i2c/dw9719.c
|
|
+
|
|
DONGWOON DW9768 LENS VOICE COIL DRIVER
|
|
M: Dongchun Zhu <dongchun.zhu@mediatek.com>
|
|
L: linux-media@vger.kernel.org
|
|
diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
|
|
index 256d55bb2b1d..c9587f500a88 100644
|
|
--- a/drivers/media/i2c/Kconfig
|
|
+++ b/drivers/media/i2c/Kconfig
|
|
@@ -835,6 +835,17 @@ config VIDEO_DW9714
|
|
capability. This is designed for linear control of
|
|
voice coil motors, controlled via I2C serial interface.
|
|
|
|
+config VIDEO_DW9719
|
|
+ tristate "DW9719 lens voice coil support"
|
|
+ depends on I2C && VIDEO_V4L2
|
|
+ select MEDIA_CONTROLLER
|
|
+ select VIDEO_V4L2_SUBDEV_API
|
|
+ select V4L2_ASYNC
|
|
+ help
|
|
+ This is a driver for the DW9719 camera lens voice coil.
|
|
+ This is designed for linear control of voice coil motors,
|
|
+ controlled via I2C serial interface.
|
|
+
|
|
config VIDEO_DW9768
|
|
tristate "DW9768 lens voice coil support"
|
|
depends on I2C && VIDEO_DEV
|
|
diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
|
|
index b44dacf935f4..2a68bfb621b0 100644
|
|
--- a/drivers/media/i2c/Makefile
|
|
+++ b/drivers/media/i2c/Makefile
|
|
@@ -29,6 +29,7 @@ obj-$(CONFIG_VIDEO_CS5345) += cs5345.o
|
|
obj-$(CONFIG_VIDEO_CS53L32A) += cs53l32a.o
|
|
obj-$(CONFIG_VIDEO_CX25840) += cx25840/
|
|
obj-$(CONFIG_VIDEO_DW9714) += dw9714.o
|
|
+obj-$(CONFIG_VIDEO_DW9719) += dw9719.o
|
|
obj-$(CONFIG_VIDEO_DW9768) += dw9768.o
|
|
obj-$(CONFIG_VIDEO_DW9807_VCM) += dw9807-vcm.o
|
|
obj-$(CONFIG_VIDEO_ET8EK8) += et8ek8/
|
|
diff --git a/drivers/media/i2c/dw9719.c b/drivers/media/i2c/dw9719.c
|
|
new file mode 100644
|
|
index 000000000000..180b04d2a6b3
|
|
--- /dev/null
|
|
+++ b/drivers/media/i2c/dw9719.c
|
|
@@ -0,0 +1,425 @@
|
|
+// SPDX-License-Identifier: GPL-2.0
|
|
+// Copyright (c) 2012 Intel Corporation
|
|
+
|
|
+/*
|
|
+ * Based on linux/modules/camera/drivers/media/i2c/imx/dw9719.c in this repo:
|
|
+ * 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-common.h>
|
|
+#include <media/v4l2-ctrls.h>
|
|
+#include <media/v4l2-subdev.h>
|
|
+
|
|
+#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 0
|
|
+#define DW9719_ID 0xF1
|
|
+#define DW9719_CONTROL 2
|
|
+#define DW9719_VCM_CURRENT 3
|
|
+
|
|
+#define DW9719_MODE 6
|
|
+#define DW9719_VCM_FREQ 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 device *dev;
|
|
+ struct i2c_client *client;
|
|
+ struct regulator_bulk_data regulators[NUM_REGULATORS];
|
|
+ struct v4l2_subdev sd;
|
|
+
|
|
+ struct dw9719_v4l2_ctrls {
|
|
+ struct v4l2_ctrl_handler handler;
|
|
+ struct v4l2_ctrl *focus;
|
|
+ } 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;
|
|
+ u8 val;
|
|
+
|
|
+ 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");
|
|
+ ret = -ENXIO;
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int dw9719_power_down(struct dw9719_device *dw9719)
|
|
+{
|
|
+ return regulator_bulk_disable(NUM_REGULATORS, dw9719->regulators);
|
|
+}
|
|
+
|
|
+static int dw9719_power_up(struct dw9719_device *dw9719)
|
|
+{
|
|
+ int ret;
|
|
+
|
|
+ ret = regulator_bulk_enable(NUM_REGULATORS, dw9719->regulators);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+
|
|
+ /* Jiggle SCL pin to wake up device */
|
|
+ ret = dw9719_i2c_wr8(dw9719->client, DW9719_CONTROL, 1);
|
|
+
|
|
+ /* Need 100us to transit from SHUTDOWN to STANDBY*/
|
|
+ usleep_range(100, 1000);
|
|
+
|
|
+ ret = dw9719_i2c_wr8(dw9719->client, DW9719_CONTROL,
|
|
+ DW9719_ENABLE_RINGING);
|
|
+ if (ret < 0)
|
|
+ goto fail_powerdown;
|
|
+
|
|
+ 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)
|
|
+{
|
|
+ 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)
|
|
+{
|
|
+ struct dw9719_device *dw9719 = container_of(ctrl->handler,
|
|
+ struct dw9719_device,
|
|
+ ctrls.handler);
|
|
+ int ret;
|
|
+
|
|
+ /* Only apply changes to the controls if the device is powered up */
|
|
+ if (!pm_runtime_get_if_in_use(dw9719->dev))
|
|
+ return 0;
|
|
+
|
|
+ switch (ctrl->id) {
|
|
+ case V4L2_CID_FOCUS_ABSOLUTE:
|
|
+ ret = dw9719_t_focus_abs(dw9719, ctrl->val);
|
|
+ break;
|
|
+ default:
|
|
+ ret = -EINVAL;
|
|
+ }
|
|
+
|
|
+ pm_runtime_put(dw9719->dev);
|
|
+
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+static const struct v4l2_ctrl_ops dw9719_ctrl_ops = {
|
|
+ .s_ctrl = dw9719_set_ctrl,
|
|
+};
|
|
+
|
|
+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);
|
|
+ int ret;
|
|
+ int val;
|
|
+
|
|
+ for (val = dw9719->ctrls.focus->val; val >= 0;
|
|
+ val -= DW9719_CTRL_STEPS) {
|
|
+ ret = dw9719_t_focus_abs(dw9719, val);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+
|
|
+ usleep_range(DW9719_CTRL_DELAY_US, DW9719_CTRL_DELAY_US + 10);
|
|
+ }
|
|
+
|
|
+ return dw9719_power_down(dw9719);
|
|
+}
|
|
+
|
|
+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);
|
|
+ int current_focus = dw9719->ctrls.focus->val;
|
|
+ int ret;
|
|
+ int val;
|
|
+
|
|
+ ret = dw9719_power_up(dw9719);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+
|
|
+ for (val = current_focus % DW9719_CTRL_STEPS; val < current_focus;
|
|
+ val += DW9719_CTRL_STEPS) {
|
|
+ ret = dw9719_t_focus_abs(dw9719, val);
|
|
+ if (ret)
|
|
+ goto err_power_down;
|
|
+
|
|
+ usleep_range(DW9719_CTRL_DELAY_US, DW9719_CTRL_DELAY_US + 10);
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+
|
|
+err_power_down:
|
|
+ dw9719_power_down(dw9719);
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+static int dw9719_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
|
|
+{
|
|
+ return pm_runtime_resume_and_get(sd->dev);
|
|
+}
|
|
+
|
|
+static int dw9719_close(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
|
|
+{
|
|
+ pm_runtime_put(sd->dev);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static const struct v4l2_subdev_internal_ops dw9719_internal_ops = {
|
|
+ .open = dw9719_open,
|
|
+ .close = dw9719_close,
|
|
+};
|
|
+
|
|
+static int dw9719_init_controls(struct dw9719_device *dw9719)
|
|
+{
|
|
+ const struct v4l2_ctrl_ops *ops = &dw9719_ctrl_ops;
|
|
+ int ret;
|
|
+
|
|
+ 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,
|
|
+ DW9719_MAX_FOCUS_POS, 1, 0);
|
|
+
|
|
+ if (dw9719->ctrls.handler.error) {
|
|
+ dev_err(dw9719->dev, "Error initialising v4l2 ctrls\n");
|
|
+ ret = dw9719->ctrls.handler.error;
|
|
+ goto err_free_handler;
|
|
+ }
|
|
+
|
|
+ dw9719->sd.ctrl_handler = &dw9719->ctrls.handler;
|
|
+
|
|
+ return ret;
|
|
+
|
|
+err_free_handler:
|
|
+ v4l2_ctrl_handler_free(&dw9719->ctrls.handler);
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+static const struct v4l2_subdev_ops dw9719_ops = { };
|
|
+
|
|
+static int dw9719_probe(struct i2c_client *client)
|
|
+{
|
|
+ struct dw9719_device *dw9719;
|
|
+ int ret;
|
|
+
|
|
+ dw9719 = devm_kzalloc(&client->dev, sizeof(*dw9719), GFP_KERNEL);
|
|
+ if (!dw9719)
|
|
+ return -ENOMEM;
|
|
+
|
|
+ dw9719->client = client;
|
|
+ dw9719->dev = &client->dev;
|
|
+
|
|
+ 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";
|
|
+
|
|
+ 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;
|
|
+ dw9719->sd.internal_ops = &dw9719_internal_ops;
|
|
+
|
|
+ ret = dw9719_init_controls(dw9719);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+
|
|
+ ret = media_entity_pads_init(&dw9719->sd.entity, 0, NULL);
|
|
+ if (ret < 0)
|
|
+ goto err_free_ctrl_handler;
|
|
+
|
|
+ dw9719->sd.entity.function = MEDIA_ENT_F_LENS;
|
|
+
|
|
+ /*
|
|
+ * We need the driver to work in the event that pm runtime is disable in
|
|
+ * the kernel, so power up and verify the chip now. In the event that
|
|
+ * runtime pm is disabled this will leave the chip on, so that the lens
|
|
+ * will work.
|
|
+ */
|
|
+
|
|
+ ret = dw9719_power_up(dw9719);
|
|
+ if (ret)
|
|
+ goto err_cleanup_media;
|
|
+
|
|
+ ret = dw9719_detect(dw9719);
|
|
+ if (ret)
|
|
+ goto err_powerdown;
|
|
+
|
|
+ pm_runtime_set_active(&client->dev);
|
|
+ pm_runtime_get_noresume(&client->dev);
|
|
+ pm_runtime_enable(&client->dev);
|
|
+
|
|
+ ret = v4l2_async_register_subdev(&dw9719->sd);
|
|
+ if (ret < 0)
|
|
+ goto err_pm_runtime;
|
|
+
|
|
+ pm_runtime_set_autosuspend_delay(&client->dev, 1000);
|
|
+ pm_runtime_use_autosuspend(&client->dev);
|
|
+ pm_runtime_put_autosuspend(&client->dev);
|
|
+
|
|
+ return ret;
|
|
+
|
|
+err_pm_runtime:
|
|
+ pm_runtime_disable(&client->dev);
|
|
+ pm_runtime_put_noidle(&client->dev);
|
|
+err_powerdown:
|
|
+ dw9719_power_down(dw9719);
|
|
+err_cleanup_media:
|
|
+ media_entity_cleanup(&dw9719->sd.entity);
|
|
+err_free_ctrl_handler:
|
|
+ v4l2_ctrl_handler_free(&dw9719->ctrls.handler);
|
|
+
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+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);
|
|
+
|
|
+ pm_runtime_disable(&client->dev);
|
|
+ v4l2_async_unregister_subdev(sd);
|
|
+ v4l2_ctrl_handler_free(&dw9719->ctrls.handler);
|
|
+ media_entity_cleanup(&dw9719->sd.entity);
|
|
+}
|
|
+
|
|
+static const struct i2c_device_id dw9719_id_table[] = {
|
|
+ { "dw9719" },
|
|
+ { }
|
|
+};
|
|
+MODULE_DEVICE_TABLE(i2c, dw9719_id_table);
|
|
+
|
|
+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 = &dw9719_pm_ops,
|
|
+ },
|
|
+ .probe_new = dw9719_probe,
|
|
+ .remove = dw9719_remove,
|
|
+ .id_table = dw9719_id_table,
|
|
+};
|
|
+module_i2c_driver(dw9719_i2c_driver);
|
|
+
|
|
+MODULE_AUTHOR("Daniel Scally <djrscally@gmail.com>");
|
|
+MODULE_DESCRIPTION("DW9719 VCM Driver");
|
|
+MODULE_LICENSE("GPL");
|
|
--
|
|
2.41.0
|
|
|
|
From 4d00c4ddfa59ab50aace2ffce596f49306d5f05e Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Date: Fri, 15 Jul 2022 23:48:00 +0200
|
|
Subject: [PATCH] drivers/media/i2c: Fix DW9719 dependencies
|
|
|
|
It should depend on VIDEO_DEV instead of VIDEO_V4L2.
|
|
|
|
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
|
|
Patchset: cameras
|
|
---
|
|
drivers/media/i2c/Kconfig | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
|
|
index c9587f500a88..0e5a69d5d7ff 100644
|
|
--- a/drivers/media/i2c/Kconfig
|
|
+++ b/drivers/media/i2c/Kconfig
|
|
@@ -837,7 +837,7 @@ config VIDEO_DW9714
|
|
|
|
config VIDEO_DW9719
|
|
tristate "DW9719 lens voice coil support"
|
|
- depends on I2C && VIDEO_V4L2
|
|
+ depends on I2C && VIDEO_DEV
|
|
select MEDIA_CONTROLLER
|
|
select VIDEO_V4L2_SUBDEV_API
|
|
select V4L2_ASYNC
|
|
--
|
|
2.41.0
|
|
|
|
From cc9a03f16748473f0ef48cbf0dea5529023a357e Mon Sep 17 00:00:00 2001
|
|
From: Daniel Scally <dan.scally@ideasonboard.com>
|
|
Date: Thu, 2 Mar 2023 12:59:39 +0000
|
|
Subject: [PATCH] platform/x86: int3472: Remap reset GPIO for INT347E
|
|
|
|
ACPI _HID INT347E represents the OmniVision 7251 camera sensor. The
|
|
driver for this sensor expects a single pin named "enable", but on
|
|
some Microsoft Surface platforms the sensor is assigned a single
|
|
GPIO who's type flag is INT3472_GPIO_TYPE_RESET.
|
|
|
|
Remap the GPIO pin's function from "reset" to "enable". This is done
|
|
outside of the existing remap table since it is a more widespread
|
|
discrepancy than that method is designed for. Additionally swap the
|
|
polarity of the pin to match the driver's expectation.
|
|
|
|
Signed-off-by: Daniel Scally <dan.scally@ideasonboard.com>
|
|
Patchset: cameras
|
|
---
|
|
drivers/platform/x86/intel/int3472/discrete.c | 14 ++++++++++++++
|
|
1 file changed, 14 insertions(+)
|
|
|
|
diff --git a/drivers/platform/x86/intel/int3472/discrete.c b/drivers/platform/x86/intel/int3472/discrete.c
|
|
index ef020e23e596..d21ef437c2f6 100644
|
|
--- a/drivers/platform/x86/intel/int3472/discrete.c
|
|
+++ b/drivers/platform/x86/intel/int3472/discrete.c
|
|
@@ -98,6 +98,9 @@ static int skl_int3472_map_gpio_to_sensor(struct int3472_discrete_device *int347
|
|
{
|
|
const struct int3472_sensor_config *sensor_config;
|
|
char *path = agpio->resource_source.string_ptr;
|
|
+ const struct acpi_device_id ov7251_ids[] = {
|
|
+ { "INT347E" },
|
|
+ };
|
|
struct gpiod_lookup *table_entry;
|
|
struct acpi_device *adev;
|
|
acpi_handle handle;
|
|
@@ -120,6 +123,17 @@ static int skl_int3472_map_gpio_to_sensor(struct int3472_discrete_device *int347
|
|
}
|
|
}
|
|
|
|
+ /*
|
|
+ * In addition to the function remap table we need to bulk remap the
|
|
+ * "reset" GPIO for the OmniVision 7251 sensor, as the driver for that
|
|
+ * expects its only GPIO pin to be called "enable" (and to have the
|
|
+ * opposite polarity).
|
|
+ */
|
|
+ if (!strcmp(func, "reset") && !acpi_match_device_ids(int3472->sensor, ov7251_ids)) {
|
|
+ func = "enable";
|
|
+ polarity = GPIO_ACTIVE_HIGH;
|
|
+ }
|
|
+
|
|
/* Functions mapped to NULL should not be mapped to the sensor */
|
|
if (!func)
|
|
return 0;
|
|
--
|
|
2.41.0
|
|
|
|
From 44f08fa3e281a7019ef0a1b2db7c1319cc0da80e Mon Sep 17 00:00:00 2001
|
|
From: Daniel Scally <dan.scally@ideasonboard.com>
|
|
Date: Tue, 21 Mar 2023 13:45:26 +0000
|
|
Subject: [PATCH] media: i2c: Clarify that gain is Analogue gain in OV7251
|
|
|
|
Update the control ID for the gain control in the ov7251 driver to
|
|
V4L2_CID_ANALOGUE_GAIN.
|
|
|
|
Signed-off-by: Daniel Scally <dan.scally@ideasonboard.com>
|
|
Patchset: cameras
|
|
---
|
|
drivers/media/i2c/ov7251.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/media/i2c/ov7251.c b/drivers/media/i2c/ov7251.c
|
|
index 88e987435285..ff7b2c26da83 100644
|
|
--- a/drivers/media/i2c/ov7251.c
|
|
+++ b/drivers/media/i2c/ov7251.c
|
|
@@ -1051,7 +1051,7 @@ static int ov7251_s_ctrl(struct v4l2_ctrl *ctrl)
|
|
case V4L2_CID_EXPOSURE:
|
|
ret = ov7251_set_exposure(ov7251, ctrl->val);
|
|
break;
|
|
- case V4L2_CID_GAIN:
|
|
+ case V4L2_CID_ANALOGUE_GAIN:
|
|
ret = ov7251_set_gain(ov7251, ctrl->val);
|
|
break;
|
|
case V4L2_CID_TEST_PATTERN:
|
|
@@ -1551,7 +1551,7 @@ static int ov7251_init_ctrls(struct ov7251 *ov7251)
|
|
ov7251->exposure = v4l2_ctrl_new_std(&ov7251->ctrls, &ov7251_ctrl_ops,
|
|
V4L2_CID_EXPOSURE, 1, 32, 1, 32);
|
|
ov7251->gain = v4l2_ctrl_new_std(&ov7251->ctrls, &ov7251_ctrl_ops,
|
|
- V4L2_CID_GAIN, 16, 1023, 1, 16);
|
|
+ V4L2_CID_ANALOGUE_GAIN, 16, 1023, 1, 16);
|
|
v4l2_ctrl_new_std_menu_items(&ov7251->ctrls, &ov7251_ctrl_ops,
|
|
V4L2_CID_TEST_PATTERN,
|
|
ARRAY_SIZE(ov7251_test_pattern_menu) - 1,
|
|
--
|
|
2.41.0
|
|
|
|
From d3a4b533b2932bdd6398ea430cfca8fa7d51386c Mon Sep 17 00:00:00 2001
|
|
From: Daniel Scally <dan.scally@ideasonboard.com>
|
|
Date: Wed, 22 Mar 2023 11:01:42 +0000
|
|
Subject: [PATCH] media: v4l2-core: Acquire privacy led in
|
|
v4l2_async_register_subdev()
|
|
|
|
The current call to v4l2_subdev_get_privacy_led() is contained in
|
|
v4l2_async_register_subdev_sensor(), but that function isn't used by
|
|
all the sensor drivers. Move the acquisition of the privacy led to
|
|
v4l2_async_register_subdev() instead.
|
|
|
|
Signed-off-by: Daniel Scally <dan.scally@ideasonboard.com>
|
|
Patchset: cameras
|
|
---
|
|
drivers/media/v4l2-core/v4l2-async.c | 4 ++++
|
|
drivers/media/v4l2-core/v4l2-fwnode.c | 4 ----
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
|
|
index b16b5f4cb91e..33739a979cbc 100644
|
|
--- a/drivers/media/v4l2-core/v4l2-async.c
|
|
+++ b/drivers/media/v4l2-core/v4l2-async.c
|
|
@@ -760,6 +760,10 @@ int v4l2_async_register_subdev(struct v4l2_subdev *sd)
|
|
struct v4l2_async_notifier *notifier;
|
|
int ret;
|
|
|
|
+ ret = v4l2_subdev_get_privacy_led(sd);
|
|
+ if (ret < 0)
|
|
+ return ret;
|
|
+
|
|
/*
|
|
* No reference taken. The reference is held by the device
|
|
* (struct v4l2_subdev.dev), and async sub-device does not
|
|
diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
|
|
index 049c2f2001ea..f8c3e40b2b71 100644
|
|
--- a/drivers/media/v4l2-core/v4l2-fwnode.c
|
|
+++ b/drivers/media/v4l2-core/v4l2-fwnode.c
|
|
@@ -1304,10 +1304,6 @@ int v4l2_async_register_subdev_sensor(struct v4l2_subdev *sd)
|
|
|
|
v4l2_async_nf_init(notifier);
|
|
|
|
- ret = v4l2_subdev_get_privacy_led(sd);
|
|
- if (ret < 0)
|
|
- goto out_cleanup;
|
|
-
|
|
ret = v4l2_async_nf_parse_fwnode_sensor(sd->dev, notifier);
|
|
if (ret < 0)
|
|
goto out_cleanup;
|
|
--
|
|
2.41.0
|
|
|
|
From 33d5408f18336da004bf9f86d1add568b184624f Mon Sep 17 00:00:00 2001
|
|
From: Kate Hsuan <hpa@redhat.com>
|
|
Date: Tue, 21 Mar 2023 23:37:16 +0800
|
|
Subject: [PATCH] platform: x86: int3472: Add MFD cell for tps68470 LED
|
|
|
|
Add MFD cell for tps68470-led.
|
|
|
|
Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com>
|
|
Signed-off-by: Kate Hsuan <hpa@redhat.com>
|
|
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
|
|
Patchset: cameras
|
|
---
|
|
drivers/platform/x86/intel/int3472/tps68470.c | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/platform/x86/intel/int3472/tps68470.c b/drivers/platform/x86/intel/int3472/tps68470.c
|
|
index 6a0ff035cf20..2a7d01d3abc8 100644
|
|
--- a/drivers/platform/x86/intel/int3472/tps68470.c
|
|
+++ b/drivers/platform/x86/intel/int3472/tps68470.c
|
|
@@ -17,7 +17,7 @@
|
|
#define DESIGNED_FOR_CHROMEOS 1
|
|
#define DESIGNED_FOR_WINDOWS 2
|
|
|
|
-#define TPS68470_WIN_MFD_CELL_COUNT 3
|
|
+#define TPS68470_WIN_MFD_CELL_COUNT 4
|
|
|
|
static const struct mfd_cell tps68470_cros[] = {
|
|
{ .name = "tps68470-gpio" },
|
|
@@ -200,7 +200,8 @@ static int skl_int3472_tps68470_probe(struct i2c_client *client)
|
|
cells[1].name = "tps68470-regulator";
|
|
cells[1].platform_data = (void *)board_data->tps68470_regulator_pdata;
|
|
cells[1].pdata_size = sizeof(struct tps68470_regulator_platform_data);
|
|
- cells[2].name = "tps68470-gpio";
|
|
+ cells[2].name = "tps68470-led";
|
|
+ cells[3].name = "tps68470-gpio";
|
|
|
|
for (i = 0; i < board_data->n_gpiod_lookups; i++)
|
|
gpiod_add_lookup_table(board_data->tps68470_gpio_lookup_tables[i]);
|
|
--
|
|
2.41.0
|
|
|
|
From 414acb5a6b1bb43e1bc2df05a77b4f4cd0e46925 Mon Sep 17 00:00:00 2001
|
|
From: Kate Hsuan <hpa@redhat.com>
|
|
Date: Tue, 21 Mar 2023 23:37:17 +0800
|
|
Subject: [PATCH] include: mfd: tps68470: Add masks for LEDA and LEDB
|
|
|
|
Add flags for both LEDA(TPS68470_ILEDCTL_ENA), LEDB
|
|
(TPS68470_ILEDCTL_ENB), and current control mask for LEDB
|
|
(TPS68470_ILEDCTL_CTRLB)
|
|
|
|
Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com>
|
|
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
|
|
Signed-off-by: Kate Hsuan <hpa@redhat.com>
|
|
Patchset: cameras
|
|
---
|
|
include/linux/mfd/tps68470.h | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/include/linux/mfd/tps68470.h b/include/linux/mfd/tps68470.h
|
|
index 7807fa329db0..2d2abb25b944 100644
|
|
--- a/include/linux/mfd/tps68470.h
|
|
+++ b/include/linux/mfd/tps68470.h
|
|
@@ -34,6 +34,7 @@
|
|
#define TPS68470_REG_SGPO 0x22
|
|
#define TPS68470_REG_GPDI 0x26
|
|
#define TPS68470_REG_GPDO 0x27
|
|
+#define TPS68470_REG_ILEDCTL 0x28
|
|
#define TPS68470_REG_VCMVAL 0x3C
|
|
#define TPS68470_REG_VAUX1VAL 0x3D
|
|
#define TPS68470_REG_VAUX2VAL 0x3E
|
|
@@ -94,4 +95,8 @@
|
|
#define TPS68470_GPIO_MODE_OUT_CMOS 2
|
|
#define TPS68470_GPIO_MODE_OUT_ODRAIN 3
|
|
|
|
+#define TPS68470_ILEDCTL_ENA BIT(2)
|
|
+#define TPS68470_ILEDCTL_ENB BIT(6)
|
|
+#define TPS68470_ILEDCTL_CTRLB GENMASK(5, 4)
|
|
+
|
|
#endif /* __LINUX_MFD_TPS68470_H */
|
|
--
|
|
2.41.0
|
|
|
|
From 405426bd01c4cb3646afb639b945f79844e525fe Mon Sep 17 00:00:00 2001
|
|
From: Kate Hsuan <hpa@redhat.com>
|
|
Date: Tue, 21 Mar 2023 23:37:18 +0800
|
|
Subject: [PATCH] leds: tps68470: Add LED control for tps68470
|
|
|
|
There are two LED controllers, LEDA indicator LED and LEDB flash LED for
|
|
tps68470. LEDA can be enabled by setting TPS68470_ILEDCTL_ENA. Moreover,
|
|
tps68470 provides four levels of power status for LEDB. If the
|
|
properties called "ti,ledb-current" can be found, the current will be
|
|
set according to the property values. These two LEDs can be controlled
|
|
through the LED class of sysfs (tps68470-leda and tps68470-ledb).
|
|
|
|
Signed-off-by: Kate Hsuan <hpa@redhat.com>
|
|
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
|
|
Patchset: cameras
|
|
---
|
|
drivers/leds/Kconfig | 12 +++
|
|
drivers/leds/Makefile | 1 +
|
|
drivers/leds/leds-tps68470.c | 185 +++++++++++++++++++++++++++++++++++
|
|
3 files changed, 198 insertions(+)
|
|
create mode 100644 drivers/leds/leds-tps68470.c
|
|
|
|
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
|
|
index 2c5fdf848210..ead139f0df52 100644
|
|
--- a/drivers/leds/Kconfig
|
|
+++ b/drivers/leds/Kconfig
|
|
@@ -841,6 +841,18 @@ config LEDS_TPS6105X
|
|
It is a single boost converter primarily for white LEDs and
|
|
audio amplifiers.
|
|
|
|
+config LEDS_TPS68470
|
|
+ tristate "LED support for TI TPS68470"
|
|
+ depends on LEDS_CLASS
|
|
+ depends on INTEL_SKL_INT3472
|
|
+ help
|
|
+ This driver supports TPS68470 PMIC with LED chip.
|
|
+ It provides two LED controllers, with the ability to drive 2
|
|
+ indicator LEDs and 2 flash LEDs.
|
|
+
|
|
+ To compile this driver as a module, choose M and it will be
|
|
+ called leds-tps68470
|
|
+
|
|
config LEDS_IP30
|
|
tristate "LED support for SGI Octane machines"
|
|
depends on LEDS_CLASS
|
|
diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
|
|
index c07d1512c745..dd78cb6ef22e 100644
|
|
--- a/drivers/leds/Makefile
|
|
+++ b/drivers/leds/Makefile
|
|
@@ -81,6 +81,7 @@ obj-$(CONFIG_LEDS_TCA6507) += leds-tca6507.o
|
|
obj-$(CONFIG_LEDS_TI_LMU_COMMON) += leds-ti-lmu-common.o
|
|
obj-$(CONFIG_LEDS_TLC591XX) += leds-tlc591xx.o
|
|
obj-$(CONFIG_LEDS_TPS6105X) += leds-tps6105x.o
|
|
+obj-$(CONFIG_LEDS_TPS68470) += leds-tps68470.o
|
|
obj-$(CONFIG_LEDS_TURRIS_OMNIA) += leds-turris-omnia.o
|
|
obj-$(CONFIG_LEDS_WM831X_STATUS) += leds-wm831x-status.o
|
|
obj-$(CONFIG_LEDS_WM8350) += leds-wm8350.o
|
|
diff --git a/drivers/leds/leds-tps68470.c b/drivers/leds/leds-tps68470.c
|
|
new file mode 100644
|
|
index 000000000000..35aeb5db89c8
|
|
--- /dev/null
|
|
+++ b/drivers/leds/leds-tps68470.c
|
|
@@ -0,0 +1,185 @@
|
|
+// SPDX-License-Identifier: GPL-2.0
|
|
+/*
|
|
+ * LED driver for TPS68470 PMIC
|
|
+ *
|
|
+ * Copyright (C) 2023 Red Hat
|
|
+ *
|
|
+ * Authors:
|
|
+ * Kate Hsuan <hpa@redhat.com>
|
|
+ */
|
|
+
|
|
+#include <linux/leds.h>
|
|
+#include <linux/mfd/tps68470.h>
|
|
+#include <linux/module.h>
|
|
+#include <linux/platform_device.h>
|
|
+#include <linux/property.h>
|
|
+#include <linux/regmap.h>
|
|
+
|
|
+
|
|
+#define lcdev_to_led(led_cdev) \
|
|
+ container_of(led_cdev, struct tps68470_led, lcdev)
|
|
+
|
|
+#define led_to_tps68470(led, index) \
|
|
+ container_of(led, struct tps68470_device, leds[index])
|
|
+
|
|
+enum tps68470_led_ids {
|
|
+ TPS68470_ILED_A,
|
|
+ TPS68470_ILED_B,
|
|
+ TPS68470_NUM_LEDS
|
|
+};
|
|
+
|
|
+static const char *tps68470_led_names[] = {
|
|
+ [TPS68470_ILED_A] = "tps68470-iled_a",
|
|
+ [TPS68470_ILED_B] = "tps68470-iled_b",
|
|
+};
|
|
+
|
|
+struct tps68470_led {
|
|
+ unsigned int led_id;
|
|
+ struct led_classdev lcdev;
|
|
+};
|
|
+
|
|
+struct tps68470_device {
|
|
+ struct device *dev;
|
|
+ struct regmap *regmap;
|
|
+ struct tps68470_led leds[TPS68470_NUM_LEDS];
|
|
+};
|
|
+
|
|
+enum ctrlb_current {
|
|
+ CTRLB_2MA = 0,
|
|
+ CTRLB_4MA = 1,
|
|
+ CTRLB_8MA = 2,
|
|
+ CTRLB_16MA = 3,
|
|
+};
|
|
+
|
|
+static int tps68470_brightness_set(struct led_classdev *led_cdev, enum led_brightness brightness)
|
|
+{
|
|
+ struct tps68470_led *led = lcdev_to_led(led_cdev);
|
|
+ struct tps68470_device *tps68470 = led_to_tps68470(led, led->led_id);
|
|
+ struct regmap *regmap = tps68470->regmap;
|
|
+
|
|
+ switch (led->led_id) {
|
|
+ case TPS68470_ILED_A:
|
|
+ return regmap_update_bits(regmap, TPS68470_REG_ILEDCTL, TPS68470_ILEDCTL_ENA,
|
|
+ brightness ? TPS68470_ILEDCTL_ENA : 0);
|
|
+ case TPS68470_ILED_B:
|
|
+ return regmap_update_bits(regmap, TPS68470_REG_ILEDCTL, TPS68470_ILEDCTL_ENB,
|
|
+ brightness ? TPS68470_ILEDCTL_ENB : 0);
|
|
+ }
|
|
+ return -EINVAL;
|
|
+}
|
|
+
|
|
+static enum led_brightness tps68470_brightness_get(struct led_classdev *led_cdev)
|
|
+{
|
|
+ struct tps68470_led *led = lcdev_to_led(led_cdev);
|
|
+ struct tps68470_device *tps68470 = led_to_tps68470(led, led->led_id);
|
|
+ struct regmap *regmap = tps68470->regmap;
|
|
+ int ret = 0;
|
|
+ int value = 0;
|
|
+
|
|
+ ret = regmap_read(regmap, TPS68470_REG_ILEDCTL, &value);
|
|
+ if (ret)
|
|
+ return dev_err_probe(led_cdev->dev, -EINVAL, "failed on reading register\n");
|
|
+
|
|
+ switch (led->led_id) {
|
|
+ case TPS68470_ILED_A:
|
|
+ value = value & TPS68470_ILEDCTL_ENA;
|
|
+ break;
|
|
+ case TPS68470_ILED_B:
|
|
+ value = value & TPS68470_ILEDCTL_ENB;
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ return value ? LED_ON : LED_OFF;
|
|
+}
|
|
+
|
|
+
|
|
+static int tps68470_ledb_current_init(struct platform_device *pdev,
|
|
+ struct tps68470_device *tps68470)
|
|
+{
|
|
+ int ret = 0;
|
|
+ unsigned int curr;
|
|
+
|
|
+ /* configure LEDB current if the properties can be got */
|
|
+ if (!device_property_read_u32(&pdev->dev, "ti,ledb-current", &curr)) {
|
|
+ if (curr > CTRLB_16MA) {
|
|
+ dev_err(&pdev->dev,
|
|
+ "Invalid LEDB current value: %d\n",
|
|
+ curr);
|
|
+ return -EINVAL;
|
|
+ }
|
|
+ ret = regmap_update_bits(tps68470->regmap, TPS68470_REG_ILEDCTL,
|
|
+ TPS68470_ILEDCTL_CTRLB, curr);
|
|
+ }
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+static int tps68470_leds_probe(struct platform_device *pdev)
|
|
+{
|
|
+ int i = 0;
|
|
+ int ret = 0;
|
|
+ struct tps68470_device *tps68470;
|
|
+ struct tps68470_led *led;
|
|
+ struct led_classdev *lcdev;
|
|
+
|
|
+ tps68470 = devm_kzalloc(&pdev->dev, sizeof(struct tps68470_device),
|
|
+ GFP_KERNEL);
|
|
+ if (!tps68470)
|
|
+ return -ENOMEM;
|
|
+
|
|
+ tps68470->dev = &pdev->dev;
|
|
+ tps68470->regmap = dev_get_drvdata(pdev->dev.parent);
|
|
+
|
|
+ for (i = 0; i < TPS68470_NUM_LEDS; i++) {
|
|
+ led = &tps68470->leds[i];
|
|
+ lcdev = &led->lcdev;
|
|
+
|
|
+ led->led_id = i;
|
|
+
|
|
+ lcdev->name = devm_kasprintf(tps68470->dev, GFP_KERNEL, "%s::%s",
|
|
+ tps68470_led_names[i], LED_FUNCTION_INDICATOR);
|
|
+ if (!lcdev->name)
|
|
+ return -ENOMEM;
|
|
+
|
|
+ lcdev->max_brightness = 1;
|
|
+ lcdev->brightness = 0;
|
|
+ lcdev->brightness_set_blocking = tps68470_brightness_set;
|
|
+ lcdev->brightness_get = tps68470_brightness_get;
|
|
+ lcdev->dev = &pdev->dev;
|
|
+
|
|
+ ret = devm_led_classdev_register(tps68470->dev, lcdev);
|
|
+ if (ret) {
|
|
+ dev_err_probe(tps68470->dev, ret,
|
|
+ "error registering led\n");
|
|
+ goto err_exit;
|
|
+ }
|
|
+
|
|
+ if (i == TPS68470_ILED_B) {
|
|
+ ret = tps68470_ledb_current_init(pdev, tps68470);
|
|
+ if (ret)
|
|
+ goto err_exit;
|
|
+ }
|
|
+ }
|
|
+
|
|
+err_exit:
|
|
+ if (ret) {
|
|
+ for (i = 0; i < TPS68470_NUM_LEDS; i++) {
|
|
+ if (tps68470->leds[i].lcdev.name)
|
|
+ devm_led_classdev_unregister(&pdev->dev,
|
|
+ &tps68470->leds[i].lcdev);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ return ret;
|
|
+}
|
|
+static struct platform_driver tps68470_led_driver = {
|
|
+ .driver = {
|
|
+ .name = "tps68470-led",
|
|
+ },
|
|
+ .probe = tps68470_leds_probe,
|
|
+};
|
|
+
|
|
+module_platform_driver(tps68470_led_driver);
|
|
+
|
|
+MODULE_ALIAS("platform:tps68470-led");
|
|
+MODULE_DESCRIPTION("LED driver for TPS68470 PMIC");
|
|
+MODULE_LICENSE("GPL v2");
|
|
--
|
|
2.41.0
|
|
|