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/arch/arm/mach-msm/clock-7x30.c b/arch/arm/mach-msm/clock-7x30.c
index 63f51da..21eb5c2 100644
--- a/arch/arm/mach-msm/clock-7x30.c
+++ b/arch/arm/mach-msm/clock-7x30.c
@@ -2846,7 +2846,7 @@
OWN(GLBL, 8, "core_clk", adm_clk, "msm_dmov"),
{ CLK_LOOKUP("iface_clk", adm_p_clk.c, "msm_dmov"),
O(GLBL), BIT(13), &dummy_clk },
- OWN(GLBL, 8, "ce_clk", ce_clk, NULL),
+ OWN(GLBL, 8, "core_clk", ce_clk, "qce.0"),
OWN(GLBL, 13, "rotator_clk", axi_rotator_clk, NULL),
OWN(GLBL, 13, "rotator_imem_clk", rotator_imem_clk, NULL),
OWN(GLBL, 13, "rotator_pclk", rotator_p_clk, NULL),
diff --git a/arch/arm/mach-msm/clock-8960.c b/arch/arm/mach-msm/clock-8960.c
index d93df61..5d1f67e 100644
--- a/arch/arm/mach-msm/clock-8960.c
+++ b/arch/arm/mach-msm/clock-8960.c
@@ -4547,8 +4547,8 @@
CLK_LOOKUP("usb_fs_clk", usb_fs2_xcvr_clk.c, NULL),
CLK_LOOKUP("usb_fs_sys_clk", usb_fs2_sys_clk.c, NULL),
CLK_LOOKUP("usb_fs_src_clk", usb_fs2_src_clk.c, NULL),
- CLK_LOOKUP("ce_pclk", ce1_p_clk.c, NULL),
- CLK_LOOKUP("ce_clk", ce1_core_clk.c, NULL),
+ CLK_LOOKUP("iface_clk", ce1_p_clk.c, "qce.0"),
+ CLK_LOOKUP("core_clk", ce1_core_clk.c, "qce.0"),
CLK_LOOKUP("dma_bam_pclk", dma_bam_p_clk.c, NULL),
CLK_LOOKUP("iface_clk", gsbi1_p_clk.c, "spi_qsd.0"),
CLK_LOOKUP("iface_clk", gsbi2_p_clk.c, NULL),
diff --git a/arch/arm/mach-msm/clock-8x60.c b/arch/arm/mach-msm/clock-8x60.c
index 9ec9bd2..1fb8988 100644
--- a/arch/arm/mach-msm/clock-8x60.c
+++ b/arch/arm/mach-msm/clock-8x60.c
@@ -3536,7 +3536,7 @@
CLK_LOOKUP("usb_fs_clk", usb_fs2_xcvr_clk.c, NULL),
CLK_LOOKUP("usb_fs_sys_clk", usb_fs2_sys_clk.c, NULL),
CLK_LOOKUP("usb_fs_src_clk", usb_fs2_src_clk.c, NULL),
- CLK_LOOKUP("ce_clk", ce2_p_clk.c, NULL),
+ CLK_LOOKUP("core_clk", ce2_p_clk.c, "qce.0"),
CLK_LOOKUP("iface_clk", gsbi1_p_clk.c, "spi_qsd.0"),
CLK_LOOKUP("iface_clk", gsbi2_p_clk.c, NULL),
CLK_LOOKUP("iface_clk", gsbi3_p_clk.c, "msm_serial_hsl.2"),
diff --git a/arch/arm/mach-msm/clock-fsm9xxx.c b/arch/arm/mach-msm/clock-fsm9xxx.c
index 4b17635..c5371f4 100644
--- a/arch/arm/mach-msm/clock-fsm9xxx.c
+++ b/arch/arm/mach-msm/clock-fsm9xxx.c
@@ -24,7 +24,7 @@
static struct clk_lookup msm_clocks_fsm9xxx[] = {
CLK_DUMMY("core_clk", ADM0_CLK, "msm_dmov", OFF),
CLK_DUMMY("core_clk", UART1_CLK, "msm_serial.0", OFF),
- CLK_DUMMY("ce_clk", CE_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", CE_CLK, "qce.0", OFF),
};
struct clock_init_data fsm9xxx_clock_init_data __initdata = {
diff --git a/arch/arm/mach-msm/clock-pcom-lookup.c b/arch/arm/mach-msm/clock-pcom-lookup.c
index c6c9162..06bb542 100644
--- a/arch/arm/mach-msm/clock-pcom-lookup.c
+++ b/arch/arm/mach-msm/clock-pcom-lookup.c
@@ -327,7 +327,7 @@
static struct clk_lookup msm_clocks_8x50[] = {
CLK_LOOKUP("core_clk", adm_clk.c, "msm_dmov"),
- CLK_LOOKUP("ce_clk", ce_clk.c, NULL),
+ CLK_LOOKUP("core_clk", ce_clk.c, "qce.0"),
CLK_LOOKUP("ebi1_clk", ebi1_clk.c, NULL),
CLK_LOOKUP("ebi2_clk", ebi2_clk.c, NULL),
CLK_LOOKUP("ecodec_clk", ecodec_clk.c, NULL),
diff --git a/arch/arm/mach-msm/devices-8064.c b/arch/arm/mach-msm/devices-8064.c
index 9efc73f..cb1ec23 100644
--- a/arch/arm/mach-msm/devices-8064.c
+++ b/arch/arm/mach-msm/devices-8064.c
@@ -526,10 +526,10 @@
CLK_DUMMY("usb_fs_src_clk", USB_FS1_SRC_CLK, NULL, OFF),
CLK_DUMMY("usb_fs_clk", USB_FS1_XCVR_CLK, NULL, OFF),
CLK_DUMMY("usb_fs_sys_clk", USB_FS1_SYS_CLK, NULL, OFF),
- CLK_DUMMY("ce_pclk", CE2_CLK, NULL, OFF),
- CLK_DUMMY("ce_clk", CE1_CORE_CLK, NULL, OFF),
- CLK_DUMMY("ce_clk", CE3_CORE_CLK, NULL, OFF),
- CLK_DUMMY("ce_pclk", CE3_P_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", CE2_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", CE1_CORE_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", CE3_CORE_CLK, NULL, OFF),
+ CLK_DUMMY("iface_clk", CE3_P_CLK, NULL, OFF),
CLK_DUMMY("pcie_pclk", PCIE_P_CLK, NULL, OFF),
CLK_DUMMY("pcie_alt_ref_clk", PCIE_ALT_REF_CLK, NULL, OFF),
CLK_DUMMY("sata_rxoob_clk", SATA_RXOOB_CLK, NULL, OFF),
diff --git a/arch/arm/mach-msm/devices-8960.c b/arch/arm/mach-msm/devices-8960.c
index 9ede729..f20e508 100644
--- a/arch/arm/mach-msm/devices-8960.c
+++ b/arch/arm/mach-msm/devices-8960.c
@@ -1479,8 +1479,8 @@
CLK_DUMMY("usb_fs_src_clk", USB_FS2_SRC_CLK, NULL, OFF),
CLK_DUMMY("usb_fs_clk", USB_FS2_XCVR_CLK, NULL, OFF),
CLK_DUMMY("usb_fs_sys_clk", USB_FS2_SYS_CLK, NULL, OFF),
- CLK_DUMMY("ce_pclk", CE2_CLK, NULL, OFF),
- CLK_DUMMY("ce_clk", CE1_CORE_CLK, NULL, OFF),
+ CLK_DUMMY("iface_clk", CE2_CLK, "qce.0", OFF),
+ CLK_DUMMY("core_clk", CE1_CORE_CLK, "qce.0", OFF),
CLK_DUMMY("iface_clk", GSBI1_P_CLK, "spi_qsd.0", OFF),
CLK_DUMMY("iface_clk", GSBI2_P_CLK,
"msm_serial_hsl.0", OFF),
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);