system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-15 15:59:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

media: ipu-bridge: use IPU_MAX_PORTS for bridge instead of CIO2_NUM_PORTS

Browse source 
Before bridge driver use CIO2_NUM_PORTS as the maximum supported CSI2 port
number. Current bridge driver is moved out of ipu3, so define a new macro
in ipu bridge for all IPUs instead of including CIO2 definition.
This patch also removes the ipu3-cio2.h inclusion in ipu-bridge.h.

Signed-off-by: Bingbu Cao <bingbu.cao@intel.com>
Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Bingbu Cao 2023-05-18 12:05:22 +02:00 committed by Mauro Carvalho Chehab
parent 881ca25978
commit e2375e4341
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/media/pci/intel/ipu-bridge.c
View file

@ -301,7 +301,7 @@ static int ipu_bridge_connect_sensor(const struct ipu_sensor_config *cfg,
if (!adev->status.enabled)
continue;
if (bridge->n_sensors >= CIO2_NUM_PORTS) {
if (bridge->n_sensors >= IPU_MAX_PORTS) {
acpi_dev_put(adev);
dev_err(&ipu->dev, "Exceeded available IPU ports\n");
return -EINVAL;

5
drivers/media/pci/intel/ipu-bridge.h
View file

@ -6,12 +6,11 @@
#include <linux/property.h>
#include <linux/types.h>
#include "ipu3/ipu3-cio2.h"
struct i2c_client;
#define IPU_HID "INT343E"
#define IPU_MAX_LANES 4
#define IPU_MAX_PORTS 4
#define MAX_NUM_LINK_FREQS 3
/* Values are educated guesses as we don't have a spec */
@ -140,7 +139,7 @@ struct ipu_bridge {
struct software_node ipu_hid_node;
u32 data_lanes[4];
unsigned int n_sensors;
struct ipu_sensor sensors[CIO2_NUM_PORTS];
struct ipu_sensor sensors[IPU_MAX_PORTS];
};
#if IS_ENABLED(CONFIG_IPU_BRIDGE)