diff options
author | Luka Perkov <luka@openwrt.org> | 2014-02-11 02:07:41 +0000 |
---|---|---|
committer | Luka Perkov <luka@openwrt.org> | 2014-02-11 02:07:41 +0000 |
commit | 3af779eb172b0438f77e8a01a97dd0eb9a146076 (patch) | |
tree | 23838dbde109e79f4c4763dbf78a983aeeefafe1 /target/linux/mvebu/patches-3.10/0104-mtd-nand-pxa3xx-Use-clk_prepare_enable-and-clk_disab.patch | |
parent | 69d323f23119ce6986c2803f34d95869144a00e6 (diff) | |
download | mtk-20170518-3af779eb172b0438f77e8a01a97dd0eb9a146076.zip mtk-20170518-3af779eb172b0438f77e8a01a97dd0eb9a146076.tar.gz mtk-20170518-3af779eb172b0438f77e8a01a97dd0eb9a146076.tar.bz2 |
mvebu: backport mainline patches from kernel 3.12
This is a backport of the patches accepted to the Linux mainline related to
mvebu SoC (Armada XP and Armada 370) between Linux v3.11, and Linux v3.12.
This work mainly covers:
* Ground work for sharing the pxa nand driver(drivers/mtd/nand/pxa3xx_nand.c)
between the PXA family,and the Armada family.
* Further updates to the mvebu MBus.
* Work and ground work for enabling MSI on the Armada family.
* some phy / mdio bus initialization related work.
* Device tree binding documentation update.
Signed-off-by: Seif Mazareeb <seif.mazareeb@gmail.com>
CC: Luka Perkov <luka@openwrt.org>
SVN-Revision: 39565
Diffstat (limited to 'target/linux/mvebu/patches-3.10/0104-mtd-nand-pxa3xx-Use-clk_prepare_enable-and-clk_disab.patch')
-rw-r--r-- | target/linux/mvebu/patches-3.10/0104-mtd-nand-pxa3xx-Use-clk_prepare_enable-and-clk_disab.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/target/linux/mvebu/patches-3.10/0104-mtd-nand-pxa3xx-Use-clk_prepare_enable-and-clk_disab.patch b/target/linux/mvebu/patches-3.10/0104-mtd-nand-pxa3xx-Use-clk_prepare_enable-and-clk_disab.patch new file mode 100644 index 0000000..80d3588 --- /dev/null +++ b/target/linux/mvebu/patches-3.10/0104-mtd-nand-pxa3xx-Use-clk_prepare_enable-and-clk_disab.patch @@ -0,0 +1,45 @@ +From e9274ba8dd0c93f12c0fd5896e11f754aa700baf Mon Sep 17 00:00:00 2001 +From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> +Date: Wed, 17 Apr 2013 13:38:12 -0300 +Subject: [PATCH 104/203] mtd: nand: pxa3xx: Use clk_prepare_enable and + clk_disable_unprepare + +This patch converts the module to use clk_prepare_enable and +clk_disable_unprepare variants as required by common clock framework. + +Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> +Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> +Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> +--- + drivers/mtd/nand/pxa3xx_nand.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/drivers/mtd/nand/pxa3xx_nand.c ++++ b/drivers/mtd/nand/pxa3xx_nand.c +@@ -1072,7 +1072,7 @@ static int alloc_nand_resource(struct pl + dev_err(&pdev->dev, "failed to get nand clock\n"); + return PTR_ERR(info->clk); + } +- clk_enable(info->clk); ++ clk_prepare_enable(info->clk); + + /* + * This is a dirty hack to make this driver work from devicetree +@@ -1142,7 +1142,7 @@ fail_free_buf: + } else + kfree(info->data_buff); + fail_disable_clk: +- clk_disable(info->clk); ++ clk_disable_unprepare(info->clk); + return ret; + } + +@@ -1168,7 +1168,7 @@ static int pxa3xx_nand_remove(struct pla + } else + kfree(info->data_buff); + +- clk_disable(info->clk); ++ clk_disable_unprepare(info->clk); + + for (cs = 0; cs < pdata->num_cs; cs++) + nand_release(info->host[cs]->mtd); |