Original and Rejects

Original:
---------
/* read chip mfr and id
 * return 0 if they match board config
 * return 1 if not
 */
int nand_chip()
{
    int mfr, id;

    NAND_ENABLE_CE();

    if (NanD_Command(NAND_CMD_RESET)) {
        printf("Err: RESET\n");
        NAND_DISABLE_CE();
        return 1;
    }

    if (NanD_Command(NAND_CMD_READID)) {
        printf("Err: READID\n");
        NAND_DISABLE_CE();
        return 1;
    }

    NanD_Address(ADDR_COLUMN, 0);

    mfr = READ_NAND(NAND_ADDR);
    id = READ_NAND(NAND_ADDR);

    NAND_DISABLE_CE();

    switch (mfr) {
        /* Hynix NAND Part */
        case HYNIX4GiB_MFR:
            is_ddr_166M = 0;
            if (is_cpu_family() == CPU_OMAP36XX)
                return (id != HYNIX4GiB_ID);
            break;
        /* Micron NAND Part */
        case MT29F1G_MFR:
            is_ddr_166M = 1;
            if ((is_cpu_family() == CPU_OMAP34XX) ||
                    (is_cpu_family() == CPU_AM35XX) ||
                    (is_cpu_family() == CPU_OMAP36XX)) {
#ifdef CONFIG_AM3517CRANE
                return (mfr != MT29F1G_MFR &&
                !(id == MT29F1G_ID || id == MT29F2G_ID));
#endif
                return (!((id == MT29F1G_ID) ||
                        (id == MT29F2G_ID) ||
                        (id ==MT29F4G_ID)));
            }
            break;
#ifdef CONFIG_FLASHBOARD
        case SAMSUNG_MFR: /* Samsung NAND on FLASH Board */
            is_ddr_166M = 1;  /* set ddr to 166MHz */
            if (is_cpu_family() == CPU_OMAP36XX)
                return (id != K9F4G08U0B_ID);
            break;
#else
        case K9F1G08R0A_MFR:
#endif
        default:
            is_ddr_166M = 1;
            break;
    }

    return (id != K9F1G08R0A_ID);
}


Rejects
---------------
--- drivers/k9f1g08r0a.c
+++ drivers/k9f1g08r0a.c
@@ -185,23 +208,23 @@
 {
    int mfr, id;

-   NAND_ENABLE_CE();
+   NAND_ENABLE_CE();

-   if (NanD_Command(NAND_CMD_RESET)) {
-       printf("Err: RESET\n");
-       NAND_DISABLE_CE();
+   if (NanD_Command(NAND_CMD_RESET)) {
+       printf("Err: RESET\n");
+       NAND_DISABLE_CE();
        return 1;
    }

-   if (NanD_Command(NAND_CMD_READID)) {
-       printf("Err: READID\n");
-       NAND_DISABLE_CE();
+   if (NanD_Command(NAND_CMD_READID)) {
+       printf("Err: READID\n");
+       NAND_DISABLE_CE();
        return 1;
-   }
+   }

-   NanD_Address(ADDR_COLUMN, 0);
+   NanD_Address(ADDR_COLUMN, 0);

-   mfr = READ_NAND(NAND_ADDR);
+   mfr = READ_NAND(NAND_ADDR);
    id = READ_NAND(NAND_ADDR);

    NAND_DISABLE_CE();