Commit e2375e43 authored by Bingbu Cao's avatar Bingbu Cao Committed by Mauro Carvalho Chehab

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

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: default avatarBingbu Cao <bingbu.cao@intel.com>
Reviewed-by: default avatarDaniel Scally <dan.scally@ideasonboard.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 881ca259
......@@ -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;
......
......@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment