Merge "msm: camera: Change data type of data rate" (c456d422) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.c

+5 −3

Original line number	Diff line number	Diff line
		/* Copyright (c) 2011-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2011-2019, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -622,8 +622,10 @@ static int msm_csiphy_3phase_lane_config(
		uint8_t i = 0;
		uint16_t lane_mask = 0, lane_enable = 0, temp;
		void __iomem *csiphybase;
		uint64_t two_gbps = 0;

		csiphybase = csiphy_dev->base;
		two_gbps = 2 * (uint64_t)csiphy_params->lane_cnt * GBPS;
		lane_mask = csiphy_params->lane_mask & 0x7;
		while (lane_mask != 0) {
		temp = (i << 1)+1;
		@@ -771,8 +773,8 @@ static int msm_csiphy_3phase_lane_config(
		0x200*i);
		}
		if ((csiphy_dev->hw_version == CSIPHY_VERSION_V35) &&
		((csiphy_params->data_rate /
		csiphy_params->lane_cnt) > 2 * GBPS)) {
		(csiphy_params->data_rate > two_gbps)) {

		msm_camera_io_w(0x40,
		csiphybase +
		csiphy_dev->ctrl_reg->csiphy_3ph_reg