target/linux/ipq806x/patches/0181-mtd-nand-qcom-Align-clk-and-reset-names.patch

   1 From ae0e9ee3bcfafc5bd5932b544e0a5c107948fc97 Mon Sep 17 00:00:00 2001
   2 From: Andy Gross <agross@codeaurora.org>
   3 Date: Mon, 30 Jun 2014 21:17:26 -0500
   4 Subject: [PATCH 181/182] mtd: nand: qcom: Align clk and reset names
   5
   6 This patch aligns the clk and reset names to the same ones that the dmaengine
   7 driver uses.
   8
   9 Signed-off-by: Andy Gross <agross@codeaurora.org>
  10 ---
  11  drivers/mtd/nand/qcom_adm_dma.c |    6 +++---
  12  1 file changed, 3 insertions(+), 3 deletions(-)
  13
  14 diff --git a/drivers/mtd/nand/qcom_adm_dma.c b/drivers/mtd/nand/qcom_adm_dma.c
  15 index 46d8473..542f901 100644
  16 --- a/drivers/mtd/nand/qcom_adm_dma.c
  17 +++ b/drivers/mtd/nand/qcom_adm_dma.c
  18 @@ -568,14 +568,14 @@ static int msm_dmov_init_clocks(struct platform_device *pdev)
  19         int adm = (pdev->id >= 0) ? pdev->id : 0;
  20         int ret;
  21
  22 -       dmov_conf[adm].clk = devm_clk_get(&pdev->dev, "core_clk");
  23 +       dmov_conf[adm].clk = devm_clk_get(&pdev->dev, "core");
  24         if (IS_ERR(dmov_conf[adm].clk)) {
  25                 printk(KERN_ERR "%s: Error getting adm_clk\n", __func__);
  26                 dmov_conf[adm].clk = NULL;
  27                 return -ENOENT;
  28         }
  29
  30 -       dmov_conf[adm].pclk = devm_clk_get(&pdev->dev, "iface_clk");
  31 +       dmov_conf[adm].pclk = devm_clk_get(&pdev->dev, "iface");
  32         if (IS_ERR(dmov_conf[adm].pclk)) {
  33                 dmov_conf[adm].pclk = NULL;
  34                 /* pclk not present on all SoCs, don't bail on failure */
  35 @@ -690,7 +690,7 @@ static int msm_dmov_probe(struct platform_device *pdev)
  36         }
  37
  38         /* get resets */
  39 -       dmov_conf[adm].adm_reset = devm_reset_control_get(&pdev->dev, "adm");
  40 +       dmov_conf[adm].adm_reset = devm_reset_control_get(&pdev->dev, "clk");
  41         if (IS_ERR(dmov_conf[adm].adm_reset)) {
  42                 dev_err(&pdev->dev, "failed to get adm reset\n");
  43                 ret = PTR_ERR(dmov_conf[adm].adm_reset);
  44 --
  45 1.7.10.4
  46