From mboxrd@z Thu Jan 1 00:00:00 1970 Message-ID: <4F3C97C1.6000508@freescale.com> Date: Thu, 16 Feb 2012 13:44:33 +0800 From: Huang Shijie MIME-Version: 1.0 To: Huang Shijie Subject: Re: [PATCH v2] mtd/gpmi : add gpmi support for mx6q References: <1329186979-25382-1-git-send-email-b32955@freescale.com> In-Reply-To: <1329186979-25382-1-git-send-email-b32955@freescale.com> Content-Type: text/plain; charset="GB2312" Content-Transfer-Encoding: 7bit Cc: artem.bityutskiy@intel.com, linux-mtd@lists.infradead.org, w.sang@pengutronix.de, linux-arm-kernel@lists.infradead.org List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 > --- > 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