diff --git a/drivers/staging/greybus/camera.c b/drivers/staging/greybus/camera.c
index bb8bc175dc0aa0916118f1be3a14251357e482aa..3f205cbcb21b777ea35ac7ca3fb0cdf67f295748 100644
--- a/drivers/staging/greybus/camera.c
+++ b/drivers/staging/greybus/camera.c
@@ -162,6 +162,7 @@ struct ap_csi_config_request {
 	__u8 num_lanes;
 	__u8 padding;
 	__le32 bus_freq;
+	__le32 lines_per_second;
 } __packed;
 
 static int gb_camera_configure_streams(struct gb_camera *gcam,
@@ -254,7 +255,14 @@ static int gb_camera_configure_streams(struct gb_camera *gcam,
 	if (ret < 0)
 		goto done;
 
-	/* Configure the CSI transmitter. Hardcode the parameters for now. */
+	/*
+	 * Configure the APB1 CSI transmitter using the lines count reported by
+	 * the  camera module, but with hard-coded bus frequency and lanes number.
+	 *
+	 * TODO: use the clocking and size informations reported by camera module
+	 * to compute the required CSI bandwidth, and configure the CSI receiver
+	 * on AP side, and the CSI transmitter on APB1 side accordingly.
+	 */
 	memset(&csi_cfg, 0, sizeof(csi_cfg));
 
 	if (nstreams) {
@@ -262,6 +270,7 @@ static int gb_camera_configure_streams(struct gb_camera *gcam,
 		csi_cfg.clock_mode = 0;
 		csi_cfg.num_lanes = 4;
 		csi_cfg.bus_freq = cpu_to_le32(960000000);
+		csi_cfg.lines_per_second = resp->lines_per_second;
 		ret = gb_hd_output(gcam->connection->hd, &csi_cfg,
 				   sizeof(csi_cfg),
 				   GB_APB_REQUEST_CSI_TX_CONTROL, false);
diff --git a/drivers/staging/greybus/greybus_protocols.h b/drivers/staging/greybus/greybus_protocols.h
index 6b192924a566adde43a993ac4f4dfc3a43fcc09f..1a90dc2d9c3a2d48b39cacd65412872b688d85dd 100644
--- a/drivers/staging/greybus/greybus_protocols.h
+++ b/drivers/staging/greybus/greybus_protocols.h
@@ -1276,7 +1276,10 @@ struct gb_camera_configure_streams_response {
 	__u8 num_streams;
 	__u8 flags;
 #define GB_CAMERA_CONFIGURE_STREAMS_ADJUSTED	0x01
-	__le16 padding;
+	__u8 num_lanes;
+	__u8 padding;
+	__le32 bus_freq;
+	__le32 lines_per_second;
 	struct gb_camera_stream_config_response config[0];
 } __packed;