evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
In this change the "compatible" attribute in dts files of ufsphy node
and the "phy-names" attribute in ufs node are changed to a more generic
name.
This is done for apq8084 and for msm8994 targets.

Change-Id: I46176459e9bc877456489e4728b86eecb2c16261
Signed-off-by: Yaniv Gardi <ygardi@codeaurora.org>
[subhashj@codeaurora.org: resolved merge conflicts & dropped changes to
apq8084.dtsi & msm8994.dtsi]
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
This commit is contained in:
Yaniv Gardi 2014-09-02 15:54:37 +03:00 • committed by David Keitel
parent 53c3d8d736
commit 948f549fbf
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Documentation/devicetree/bindings/ufs/ufs-msm.txt
View file

@ -7,8 +7,8 @@ To bind UFS PHY with UFS host controller, the controller node should
contain a phandle reference to UFS PHY node. contain a phandle reference to UFS PHY node.
Required properties: Required properties:
- compatible : compatible list, contains "qcom,ufs-msm-phy-qmp-28nm" - compatible : compatible list, contains "qcom,ufs-phy-qmp-28nm"
or "qcom,ufs-msm-phy-qmp-20nm" according to the relevant or "qcom,ufs-phy-qmp-20nm" according to the relevant
phy in use phy in use
- reg : <registers mapping> - reg : <registers mapping>
- #phy-cells : This property shall be set to 0 - #phy-cells : This property shall be set to 0
@ -22,7 +22,7 @@ Optional properties:
Example: Example:
ufsphy1: ufsphy@0xfc597000 { ufsphy1: ufsphy@0xfc597000 {
compatible = "qcom,ufs-msm-phy-qmp-28nm"; compatible = "qcom,ufs-phy-qmp-28nm";
reg = <0xfc597000 0x800>; reg = <0xfc597000 0x800>;
#phy-cells = <0>; #phy-cells = <0>;
vdda-phy-supply = <&pma8084_l4>; vdda-phy-supply = <&pma8084_l4>;

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

@ -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[] = { 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); MODULE_DEVICE_TABLE(of, ufs_qcom_phy_qmp_20nm_of_match);

2
drivers/scsi/ufs/ufs-msm-phy-qmp-28nm.c
View file

@ -312,7 +312,7 @@ static int ufs_qcom_phy_qmp_28nm_remove(struct platform_device *pdev)
} }
static const struct of_device_id ufs_qcom_phy_qmp_28nm_of_match[] = { static const struct of_device_id ufs_qcom_phy_qmp_28nm_of_match[] = {
{.compatible = "qcom,ufs-msm-phy-qmp-28nm"}, {.compatible = "qcom,ufs-phy-qmp-28nm"},
{}, {},
}; };
MODULE_DEVICE_TABLE(of, ufs_qcom_phy_qmp_28nm_of_match); MODULE_DEVICE_TABLE(of, ufs_qcom_phy_qmp_28nm_of_match);

2
drivers/scsi/ufs/ufs-msm.c
View file

@ -1051,7 +1051,7 @@ static int ufs_qcom_init(struct ufs_hba *hba)
} }
host->hba = hba; host->hba = hba;
host->generic_phy = devm_phy_get(dev, "ufs_msm_phy"); host->generic_phy = devm_phy_get(dev, "ufsphy");
if (IS_ERR(host->generic_phy)) { if (IS_ERR(host->generic_phy)) {
err = PTR_ERR(host->generic_phy); err = PTR_ERR(host->generic_phy);