github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

media: ipu-bridge: Request non-continuous clock for ov5693 on IPU6

Browse Source 
The ov5693 (INT33BE / OVTI5693) needs its MIPI clock lane gated while
idle for the IPU6 CSI-2 receiver to lock onto the link, which the sensor
driver does when the endpoint requests a non-continuous clock.

The same sensor works with a free-running clock on the IPU3, so request
it only for the IPU6 variants where it has been confirmed on hardware:
Tiger Lake, Alder Lake-P and Alder Lake-N.

Signed-off-by: Fernando Rimoli <fernandorimoli11@gmail.com>
Tested-by: Jakob Berg Jespersen <dev@berg.pm> # Surface Pro 7+, IPU6 Tiger Lake
Tested-by: Fil Dunsky <filipp.dunsky@gmail.com> # Surface Pro 8, IPU6 Tiger Lake (8086:9a19)
Tested-by: Lucas Lis <lucaseze.lis@gmail.com> # Surface Pro 7+, IPU6 Tiger Lake (0x9a19)
Tested-by: Kengo Oki <dev.kengo.fugu0141@gmail.com> # Surface Go 4, IPU6 Alder Lake-N 8086:462e
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
This commit is contained in:
Fernando Rimoli 2026-09-02 16:23:21 +02:00 committed by Sakari Ailus
parent b883954d84
commit 8e3def7bf4
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/media/pci/intel/ipu-bridge.c
View File

@ -50,6 +50,14 @@
* *
* Please keep the list sorted by ACPI HID. * Please keep the list sorted by ACPI HID.
*/ */
/* IPU6 variants whose CSI-2 receiver needs the ov5693 clock lane gated */
static const u16 ipu6_ov5693_ncont_clk[] = {
PCI_DEVICE_ID_INTEL_IPU6, /* Tiger Lake */
PCI_DEVICE_ID_INTEL_IPU6EP_ADLP, /* Alder Lake-P */
PCI_DEVICE_ID_INTEL_IPU6EP_ADLN, /* Alder Lake-N */
0
};
static const struct ipu_sensor_config ipu_supported_sensors[] = { static const struct ipu_sensor_config ipu_supported_sensors[] = {
/* Himax HM1092 */ /* Himax HM1092 */
IPU_SENSOR_CONFIG("HIMX1092", 2, 180000000, 180480000), IPU_SENSOR_CONFIG("HIMX1092", 2, 180000000, 180480000),
@ -62,6 +70,9 @@ static const struct ipu_sensor_config ipu_supported_sensors[] = {
/* GalaxyCore GC0310 */ /* GalaxyCore GC0310 */
IPU_SENSOR_CONFIG("INT0310", 1, 55692000), IPU_SENSOR_CONFIG("INT0310", 1, 55692000),
/* Omnivision OV5693 */ /* Omnivision OV5693 */
IPU_SENSOR_CONFIG_MATCH_FL("INT33BE", ipu6_ov5693_ncont_clk,
IPU_BR_FL_CSI2_CLK_NONCONTINUOUS,
1, 419200000),
IPU_SENSOR_CONFIG("INT33BE", 1, 419200000), IPU_SENSOR_CONFIG("INT33BE", 1, 419200000),
/* Onsemi MT9M114 */ /* Onsemi MT9M114 */
IPU_SENSOR_CONFIG("INT33F0", 1, 384000000), IPU_SENSOR_CONFIG("INT33F0", 1, 384000000),
@ -98,6 +109,9 @@ static const struct ipu_sensor_config ipu_supported_sensors[] = {
/* Omnivision OV5675 */ /* Omnivision OV5675 */
IPU_SENSOR_CONFIG("OVTI5675", 1, 450000000), IPU_SENSOR_CONFIG("OVTI5675", 1, 450000000),
/* Omnivision OV5693 */ /* Omnivision OV5693 */
IPU_SENSOR_CONFIG_MATCH_FL("OVTI5693", ipu6_ov5693_ncont_clk,
IPU_BR_FL_CSI2_CLK_NONCONTINUOUS,
1, 419200000),
IPU_SENSOR_CONFIG("OVTI5693", 1, 419200000), IPU_SENSOR_CONFIG("OVTI5693", 1, 419200000),
/* Omnivision OV8856 */ /* Omnivision OV8856 */
IPU_SENSOR_CONFIG("OVTI8856", 3, 180000000, 360000000, 720000000), IPU_SENSOR_CONFIG("OVTI8856", 3, 180000000, 360000000, 720000000),
@ -566,6 +580,10 @@ static void ipu_bridge_create_fwnode_properties(
cfg->link_freqs, cfg->link_freqs,
cfg->nr_link_freqs); cfg->nr_link_freqs);
if (cfg->flags & IPU_BR_FL_CSI2_CLK_NONCONTINUOUS)
sensor->ep_properties[IPU_BRIDGE_NEXT_PROPERTY(i, EP_CLOCK_NONCONTINUOUS)] =
PROPERTY_ENTRY_BOOL("clock-noncontinuous");
sensor->ipu_properties[0] = PROPERTY_ENTRY_U32_ARRAY_LEN( sensor->ipu_properties[0] = PROPERTY_ENTRY_U32_ARRAY_LEN(
sensor->prop_names.data_lanes, sensor->prop_names.data_lanes,
bridge->data_lanes, sensor->lanes); bridge->data_lanes, sensor->lanes);

5
include/media/ipu-bridge.h
View File

@ -17,6 +17,10 @@
#define IPU_SENSOR_ROTATION_NORMAL 0 #define IPU_SENSOR_ROTATION_NORMAL 0
#define IPU_SENSOR_ROTATION_INVERTED 1 #define IPU_SENSOR_ROTATION_INVERTED 1
/* Flags for struct ipu_sensor_config */
/* The sensor's CSI-2 transmitter needs a non-continuous clock */
#define IPU_BR_FL_CSI2_CLK_NONCONTINUOUS BIT(0)
/* /*
* Sensor config specific to one or more IPUs, identified by their PCI product * Sensor config specific to one or more IPUs, identified by their PCI product
* IDs, with flags describing what the sensor needs there. Entries for one HID * IDs, with flags describing what the sensor needs there. Entries for one HID
@ -80,6 +84,7 @@ enum ipu_bridge_ep_props {
IPU_BRIDGE_EP_DATA_LANES, IPU_BRIDGE_EP_DATA_LANES,
IPU_BRIDGE_EP_REMOTE_EP, IPU_BRIDGE_EP_REMOTE_EP,
IPU_BRIDGE_EP_LINK_FREQUENCIES, IPU_BRIDGE_EP_LINK_FREQUENCIES,
IPU_BRIDGE_EP_CLOCK_NONCONTINUOUS,
IPU_BRIDGE_EP_NUM_OF, IPU_BRIDGE_EP_NUM_OF,
IPU_BRIDGE_EP_NUM_ENTRIES IPU_BRIDGE_EP_NUM_ENTRIES
}; };