~hc/RK356X_SDK_RELEASE.git

..	..	@@ -1269,9 +1269,9 @@
1269	1269	{ 500, 0x102}, { 990, 0x002}, { 2500, 0x001},
1270	1270	};
1271	1271
1272		-static void samsung_mipi_dcphy_bias_block_enable(struct samsung_mipi_dcphy *samsung)
	1272	+static void samsung_mipi_dcphy_bias_block_enable(struct samsung_mipi_dcphy *samsung,
	1273	+ struct csi2_dphy *csi_dphy)
1273	1274	{
1274		- struct csi2_dphy *csi_dphy = samsung->dphy_dev[0];
1275	1275	u32 bias_con2 = 0x3223;
1276	1276
1277	1277	if (csi_dphy &&
..	..	@@ -1466,9 +1466,9 @@
1466	1466
1467	1467	/*
1468	1468	* Divide-by-2 Clock from Serial Clock. Use this when data rate is under
1469		- * 1500Mbps, otherwise divide-by-16 Clock from Serial Clock
	1469	+ * 500Msps, otherwise divide-by-16 Clock from Serial Clock
1470	1470	*/
1471		- if (lane_hs_rate < 1500)
	1471	+ if (lane_hs_rate < 500)
1472	1472	val = HSTX_CLK_SEL;
1473	1473
1474	1474	val \|= T_LPX(timing->lpx);
..	..	@@ -1701,7 +1701,7 @@
1701	1701	{
1702	1702	reset_control_assert(samsung->m_phy_rst);
1703	1703
1704		- samsung_mipi_dcphy_bias_block_enable(samsung);
	1704	+ samsung_mipi_dcphy_bias_block_enable(samsung, NULL);
1705	1705	samsung_mipi_dcphy_pll_configure(samsung);
1706	1706	samsung_mipi_dphy_clk_lane_timing_init(samsung);
1707	1707	samsung_mipi_dphy_data_lane_timing_init(samsung);
..	..	@@ -1721,7 +1721,7 @@
1721	1721	regmap_write(samsung->grf_regmap, MIPI_DCPHY_GRF_CON0, M_CPHY_MODE);
1722	1722	reset_control_assert(samsung->m_phy_rst);
1723	1723
1724		- samsung_mipi_dcphy_bias_block_enable(samsung);
	1724	+ samsung_mipi_dcphy_bias_block_enable(samsung, NULL);
1725	1725	samsung_mipi_dcphy_hs_vreg_amp_configure(samsung);
1726	1726	samsung_mipi_dcphy_pll_configure(samsung);
1727	1727	samsung_mipi_cphy_timing_init(samsung);
..	..	@@ -2207,7 +2207,7 @@
2207	2207	if (samsung->s_phy_rst)
2208	2208	reset_control_assert(samsung->s_phy_rst);
2209	2209
2210		- samsung_mipi_dcphy_bias_block_enable(samsung);
	2210	+ samsung_mipi_dcphy_bias_block_enable(samsung, dphy);
2211	2211	ret = samsung_dcphy_rx_config_common(dphy, sensor);
2212	2212	if (ret)
2213	2213	goto out_streamon;