sunxi_nand_spl: Remove NAND_SUNXI_SPL_SYNDROME_PARTITIONS_END

[karo-tx-uboot.git] / drivers / mtd / nand / docg4_spl.c

diff --git a/drivers/mtd/nand/docg4_spl.c b/drivers/mtd/nand/docg4_spl.c
index 95e856c213f0a7e163dea0aaa7548acd3e57f804..351b75a090e8d1dfb8d00a1545cab506f70c9a7a 100644 (file)
--- a/drivers/mtd/nand/docg4_spl.c
+++ b/drivers/mtd/nand/docg4_spl.c
@@ -3,9 +3,7 @@
  *
  * Copyright (C) 2013 Mike Dunn <mikedunn@newsguy.com>
  *
- * This file is released under the terms of GPL v2 and any later version.
- * See the file COPYING in the root directory of the source tree for details.
- *
+ * SPDX-License-Identifier:    GPL-2.0+
  *
  * This driver basically mimics the load functionality of a typical IPL (initial
  * program loader) resident in the 2k NOR-like region of the docg4 that is
@@ -113,7 +111,6 @@ static int docg4_load_block_reliable(uint32_t flash_offset, void *dest_addr)
        int g4_index = 0;
        uint16_t flash_status;
        uint16_t *buf;
-       uint16_t discard, magic_high, magic_low;
 
        /* flash_offset must be aligned to the start of a block */
        if (flash_offset & 0x3ffff)
@@ -154,9 +151,9 @@ static int docg4_load_block_reliable(uint32_t flash_offset, void *dest_addr)
         * The IPL on the palmtreo680 requires that this contain a 32 bit magic
         * number, or the load aborts.  We'll ignore it.
         */
-       discard = readw(docptr + 0x103c); /* hw quirk; 1st read discarded */
-       magic_low = readw(docptr + 0x103c);
-       magic_high = readw(docptr + DOCG4_MYSTERY_REG);
+       readw(docptr + 0x103c); /* hw quirk; 1st read discarded */
+       readw(docptr + 0x103c); /* lower 16 bits of magic number */
+       readw(docptr + DOCG4_MYSTERY_REG); /* upper 16 bits of magic number */
        writew(0, docptr + DOC_DATAEND);
        write_nop(docptr);
        write_nop(docptr);
@@ -183,15 +180,15 @@ static int docg4_load_block_reliable(uint32_t flash_offset, void *dest_addr)
                write_nop(docptr);
 
                /* read the 512 bytes of page data, 2 bytes at a time */
-               discard = readw(docptr + 0x103c);
+               readw(docptr + 0x103c); /* hw quirk */
                for (i = 0; i < 256; i++)
                        *buf++ = readw(docptr + 0x103c);
 
                /* read oob, but discard it */
                for (i = 0; i < 7; i++)
-                       discard = readw(docptr + 0x103c);
-               discard = readw(docptr + DOCG4_OOB_6_7);
-               discard = readw(docptr + DOCG4_OOB_6_7);
+                       readw(docptr + 0x103c);
+               readw(docptr + DOCG4_OOB_6_7);
+               readw(docptr + DOCG4_OOB_6_7);
 
                writew(0, docptr + DOC_DATAEND);
                write_nop(docptr);