From: Sascha Hauer <s.hauer@pengutronix.de>
To: Dmitry Lavnikevich <d.lavnikevich@sam-solutions.com>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] mtd: nand-mxs: Gate ENFC_CLK_ROOT clock off before changing nand clock rate
Date: Mon, 17 Nov 2014 08:39:01 +0100 [thread overview]
Message-ID: <20141117073901.GA30369@pengutronix.de> (raw)
In-Reply-To: <1416175114-3132-1-git-send-email-d.lavnikevich@sam-solutions.com>
On Mon, Nov 17, 2014 at 12:58:34AM +0300, Dmitry Lavnikevich wrote:
> This fixes NAND initialization issue which appears occasionally on
> some i.MX6 SoCs (particulary was observed on phyCARD-i.MX6 with
> i.MX6Solo).
>
> Signed-off-by: Dmitry Lavnikevich <d.lavnikevich@sam-solutions.com>
Applied, thanks
Sascha
> ---
> arch/arm/mach-imx/include/mach/clock-imx6.h | 4 ++++
> drivers/mtd/nand/nand_mxs.c | 12 ++++++++++++
> 2 files changed, 16 insertions(+)
>
> diff --git a/arch/arm/mach-imx/include/mach/clock-imx6.h b/arch/arm/mach-imx/include/mach/clock-imx6.h
> index 8e5e9d9..ffa889d 100644
> --- a/arch/arm/mach-imx/include/mach/clock-imx6.h
> +++ b/arch/arm/mach-imx/include/mach/clock-imx6.h
> @@ -344,4 +344,8 @@
> #define MXC_CCM_CGPR_MMDC_EXT_CLK_DIS (1 << 2)
> #define MXC_CCM_CGPR_PMIC_DELAY_SCALER (1)
>
> +/* Define the bits in register CCGR2 */
> +#define MXC_CCM_CCGR2_IOMUX_IPT_CLK_IO_OFFSET 14
> +#define MXC_CCM_CCGR2_IOMUX_IPT_CLK_IO_MASK (3 << 14)
> +
> #endif /* __ARCH_ARM_MACH_MX6_CRM_REGS_H__ */
> diff --git a/drivers/mtd/nand/nand_mxs.c b/drivers/mtd/nand/nand_mxs.c
> index d5428bc..9ebddb3 100644
> --- a/drivers/mtd/nand/nand_mxs.c
> +++ b/drivers/mtd/nand/nand_mxs.c
> @@ -34,6 +34,8 @@
> #include <stmp-device.h>
> #include <asm/mmu.h>
> #include <mach/generic.h>
> +#include <mach/clock-imx6.h>
> +#include <mach/imx6-regs.h>
>
> #define MX28_BLOCK_SFTRST (1 << 31)
> #define MX28_BLOCK_CLKGATE (1 << 30)
> @@ -1254,6 +1256,7 @@ static int mxs_nand_probe(struct device_d *dev)
> struct nand_chip *nand;
> struct mtd_info *mtd;
> enum gpmi_type type;
> + u32 val;
> int err;
>
> err = dev_get_drvdata(dev, (unsigned long *)&type);
> @@ -1277,7 +1280,16 @@ static int mxs_nand_probe(struct device_d *dev)
> return PTR_ERR(nand_info->clk);
>
> if (mxs_nand_is_imx6(nand_info)) {
> + val = readl(MXC_CCM_CCGR2);
> + val &= ~MXC_CCM_CCGR2_IOMUX_IPT_CLK_IO_MASK;
> + writel(val, MXC_CCM_CCGR2);
> +
> clk_set_rate(nand_info->clk, 96000000);
> +
> + val = readl(MXC_CCM_CCGR2);
> + val |= MXC_CCM_CCGR2_IOMUX_IPT_CLK_IO_MASK;
> + writel(val, MXC_CCM_CCGR2);
> +
> clk_enable(nand_info->clk);
> nand_info->dma_channel_base = 0;
> } else {
> --
> 2.1.3
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2014-11-17 7:39 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-16 21:58 Dmitry Lavnikevich
2014-11-17 7:39 ` Sascha Hauer [this message]
2014-11-19 6:44 ` Sascha Hauer
2014-11-19 14:34 ` Dmitry Lavnikevich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141117073901.GA30369@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=d.lavnikevich@sam-solutions.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox