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>

diff --git a/Documentation/devicetree/bindings/ufs/ufs-msm.txt b/Documentation/devicetree/bindings/ufs/ufs-msm.txt
index b5caace..1e652f0 100644 (file)
--- 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 a78ef07..243bd40 100644 (file)
--- 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 36155e8..e45532f 100644 (file)
--- 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 937c393..cedfed3 100644 (file)
--- 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);