Commit 640924d2 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Greg Kroah-Hartman
Browse files

greybus: camera: Don't configure CSI TX in test only mode 



When the GB_CAMERA_CONFIGURE_STREAMS_TEST_ONLY flag is set by the caller
the configure streams operation should only test the requested settings
without modifying the hardware state. This applies for both the module,
the UniPro links power modes and the AP bridge settings. Return early
when the flag is set to avoid modifying the AP bridge CSI TX settings.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarGjorgji Rosikopulos <grosikopulos@mm-sol.com>
Tested-by: default avatarJacopo Mondi <jacopo.mondi@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 66c36070

drivers/staging/greybus/camera.c

+6 −11
Original line number Diff line number Diff line
@@ -242,26 +242,21 @@ static int gb_camera_configure_streams(struct gb_camera *gcam, 
		}

	}



	if (nstreams && resp->flags & GB_CAMERA_CONFIGURE_STREAMS_ADJUSTED) {

	if ((resp->flags & GB_CAMERA_CONFIGURE_STREAMS_ADJUSTED) ||

	    (*flags & GB_CAMERA_CONFIGURE_STREAMS_TEST_ONLY)) {

		*flags = resp->flags;

		*num_streams = resp->num_streams;

		goto done;

	}



	/* Setup unipro link speed. */

	if (nstreams && !(*flags & GB_CAMERA_CONFIGURE_STREAMS_TEST_ONLY)) {

		ret = gb_camera_set_power_mode(gcam, true);

	ret = gb_camera_set_power_mode(gcam, nstreams != 0);

	if (ret < 0)

		goto done;

	} else if (nstreams == 0) {

		ret = gb_camera_set_power_mode(gcam, false);

		if (ret < 0)

			goto done;

	}



	/* Configure the CSI transmitter. Hardcode the parameters for now. */

	memset(&csi_cfg, 0, sizeof(csi_cfg));



	/* Configure the CSI transmitter. Hardcode the parameters for now. */

	if (nstreams) {

		csi_cfg.csi_id = 1;

		csi_cfg.clock_mode = 0;