From: Huang Shijie <b32955@freescale.com>
To: Huang Shijie <b32955@freescale.com>
Cc: artem.bityutskiy@intel.com, linux-mtd@lists.infradead.org,
w.sang@pengutronix.de, linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v2] mtd/gpmi : add gpmi support for mx6q
Date: Thu, 16 Feb 2012 13:44:33 +0800 [thread overview]
Message-ID: <4F3C97C1.6000508@freescale.com> (raw)
In-Reply-To: <1329186979-25382-1-git-send-email-b32955@freescale.com>
Hi Artem:
Please ignore this patch. I will send out the new version when the
mxs-dma patch
is merged.
thanks .
Huang Shijie
> add gpmi support to mx6q.
>
> Signed-off-by: Huang Shijie <b32955@freescale.com>
> ---
> v1 --> v2:
> create this patch based on l2-mtd.git tree.
>
>
> drivers/mtd/nand/gpmi-nand/bch-regs.h | 42 ++++++++++++++++++++++++-------
> drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 14 ++++++----
> drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 3 ++
> drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 2 +
> 4 files changed, 45 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/mtd/nand/gpmi-nand/bch-regs.h b/drivers/mtd/nand/gpmi-nand/bch-regs.h
> index 4effb8c..a092451 100644
> --- a/drivers/mtd/nand/gpmi-nand/bch-regs.h
> +++ b/drivers/mtd/nand/gpmi-nand/bch-regs.h
> @@ -51,15 +51,26 @@
>
> #define BP_BCH_FLASH0LAYOUT0_ECC0 12
> #define BM_BCH_FLASH0LAYOUT0_ECC0 (0xf << BP_BCH_FLASH0LAYOUT0_ECC0)
> -#define BF_BCH_FLASH0LAYOUT0_ECC0(v) \
> - (((v) << BP_BCH_FLASH0LAYOUT0_ECC0) & BM_BCH_FLASH0LAYOUT0_ECC0)
> +#define MX6Q_BP_BCH_FLASH0LAYOUT0_ECC0 11
> +#define MX6Q_BM_BCH_FLASH0LAYOUT0_ECC0 (0x1f << MX6Q_BP_BCH_FLASH0LAYOUT0_ECC0)
> +#define BF_BCH_FLASH0LAYOUT0_ECC0(v, x) \
> + (GPMI_IS_MX6Q(x) \
> + ? (((v) << MX6Q_BP_BCH_FLASH0LAYOUT0_ECC0) \
> + & MX6Q_BM_BCH_FLASH0LAYOUT0_ECC0) \
> + : (((v) << BP_BCH_FLASH0LAYOUT0_ECC0) \
> + & BM_BCH_FLASH0LAYOUT0_ECC0) \
> + )
>
> #define BP_BCH_FLASH0LAYOUT0_DATA0_SIZE 0
> #define BM_BCH_FLASH0LAYOUT0_DATA0_SIZE \
> (0xfff << BP_BCH_FLASH0LAYOUT0_DATA0_SIZE)
> -#define BF_BCH_FLASH0LAYOUT0_DATA0_SIZE(v) \
> - (((v) << BP_BCH_FLASH0LAYOUT0_DATA0_SIZE)\
> - & BM_BCH_FLASH0LAYOUT0_DATA0_SIZE)
> +#define MX6Q_BM_BCH_FLASH0LAYOUT0_DATA0_SIZE \
> + (0x3ff << BP_BCH_FLASH0LAYOUT0_DATA0_SIZE)
> +#define BF_BCH_FLASH0LAYOUT0_DATA0_SIZE(v, x) \
> + (GPMI_IS_MX6Q(x) \
> + ? (((v) >> 2) & MX6Q_BM_BCH_FLASH0LAYOUT0_DATA0_SIZE) \
> + : ((v) & BM_BCH_FLASH0LAYOUT0_DATA0_SIZE) \
> + )
>
> #define HW_BCH_FLASH0LAYOUT1 0x00000090
>
> @@ -72,13 +83,24 @@
>
> #define BP_BCH_FLASH0LAYOUT1_ECCN 12
> #define BM_BCH_FLASH0LAYOUT1_ECCN (0xf << BP_BCH_FLASH0LAYOUT1_ECCN)
> -#define BF_BCH_FLASH0LAYOUT1_ECCN(v) \
> - (((v) << BP_BCH_FLASH0LAYOUT1_ECCN) & BM_BCH_FLASH0LAYOUT1_ECCN)
> +#define MX6Q_BP_BCH_FLASH0LAYOUT1_ECCN 11
> +#define MX6Q_BM_BCH_FLASH0LAYOUT1_ECCN (0x1f << MX6Q_BP_BCH_FLASH0LAYOUT1_ECCN)
> +#define BF_BCH_FLASH0LAYOUT1_ECCN(v, x) \
> + (GPMI_IS_MX6Q(x) \
> + ? (((v) << MX6Q_BP_BCH_FLASH0LAYOUT1_ECCN) \
> + & MX6Q_BM_BCH_FLASH0LAYOUT1_ECCN) \
> + : (((v) << BP_BCH_FLASH0LAYOUT1_ECCN) \
> + & BM_BCH_FLASH0LAYOUT1_ECCN) \
> + )
>
> #define BP_BCH_FLASH0LAYOUT1_DATAN_SIZE 0
> #define BM_BCH_FLASH0LAYOUT1_DATAN_SIZE \
> (0xfff << BP_BCH_FLASH0LAYOUT1_DATAN_SIZE)
> -#define BF_BCH_FLASH0LAYOUT1_DATAN_SIZE(v) \
> - (((v) << BP_BCH_FLASH0LAYOUT1_DATAN_SIZE) \
> - & BM_BCH_FLASH0LAYOUT1_DATAN_SIZE)
> +#define MX6Q_BM_BCH_FLASH0LAYOUT1_DATAN_SIZE \
> + (0x3ff << BP_BCH_FLASH0LAYOUT1_DATAN_SIZE)
> +#define BF_BCH_FLASH0LAYOUT1_DATAN_SIZE(v, x) \
> + (GPMI_IS_MX6Q(x) \
> + ? (((v) >> 2) & MX6Q_BM_BCH_FLASH0LAYOUT1_DATAN_SIZE) \
> + : ((v) & BM_BCH_FLASH0LAYOUT1_DATAN_SIZE) \
> + )
> #endif
> diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
> index 7db6555..cbcf022 100644
> --- a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
> +++ b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
> @@ -223,13 +223,13 @@ int bch_set_geometry(struct gpmi_nand_data *this)
> /* Configure layout 0. */
> writel(BF_BCH_FLASH0LAYOUT0_NBLOCKS(block_count)
> | BF_BCH_FLASH0LAYOUT0_META_SIZE(metadata_size)
> - | BF_BCH_FLASH0LAYOUT0_ECC0(ecc_strength)
> - | BF_BCH_FLASH0LAYOUT0_DATA0_SIZE(block_size),
> + | BF_BCH_FLASH0LAYOUT0_ECC0(ecc_strength, this)
> + | BF_BCH_FLASH0LAYOUT0_DATA0_SIZE(block_size, this),
> r->bch_regs + HW_BCH_FLASH0LAYOUT0);
>
> writel(BF_BCH_FLASH0LAYOUT1_PAGE_SIZE(page_size)
> - | BF_BCH_FLASH0LAYOUT1_ECCN(ecc_strength)
> - | BF_BCH_FLASH0LAYOUT1_DATAN_SIZE(block_size),
> + | BF_BCH_FLASH0LAYOUT1_ECCN(ecc_strength, this)
> + | BF_BCH_FLASH0LAYOUT1_DATAN_SIZE(block_size, this),
> r->bch_regs + HW_BCH_FLASH0LAYOUT1);
>
> /* Set *all* chip selects to use layout 0. */
> @@ -803,7 +803,8 @@ int gpmi_is_ready(struct gpmi_nand_data *this, unsigned chip)
> if (GPMI_IS_MX23(this)) {
> mask = MX23_BM_GPMI_DEBUG_READY0 << chip;
> reg = readl(r->gpmi_regs + HW_GPMI_DEBUG);
> - } else if (GPMI_IS_MX28(this)) {
> + } else if (GPMI_IS_MX28(this) || GPMI_IS_MX6Q(this)) {
> + /* MX28 shares the same R/B register as MX6Q. */
> mask = MX28_BF_GPMI_STAT_READY_BUSY(1 << chip);
> reg = readl(r->gpmi_regs + HW_GPMI_STAT);
> } else
> @@ -1055,8 +1056,9 @@ int gpmi_read_page(struct gpmi_nand_data *this,
> | BF_GPMI_CTRL0_ADDRESS(address)
> | BF_GPMI_CTRL0_XFER_COUNT(geo->page_size);
> pio[1] = 0;
> + pio[2] = 0; /* Set GPMI_HW_GPMI_ECCCTRL, disable the BCH. */
> desc = channel->device->device_prep_slave_sg(channel,
> - (struct scatterlist *)pio, 2,
> + (struct scatterlist *)pio, 3,
> DMA_TRANS_NONE, 1);
> if (!desc) {
> pr_err("step 3 error\n");
> diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> index f39f83e..cfcc0eb 100644
> --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> @@ -1582,6 +1582,9 @@ static const struct platform_device_id gpmi_ids[] = {
> }, {
> .name = "imx28-gpmi-nand",
> .driver_data = IS_MX28,
> + }, {
> + .name = "imx6q-gpmi-nand",
> + .driver_data = IS_MX6Q,
> }, {},
> };
>
> diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
> index e023bcc..c93b0ae 100644
> --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
> +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
> @@ -268,6 +268,8 @@ extern int gpmi_read_page(struct gpmi_nand_data *,
> /* Use the platform_id to distinguish different Archs. */
> #define IS_MX23 0x1
> #define IS_MX28 0x2
> +#define IS_MX6Q 0x8
> #define GPMI_IS_MX23(x) ((x)->pdev->id_entry->driver_data == IS_MX23)
> #define GPMI_IS_MX28(x) ((x)->pdev->id_entry->driver_data == IS_MX28)
> +#define GPMI_IS_MX6Q(x) ((x)->pdev->id_entry->driver_data == IS_MX6Q)
> #endif
prev parent reply other threads:[~2012-02-16 5:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-14 2:36 [PATCH v2] mtd/gpmi : add gpmi support for mx6q Huang Shijie
2012-02-16 5:44 ` Huang Shijie [this message]
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=4F3C97C1.6000508@freescale.com \
--to=b32955@freescale.com \
--cc=artem.bityutskiy@intel.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-mtd@lists.infradead.org \
--cc=w.sang@pengutronix.de \
/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