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

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

Merge "ARM: dts: msm: enable low voltage VCC support for UFS on Kona"

parents 8c77ff02 77bebf81

Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ Optional properties: 
- vcc-supply            : phandle to VCC supply regulator node

- vcc-voltage-level     : specifies voltage levels for VCC supply.

                          Should be specified in pairs (min, max), units uV.

- vcc-low-voltage-sup   : If specified, treats min voltage from vcc-voltage-level as

                          low voltage level different from max voltage.

- vccq-supply           : phandle to VCCQ supply regulator node

- vccq2-supply          : phandle to VCCQ2 supply regulator node

- vcc-supply-1p8        : For embedded UFS devices, valid VCC range is 1.7-1.95V
@@ -91,6 +93,7 @@ Example: 
		vdd-hba-fixed-regulator;

		vcc-supply = <&xxx_reg1>;

		vcc-supply-1p8;

		vcc-low-voltage-sup;

		vccq-supply = <&xxx_reg2>;

		vccq2-supply = <&xxx_reg3>;

		vcc-max-microamp = 500000;

arch/arm64/boot/dts/qcom/kona-cdp.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ 
	vdd-hba-supply = <&ufs_phy_gdsc>;

	vdd-hba-fixed-regulator;

	vcc-supply = <&pm8150_l17>;

	vcc-voltage-level = <2950000 2960000>;

	vcc-voltage-level = <2504000 2950000>;

	vcc-low-voltage-sup;

	vccq-supply = <&pm8150_l6>;

	vccq2-supply = <&pm8150_s4>;

	vccq-max-microamp = <800000>;

arch/arm64/boot/dts/qcom/kona-mtp.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ 
	vdd-hba-supply = <&ufs_phy_gdsc>;

	vdd-hba-fixed-regulator;

	vcc-supply = <&pm8150_l17>;

	vcc-voltage-level = <2950000 2960000>;

	vcc-voltage-level = <2504000 2950000>;

	vcc-low-voltage-sup;

	vccq-supply = <&pm8150_l6>;

	vccq2-supply = <&pm8150_s4>;

	vcc-max-microamp = <800000>;

arch/arm64/boot/dts/qcom/kona-qrd.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -77,7 +77,8 @@ 
	vdd-hba-supply = <&ufs_phy_gdsc>;

	vdd-hba-fixed-regulator;

	vcc-supply = <&pm8150_l17>;

	vcc-voltage-level = <2950000 2960000>;

	vcc-voltage-level = <2504000 2950000>;

	vcc-low-voltage-sup;

	vccq-supply = <&pm8150_l6>;

	vccq2-supply = <&pm8150_s4>;

	vcc-max-microamp = <800000>;

drivers/scsi/ufs/ufs-qcom.h

+3 −3
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

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

/* Copyright (c) 2013-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
@@ -41,8 +41,8 @@ 


#define UFS_QCOM_LIMIT_NUM_LANES_RX	2

#define UFS_QCOM_LIMIT_NUM_LANES_TX	2

#define UFS_QCOM_LIMIT_HSGEAR_RX	UFS_HS_G3

#define UFS_QCOM_LIMIT_HSGEAR_TX	UFS_HS_G3

#define UFS_QCOM_LIMIT_HSGEAR_RX	UFS_HS_G4

#define UFS_QCOM_LIMIT_HSGEAR_TX	UFS_HS_G4

#define UFS_QCOM_LIMIT_PWMGEAR_RX	UFS_PWM_G4

#define UFS_QCOM_LIMIT_PWMGEAR_TX	UFS_PWM_G4

#define UFS_QCOM_LIMIT_RX_PWR_PWM	SLOW_MODE