Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8ed334e authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drivers: phy: ufs: Use correct UFS PHY version suffix for sm6150"

parents 7450fe96 d9ae5404

arch/arm64/boot/dts/qcom/sm6150.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -1646,10 +1646,10 @@ 
			<&clock_gcc GCC_UFS_PHY_TX_SYMBOL_0_CLK>,

			<&clock_gcc GCC_UFS_PHY_RX_SYMBOL_0_CLK>;

		freq-table-hz =

			<37500000 300000000>,

			<50000000 240000000>,

			<0 0>,

			<0 0>,

			<37500000 300000000>,

			<37500000 150000000>,

			<75000000 300000000>,

			<0 0>,

			<0 0>,

drivers/phy/qualcomm/phy-qcom-ufs-qmp-v3-660.c

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.

 * Copyright (c) 2013-2018, 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
@@ -30,7 +30,7 @@ int ufs_qcom_phy_qmp_v3_660_phy_calibrate(struct ufs_qcom_phy *ufs_qcom_phy, 
	tbl_size_B = ARRAY_SIZE(phy_cal_table_rate_B);

	tbl_B = phy_cal_table_rate_B;



	if ((major == 0x3) && (minor == 0x001) && (step == 0x001)) {

	if ((major == 0x3) && (minor == 0x001) && (step >= 0x001)) {

		tbl_A = phy_cal_table_rate_A_3_1_1;

		tbl_size_A = ARRAY_SIZE(phy_cal_table_rate_A_3_1_1);

	} else {