target/linux/mvebu/patches-3.10/0104-mtd-nand-pxa3xx-Use-clk_prepare_enable-and-clk_disab.patch

   1 From e9274ba8dd0c93f12c0fd5896e11f754aa700baf Mon Sep 17 00:00:00 2001
   2 From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
   3 Date: Wed, 17 Apr 2013 13:38:12 -0300
   4 Subject: [PATCH 104/203] mtd: nand: pxa3xx: Use clk_prepare_enable and
   5  clk_disable_unprepare
   6
   7 This patch converts the module to use clk_prepare_enable and
   8 clk_disable_unprepare variants as required by common clock framework.
   9
  10 Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
  11 Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
  12 Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
  13 ---
  14  drivers/mtd/nand/pxa3xx_nand.c | 6 +++---
  15  1 file changed, 3 insertions(+), 3 deletions(-)
  16
  17 --- a/drivers/mtd/nand/pxa3xx_nand.c
  18 +++ b/drivers/mtd/nand/pxa3xx_nand.c
  19 @@ -1072,7 +1072,7 @@ static int alloc_nand_resource(struct pl
  20                 dev_err(&pdev->dev, "failed to get nand clock\n");
  21                 return PTR_ERR(info->clk);
  22         }
  23 -       clk_enable(info->clk);
  24 +       clk_prepare_enable(info->clk);
  25
  26         /*
  27          * This is a dirty hack to make this driver work from devicetree
  28 @@ -1142,7 +1142,7 @@ fail_free_buf:
  29         } else
  30                 kfree(info->data_buff);
  31  fail_disable_clk:
  32 -       clk_disable(info->clk);
  33 +       clk_disable_unprepare(info->clk);
  34         return ret;
  35  }
  36
  37 @@ -1168,7 +1168,7 @@ static int pxa3xx_nand_remove(struct pla
  38         } else
  39                 kfree(info->data_buff);
  40
  41 -       clk_disable(info->clk);
  42 +       clk_disable_unprepare(info->clk);
  43
  44         for (cs = 0; cs < pdata->num_cs; cs++)
  45                 nand_release(info->host[cs]->mtd);