crypto: Register device with clock driver and rename clocks
Rename the clocks per the new naming convention under which
similarly named clocks are distinguished between using their
associated device's name and ID.
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
diff --git a/drivers/crypto/msm/qce.c b/drivers/crypto/msm/qce.c
index 009175d..641b7fd 100644
--- a/drivers/crypto/msm/qce.c
+++ b/drivers/crypto/msm/qce.c
@@ -2315,7 +2315,7 @@
return NULL;
}
pce_dev->pdev = &pdev->dev;
- ce_clk = clk_get(pce_dev->pdev, "ce_clk");
+ ce_clk = clk_get(pce_dev->pdev, "core_clk");
if (IS_ERR(ce_clk)) {
kfree(pce_dev);
*rc = PTR_ERR(ce_clk);
diff --git a/drivers/crypto/msm/qce40.c b/drivers/crypto/msm/qce40.c
index 154410b..5226832 100644
--- a/drivers/crypto/msm/qce40.c
+++ b/drivers/crypto/msm/qce40.c
@@ -1929,14 +1929,14 @@
}
/* Get CE core clk */
- ce_core_clk = clk_get(pce_dev->pdev, "ce_clk");
+ ce_core_clk = clk_get(pce_dev->pdev, "core_clk");
if (IS_ERR(ce_core_clk)) {
*rc = PTR_ERR(ce_core_clk);
goto err;
}
pce_dev->ce_core_clk = ce_core_clk;
/* Get CE clk */
- ce_clk = clk_get(pce_dev->pdev, "ce_pclk");
+ ce_clk = clk_get(pce_dev->pdev, "iface_clk");
if (IS_ERR(ce_clk)) {
*rc = PTR_ERR(ce_clk);
clk_put(pce_dev->ce_core_clk);