[PATCH 03/10] mtd: mxc_nand: move function pointers to a per-SOC struct
Uwe Kleine-König
u.kleine-koenig at pengutronix.de
Tue Apr 24 18:10:53 EST 2012
Hello Sascha,
On Tue, Apr 24, 2012 at 09:24:57AM +0200, Sascha Hauer wrote:
> On Mon, Apr 23, 2012 at 11:23:35AM +0200, Uwe Kleine-König wrote:
> > This prepares switching to platform ids and of-tree probing.
> >
> > Signed-off-by: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>
> > ---
> > drivers/mtd/nand/mxc_nand.c | 197 ++++++++++++++++++++++++++-----------------
> > 1 file changed, 118 insertions(+), 79 deletions(-)
> >
> > diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
> > index a78e763..1672e4b 100644
> > --- a/drivers/mtd/nand/mxc_nand.c
> > +++ b/drivers/mtd/nand/mxc_nand.c
> > @@ -140,6 +140,19 @@
> >
> > #define NFC_V3_DELAY_LINE (host->regs_ip + 0x34)
> >
> > +struct mxc_nand_host;
> > +
> > +struct mxc_nand_devtype_data {
> > + void (*preset)(struct mtd_info *);
> > + void (*send_cmd)(struct mxc_nand_host *, uint16_t, int);
> > + void (*send_addr)(struct mxc_nand_host *, uint16_t, int);
> > + void (*send_page)(struct mtd_info *, unsigned int);
> > + void (*send_read_id)(struct mxc_nand_host *);
> > + uint16_t (*get_dev_status)(struct mxc_nand_host *);
> > + int (*check_int)(struct mxc_nand_host *);
> > + void (*irq_control)(struct mxc_nand_host *, int);
> > +};
> > +
> > struct mxc_nand_host {
> > struct mtd_info mtd;
> > struct nand_chip nand;
> > @@ -165,14 +178,7 @@ struct mxc_nand_host {
> > unsigned int buf_start;
> > int spare_len;
> >
> > - void (*preset)(struct mtd_info *);
> > - void (*send_cmd)(struct mxc_nand_host *, uint16_t, int);
> > - void (*send_addr)(struct mxc_nand_host *, uint16_t, int);
> > - void (*send_page)(struct mtd_info *, unsigned int);
> > - void (*send_read_id)(struct mxc_nand_host *);
> > - uint16_t (*get_dev_status)(struct mxc_nand_host *);
> > - int (*check_int)(struct mxc_nand_host *);
> > - void (*irq_control)(struct mxc_nand_host *, int);
> > + const struct mxc_nand_devtype_data *devtype_data;
> >
> > /*
> > * On i.MX21 the CONFIG2:INT bit cannot be read if interrupts are masked
> > @@ -251,20 +257,6 @@ static struct nand_ecclayout nandv2_hw_eccoob_4k = {
> >
> > static const char *part_probes[] = { "RedBoot", "cmdlinepart", NULL };
> >
> > -static irqreturn_t mxc_nfc_irq(int irq, void *dev_id)
> > -{
> > - struct mxc_nand_host *host = dev_id;
> > -
> > - if (!host->check_int(host))
> > - return IRQ_NONE;
> > -
> > - irq_control(host, 0);
> > -
> > - complete(&host->op_completion);
> > -
> > - return IRQ_HANDLED;
> > -}
> > -
> > static int check_int_v3(struct mxc_nand_host *host)
> > {
> > uint32_t tmp;
> > @@ -329,10 +321,25 @@ static void irq_control(struct mxc_nand_host *host, int activate)
> > else
> > disable_irq_nosync(host->irq);
> > } else {
> > - host->irq_control(host, activate);
> > + host->devtype_data->irq_control(host, activate);
> > }
> > }
> >
> > +static irqreturn_t mxc_nfc_irq(int irq, void *dev_id)
> > +{
> > + struct mxc_nand_host *host = dev_id;
> > +
> > + if (!host->devtype_data->check_int(host))
> > + return IRQ_NONE;
> > +
> > + irq_control(host, 0);
> > +
> > + complete(&host->op_completion);
> > +
> > + return IRQ_HANDLED;
> > +}
> > +
> > +
>
> The move of mxc_nfc_irq seems unnecessary. Also one blank line too much.
It's necessary, but already in patch 2. And there is another hunk in
patch 9 that belongs into patch 8.
> >
> > +/* v1: 21, 27, 31 */
>
> Can we have imx21 here? People familiar with i.MX may instantly
> recognize these numbers, others do not.
yeah, right.
While updating the series and doing found another issue that resulted in
a new patch sent as reply to this mail.
I updated the series and pushed it to
git://git.pengutronix.de/git/ukl/linux.git ofconvert/mxc_nand
. The overall diff (not including the new patch) compared to the initial
post is:
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index 2e4b953..1041bb1 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -370,7 +370,6 @@ static irqreturn_t mxc_nfc_irq(int irq, void *dev_id)
return IRQ_HANDLED;
}
-
/* This function polls the NANDFC to wait for the basic operation to
* complete by checking the INT bit of config2 register.
*/
@@ -1137,7 +1136,7 @@ static struct nand_bbt_descr bbt_mirror_descr = {
.pattern = mirror_pattern,
};
-/* v1 + irqpending_quirk: 21 */
+/* v1 + irqpending_quirk: i.MX21 */
static const struct mxc_nand_devtype_data imx21_nand_devtype_data = {
.preset = preset_v1,
.send_cmd = send_cmd_v1_v2,
@@ -1162,7 +1161,7 @@ static const struct mxc_nand_devtype_data imx21_nand_devtype_data = {
.eccsize = 1,
};
-/* v1 + !irqpending_quirk: 27, 31 */
+/* v1 + !irqpending_quirk: i.MX27, i.MX31 */
static const struct mxc_nand_devtype_data imx27_nand_devtype_data = {
.preset = preset_v1,
.send_cmd = send_cmd_v1_v2,
@@ -1188,7 +1187,7 @@ static const struct mxc_nand_devtype_data imx27_nand_devtype_data = {
.eccsize = 1,
};
-/* v21: 25, 35 */
+/* v21: i.MX25, i.MX35 */
static const struct mxc_nand_devtype_data imx25_nand_devtype_data = {
.preset = preset_v2,
.send_cmd = send_cmd_v1_v2,
@@ -1214,7 +1213,7 @@ static const struct mxc_nand_devtype_data imx25_nand_devtype_data = {
.eccsize = 0,
};
-/* v3: 51, 53 */
+/* v3: i.MX51, i.MX53 */
static const struct mxc_nand_devtype_data imx51_nand_devtype_data = {
.preset = preset_v3,
.send_cmd = send_cmd_v3,
I will resend later (well unless someone pulls the tree before :-).
Best regards and thanks
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
More information about the devicetree-discuss
mailing list