* [PATCH v2 6/6] mtd: nand: gpmi: support NAND on i.MX6UL
@ 2015-08-18 3:25 Han Xu
2015-08-18 6:58 ` Huang Shijie
0 siblings, 1 reply; 2+ messages in thread
From: Han Xu @ 2015-08-18 3:25 UTC (permalink / raw)
To: shijie.huang
Cc: dwmw2, computersforpeace, b45815, boris.brezillon, fabio.estevam,
hofrat, linux-mtd, linux-kernel, vinod.koul, dan.j.williams,
dmaengine
support GPMI NAND on i.MX6UL
Signed-off-by: Han Xu <han.xu@freescale.com>
---
drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 9 +++++++++
drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 6 ++++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index 362cf4c..adadac2 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@ -89,6 +89,12 @@ static const struct gpmi_devdata gpmi_devdata_imx7d = {
.max_chain_delay = 12,
};
+static const struct gpmi_devdata gpmi_devdata_imx6ul = {
+ .type = IS_MX6UL,
+ .bch_max_ecc_strength = 40,
+ .max_chain_delay = 12,
+};
+
static irqreturn_t bch_irq(int irq, void *cookie)
{
struct gpmi_nand_data *this = cookie;
@@ -2016,6 +2022,9 @@ static const struct of_device_id gpmi_nand_id_table[] = {
.compatible = "fsl,imx6sx-gpmi-nand",
.data = &gpmi_devdata_imx6sx,
}, {
+ .compatible = "fsl,imx6ul-gpmi-nand",
+ .data = (void *)&gpmi_devdata_imx6ul,
+ }, {
.compatible = "fsl,imx7d-gpmi-nand",
.data = (void *)&gpmi_devdata_imx7d,
}
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
index 36ffeda..8428637 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
@@ -125,7 +125,8 @@ enum gpmi_type {
IS_MX6Q,
IS_MX6QP,
IS_MX6SX,
- IS_MX7D
+ IS_MX7D,
+ IS_MX6UL
};
struct gpmi_devdata {
@@ -310,8 +311,9 @@ void gpmi_copy_bits(u8 *dst, size_t dst_bit_off,
#define GPMI_IS_MX6QP(x) ((x)->devdata->type == IS_MX6QP)
#define GPMI_IS_MX6SX(x) ((x)->devdata->type == IS_MX6SX)
#define GPMI_IS_MX7D(x) ((x)->devdata->type == IS_MX7D)
+#define GPMI_IS_MX6UL(x) ((x)->devdata->type == IS_MX6UL)
#define GPMI_IS_MX6(x) (GPMI_IS_MX6Q(x) || GPMI_IS_MX6QP(x)\
- || GPMI_IS_MX6SX(x))
+ || GPMI_IS_MX6SX(x) || GPMI_IS_MX6UL(x))
#define GPMI_IS_MX7(x) (GPMI_IS_MX7D(x))
#endif
--
1.9.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH v2 6/6] mtd: nand: gpmi: support NAND on i.MX6UL
2015-08-18 3:25 [PATCH v2 6/6] mtd: nand: gpmi: support NAND on i.MX6UL Han Xu
@ 2015-08-18 6:58 ` Huang Shijie
0 siblings, 0 replies; 2+ messages in thread
From: Huang Shijie @ 2015-08-18 6:58 UTC (permalink / raw)
To: Han Xu
Cc: dwmw2, computersforpeace, boris.brezillon, fabio.estevam, hofrat,
linux-mtd, linux-kernel, vinod.koul, dan.j.williams, dmaengine
On Mon, Aug 17, 2015 at 10:25:07PM -0500, Han Xu wrote:
> support GPMI NAND on i.MX6UL
>
> Signed-off-by: Han Xu <han.xu@freescale.com>
> ---
> drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 9 +++++++++
> drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 6 ++++--
> 2 files changed, 13 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> index 362cf4c..adadac2 100644
> --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
> @@ -89,6 +89,12 @@ static const struct gpmi_devdata gpmi_devdata_imx7d = {
> .max_chain_delay = 12,
> };
>
> +static const struct gpmi_devdata gpmi_devdata_imx6ul = {
> + .type = IS_MX6UL,
> + .bch_max_ecc_strength = 40,
> + .max_chain_delay = 12,
> +};
> +
> static irqreturn_t bch_irq(int irq, void *cookie)
> {
> struct gpmi_nand_data *this = cookie;
> @@ -2016,6 +2022,9 @@ static const struct of_device_id gpmi_nand_id_table[] = {
> .compatible = "fsl,imx6sx-gpmi-nand",
> .data = &gpmi_devdata_imx6sx,
> }, {
> + .compatible = "fsl,imx6ul-gpmi-nand",
> + .data = (void *)&gpmi_devdata_imx6ul,
> + }, {
> .compatible = "fsl,imx7d-gpmi-nand",
> .data = (void *)&gpmi_devdata_imx7d,
> }
> diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
> index 36ffeda..8428637 100644
> --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
> +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
> @@ -125,7 +125,8 @@ enum gpmi_type {
> IS_MX6Q,
> IS_MX6QP,
> IS_MX6SX,
> - IS_MX7D
> + IS_MX7D,
> + IS_MX6UL
> };
>
> struct gpmi_devdata {
> @@ -310,8 +311,9 @@ void gpmi_copy_bits(u8 *dst, size_t dst_bit_off,
> #define GPMI_IS_MX6QP(x) ((x)->devdata->type == IS_MX6QP)
> #define GPMI_IS_MX6SX(x) ((x)->devdata->type == IS_MX6SX)
> #define GPMI_IS_MX7D(x) ((x)->devdata->type == IS_MX7D)
> +#define GPMI_IS_MX6UL(x) ((x)->devdata->type == IS_MX6UL)
>
> #define GPMI_IS_MX6(x) (GPMI_IS_MX6Q(x) || GPMI_IS_MX6QP(x)\
> - || GPMI_IS_MX6SX(x))
> + || GPMI_IS_MX6SX(x) || GPMI_IS_MX6UL(x))
> #define GPMI_IS_MX7(x) (GPMI_IS_MX7D(x))
> #endif
> --
Acked-by: Huang Shijie <shijie.huang@arm.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-08-18 6:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-08-18 3:25 [PATCH v2 6/6] mtd: nand: gpmi: support NAND on i.MX6UL Han Xu
2015-08-18 6:58 ` Huang Shijie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®