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

Commit 55610550 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: rename attributes to more generic names"

parents 6754c396 4fe56e46

Documentation/devicetree/bindings/ufs/ufs-msm.txt

+4 −4
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ To bind UFS PHY with UFS host controller, the controller node should 
contain a phandle reference to UFS PHY node.



Required properties:

- compatible        : compatible list, contains "qcom,ufs-msm-phy-qmp-28nm"

                      or "qcom,ufs-msm-phy-qmp-20nm" according to the relevant

- compatible        : compatible list, contains "qcom,ufs-phy-qmp-28nm"

                      or "qcom,ufs-phy-qmp-20nm" according to the relevant

                      phy in use

- reg               : <registers mapping>

- #phy-cells        : This property shall be set to 0
@@ -22,7 +22,7 @@ Optional properties: 
Example:



	ufsphy1: ufsphy@0xfc597000 {

		compatible = "qcom,ufs-msm-phy-qmp-28nm";

		compatible = "qcom,ufs-phy-qmp-28nm";

		reg = <0xfc597000 0x800>;

		#phy-cells = <0>;

		vdda-phy-supply = <&pma8084_l4>;

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

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ Required properties: 


Optional properties:

- phys                  : phandle to UFS PHY node

- phy-names		: the string "ufs_msm_phy" when is found in a node, along

- phy-names             : the string "ufsphy" when is found in a node, along

                          with "phys" attribute, provides phandle to UFS PHY node

- vdd-hba-supply        : phandle to UFS host controller supply regulator node

- vcc-supply            : phandle to VCC supply regulator node

arch/arm/boot/dts/qcom/apq8084.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -4659,7 +4659,7 @@ 
	};



	ufsphy1: ufsphy@0xfc597000 {

		compatible = "qcom,ufs-msm-phy-qmp-28nm";

		compatible = "qcom,ufs-phy-qmp-28nm";

		reg = <0xfc597000 0x87c>;

		#phy-cells = <0>;

		vdda-phy-supply = <&pma8084_l3>;
@@ -4675,7 +4675,7 @@ 
		reg = <0xfc594000 0x800>;

		interrupts = <0 28 0>;

		phys = <&ufsphy1>;

		phy-names = "ufs_msm_phy";

		phy-names = "ufsphy";

		vcc-supply = <&pma8084_l19>;

		vccq-supply = <&pma8084_l4>;

		vccq2-supply = <&pma8084_s4>;

arch/arm/boot/dts/qcom/msm8994.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -1018,7 +1018,7 @@ 
	};



	ufsphy1: ufsphy@fc597000 {

			compatible = "qcom,ufs-msm-phy-qmp-20nm";

			compatible = "qcom,ufs-phy-qmp-20nm";

			reg = <0xfc597000 0xda8>;

			#phy-cells = <0>;

			vdda-phy-supply = <&pm8994_l28>;
@@ -1043,7 +1043,7 @@ 
			reg = <0xfc594000 0x2500>;

			interrupts = <0 265 0>;

			phys = <&ufsphy1>;

			phy-names = "ufs_msm_phy";

			phy-names = "ufsphy";

			vdd-hba-supply = <&gdsc_ufs>;

			vdd-hba-fixed-regulator;

			vcc-supply = <&pm8994_l20>;

drivers/scsi/ufs/ufs-msm-phy-qmp-20nm.c

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ static int ufs_qcom_phy_qmp_20nm_remove(struct platform_device *pdev) 
}



static const struct of_device_id ufs_qcom_phy_qmp_20nm_of_match[] = {

	{.compatible = "qcom,ufs-msm-phy-qmp-20nm"},

	{.compatible = "qcom,ufs-phy-qmp-20nm"},

	{},

};

MODULE_DEVICE_TABLE(of, ufs_qcom_phy_qmp_20nm_of_match);