mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-05 02:19:51 +00:00
Code Issues Releases Wiki Activity

greybus: camera: Hardcode the APB-A CSI-2 TX parameters

Browse source 
Camera modules will stop reporting the number of lines per second,
hardcode the parameter in the driver until the APB-A CSI-2 TX
configuration protocol gets updated as well to use a more appropriate
form of bandwidth information.

The number of data lanes is also hardcoded as it should not depend on
the module's CSI-2 bus configuration.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Laurent Pinchart 2016-07-15 11:03:43 +02:00 committed by Greg Kroah-Hartman
parent fdf73c00c8
commit 24f9a6e494
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/staging/greybus/camera.c
View file

@ -277,6 +277,13 @@ struct ap_csi_config_request {
__le32 lines_per_second;
} __packed;
/*
* TODO: Compute the number of lanes dynamically based on bandwidth
* requirements.
*/
#define GB_CAMERA_CSI_NUM_DATA_LANES 4
#define GB_CAMERA_LINES_PER_SECOND (1280 * 30)
static int gb_camera_setup_data_connection(struct gb_camera *gcam,
const struct gb_camera_configure_streams_response *resp,
struct gb_camera_csi_params *csi_params)
@ -308,8 +315,8 @@ static int gb_camera_setup_data_connection(struct gb_camera *gcam,
goto error_conn_disable;
/*
* Configure the APB1 CSI transmitter using the lines count reported by
* the camera module, but with hard-coded bus frequency and lanes number.
* Configure the APB1 CSI transmitter with hard-coded bus frequency,
* lanes number and lines per second.
*
* TODO: use the clocking and size informations reported by camera module
* to compute the required CSI bandwidth, and configure the CSI receiver
@ -318,9 +325,9 @@ static int gb_camera_setup_data_connection(struct gb_camera *gcam,
memset(&csi_cfg, 0, sizeof(csi_cfg));
csi_cfg.csi_id = 1;
csi_cfg.flags = 0;
csi_cfg.num_lanes = resp->num_lanes;
csi_cfg.num_lanes = GB_CAMERA_CSI_NUM_DATA_LANES;
csi_cfg.bus_freq = cpu_to_le32(960000000);
csi_cfg.lines_per_second = resp->lines_per_second;
csi_cfg.lines_per_second = GB_CAMERA_LINES_PER_SECOND;
ret = gb_hd_output(gcam->connection->hd, &csi_cfg,
sizeof(csi_cfg),
@ -335,7 +342,6 @@ static int gb_camera_setup_data_connection(struct gb_camera *gcam,
csi_params->num_lanes = csi_cfg.num_lanes;
/* Transmitting two bits per cycle. (DDR clock) */
csi_params->clk_freq = csi_cfg.bus_freq / 2;
csi_params->lines_per_second = csi_cfg.lines_per_second;
}
return 0;