diff options
| author | Yaniv Gardi <ygardi@codeaurora.org> | 2014-09-02 15:54:37 +0300 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-22 10:57:21 -0700 |
| commit | 948f549fbf952db66d8cda2088cb2a373bd45018 (patch) | |
| tree | 4c7b333e376652aa9c17baa8a70a8835386be75c | |
| parent | 53c3d8d7366a6fd2190530cfe8ec73643f984afa (diff) | |
ARM: dts: msm: rename attributes to more generic names
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>
| -rw-r--r-- | Documentation/devicetree/bindings/ufs/ufs-msm.txt | 8 | ||||
| -rw-r--r-- | drivers/scsi/ufs/ufs-msm-phy-qmp-20nm.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/ufs/ufs-msm-phy-qmp-28nm.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/ufs/ufs-msm.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/devicetree/bindings/ufs/ufs-msm.txt b/Documentation/devicetree/bindings/ufs/ufs-msm.txt index b5caace9539c..1e652f05ef0d 100644 --- a/Documentation/devicetree/bindings/ufs/ufs-msm.txt +++ b/Documentation/devicetree/bindings/ufs/ufs-msm.txt @@ -7,11 +7,11 @@ 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 +- #phy-cells : This property shall be set to 0 - vdda-phy-supply : phandle to main PHY supply for analog domain - vdda-pll-supply : phandle to PHY PLL and Power-Gen block power supply @@ -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>; diff --git a/drivers/scsi/ufs/ufs-msm-phy-qmp-20nm.c b/drivers/scsi/ufs/ufs-msm-phy-qmp-20nm.c index a78ef079742b..243bd40dc45e 100644 --- a/drivers/scsi/ufs/ufs-msm-phy-qmp-20nm.c +++ b/drivers/scsi/ufs/ufs-msm-phy-qmp-20nm.c @@ -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); diff --git a/drivers/scsi/ufs/ufs-msm-phy-qmp-28nm.c b/drivers/scsi/ufs/ufs-msm-phy-qmp-28nm.c index 36155e85ad8f..e45532f80567 100644 --- a/drivers/scsi/ufs/ufs-msm-phy-qmp-28nm.c +++ b/drivers/scsi/ufs/ufs-msm-phy-qmp-28nm.c @@ -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[] = { - {.compatible = "qcom,ufs-msm-phy-qmp-28nm"}, + {.compatible = "qcom,ufs-phy-qmp-28nm"}, {}, }; MODULE_DEVICE_TABLE(of, ufs_qcom_phy_qmp_28nm_of_match); diff --git a/drivers/scsi/ufs/ufs-msm.c b/drivers/scsi/ufs/ufs-msm.c index 937c39305782..cedfed39454c 100644 --- a/drivers/scsi/ufs/ufs-msm.c +++ b/drivers/scsi/ufs/ufs-msm.c @@ -1051,7 +1051,7 @@ static int ufs_qcom_init(struct ufs_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)) { err = PTR_ERR(host->generic_phy); |