msm: 8x60: fix the clock request for dsps
Delay the request until the device is created, and change the name
in clock table to match the device's
Signed-off-by: Wentao Xu <wentaox@codeaurora.org>
diff --git a/arch/arm/mach-msm/clock-8x60.c b/arch/arm/mach-msm/clock-8x60.c
index 8f5a690..185d70e 100644
--- a/arch/arm/mach-msm/clock-8x60.c
+++ b/arch/arm/mach-msm/clock-8x60.c
@@ -3565,10 +3565,10 @@
CLK_LOOKUP("core_clk", gsbi9_qup_clk.c, "qup_i2c.2"),
CLK_LOOKUP("core_clk", gsbi10_qup_clk.c, "spi_qsd.1"),
CLK_LOOKUP("core_clk", gsbi11_qup_clk.c, NULL),
- CLK_LOOKUP("gsbi_qup_clk", gsbi12_qup_clk.c, "msm_dsps.0"),
+ CLK_LOOKUP("gsbi_qup_clk", gsbi12_qup_clk.c, "msm_dsps"),
CLK_LOOKUP("core_clk", gsbi12_qup_clk.c, "qup_i2c.5"),
CLK_LOOKUP("pdm_clk", pdm_clk.c, NULL),
- CLK_LOOKUP("mem_clk", pmem_clk.c, "msm_dsps.0"),
+ CLK_LOOKUP("mem_clk", pmem_clk.c, "msm_dsps"),
CLK_LOOKUP("core_clk", prng_clk.c, "msm_rng.0"),
CLK_LOOKUP("core_clk", sdc1_clk.c, "msm_sdcc.1"),
CLK_LOOKUP("core_clk", sdc2_clk.c, "msm_sdcc.2"),
diff --git a/arch/arm/mach-msm/msm_dsps.c b/arch/arm/mach-msm/msm_dsps.c
index ca99b1a..b622e74 100644
--- a/arch/arm/mach-msm/msm_dsps.c
+++ b/arch/arm/mach-msm/msm_dsps.c
@@ -763,12 +763,6 @@
}
drv->pdata = pdev->dev.platform_data;
- ret = dsps_alloc_resources(pdev);
- if (ret) {
- pr_err("%s: failed to allocate dsps resources.\n", __func__);
- goto res_err;
- }
-
drv->dev_class = class_create(THIS_MODULE, DRV_NAME);
if (drv->dev_class == NULL) {
pr_err("%s: class_create fail.\n", __func__);
@@ -803,6 +797,12 @@
goto cdev_add_err;
}
+ ret = dsps_alloc_resources(pdev);
+ if (ret) {
+ pr_err("%s: failed to allocate dsps resources.\n", __func__);
+ goto cdev_add_err;
+ }
+
ret =
smsm_state_cb_register(SMSM_DSPS_STATE, SMSM_RESET,
dsps_smsm_state_cb, 0);