diff --git a/arch/arm/boards/a9m2410/config.h b/arch/arm/boards/a9m2410/config.h index 1274ce7..1da99ea 100644 --- a/arch/arm/boards/a9m2410/config.h +++ b/arch/arm/boards/a9m2410/config.h @@ -58,7 +58,7 @@ * 32MiB SDRAM in bank6 * - MT = 11 (= sync dram type) * - Trcd = 00 (= CL2) - * - SCAN = 01 (= 9 bit collumns) + * - SCAN = 01 (= 9 bit columns) */ #define BOARD_SPECIFIC_BANKCON6 ((0x3 << 15) + (0x0 << 2) + 0x1) /* diff --git a/arch/arm/boards/a9m2440/lowlevel_init.S b/arch/arm/boards/a9m2440/lowlevel_init.S index 916ab72..8711201 100644 --- a/arch/arm/boards/a9m2440/lowlevel_init.S +++ b/arch/arm/boards/a9m2440/lowlevel_init.S @@ -84,7 +84,7 @@ /* * - MT = 11 (= sync dram type) * - Trcd = 01 (= CL3) - * - SCAN = 00 (= 8 bit collumns) + * - SCAN = 00 (= 8 bit columns) */ .word ((0x3 << 15) + (0x1 << 2) + (0x0)) .word ((0x3 << 15) + (0x1 << 2) + (0x0)) @@ -117,7 +117,7 @@ /* * - MT = 11 (= sync dram type) * - Trcd = 00 (= CL2) - * - SCAN = 01 (= 9 bit collumns) + * - SCAN = 01 (= 9 bit columns) */ .word ((0x3 << 15) + (0x0 << 2) + (0x1)) .word ((0x3 << 15) + (0x0 << 2) + (0x1)) @@ -150,7 +150,7 @@ /* * - MT = 11 (= sync dram type) * - Trcd = 00 (= CL2) - * - SCAN = 01 (= 9 bit collumns) + * - SCAN = 01 (= 9 bit columns) */ .word ((0x3 << 15) + (0x0 << 2) + (0x1)) .word ((0x3 << 15) + (0x0 << 2) + (0x1)) @@ -183,7 +183,7 @@ /* * - MT = 11 (= sync dram type) * - Trcd = 00 (= CL2) - * - SCAN = 01 (= 9 bit collumns) + * - SCAN = 01 (= 9 bit columns) */ .word ((0x3 << 15) + (0x0 << 2) + (0x1)) .word ((0x3 << 15) + (0x0 << 2) + (0x1)) diff --git a/arch/arm/boards/friendlyarm-mini2440/config.h b/arch/arm/boards/friendlyarm-mini2440/config.h index 3479302..489697f 100644 --- a/arch/arm/boards/friendlyarm-mini2440/config.h +++ b/arch/arm/boards/friendlyarm-mini2440/config.h @@ -96,7 +96,7 @@ /* * - MT = 11 (= sync dram type) * - Trcd = 00 (= CL2) - * - SCAN = 01 (= 9 bit collumns) + * - SCAN = 01 (= 9 bit columns) */ #define BOARD_SPECIFIC_BANKCON6 ((0x3 << 15) + (0x0 << 2) + (0x1)) #define BOARD_SPECIFIC_BANKCON7 0 /* disabled */ diff --git a/drivers/mtd/nand/nand_s3c24xx.c b/drivers/mtd/nand/nand_s3c24xx.c index bee037b..37bba39 100644 --- a/drivers/mtd/nand/nand_s3c24xx.c +++ b/drivers/mtd/nand/nand_s3c24xx.c @@ -516,12 +516,12 @@ * * Uses the offset of the page to generate an page address into the NAND. This * differs when using a 512 byte or 2048 bytes per page NAND. - * The collumn part of the page address to be generated is always forced to '0'. + * The column part of the page address to be generated is always forced to '0'. */ static void __nand_boot_init nfc_addr(void __iomem *host, uint32_t offs, int ps, int c) { - send_addr(host, 0); /* collumn part 1 */ + send_addr(host, 0); /* column part 1 */ if (ps == 512) { send_addr(host, offs >> 9); @@ -529,7 +529,7 @@ if (c > 3) send_addr(host, offs >> 25); } else { - send_addr(host, 0); /* collumn part 2 */ + send_addr(host, 0); /* column part 2 */ send_addr(host, offs >> 11); send_addr(host, offs >> 19); if (c > 4)