diff options
Diffstat (limited to 'bsp/meta-freescale-3rdparty/recipes-kernel/linux/linux-fslc/ccimx6ul/0001-MLK-11719-4-mtd-gpmi-change-the-BCH-layout-setting-f.patch')
| -rw-r--r-- | bsp/meta-freescale-3rdparty/recipes-kernel/linux/linux-fslc/ccimx6ul/0001-MLK-11719-4-mtd-gpmi-change-the-BCH-layout-setting-f.patch | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/bsp/meta-freescale-3rdparty/recipes-kernel/linux/linux-fslc/ccimx6ul/0001-MLK-11719-4-mtd-gpmi-change-the-BCH-layout-setting-f.patch b/bsp/meta-freescale-3rdparty/recipes-kernel/linux/linux-fslc/ccimx6ul/0001-MLK-11719-4-mtd-gpmi-change-the-BCH-layout-setting-f.patch index c2b81030..d8133ad2 100644 --- a/bsp/meta-freescale-3rdparty/recipes-kernel/linux/linux-fslc/ccimx6ul/0001-MLK-11719-4-mtd-gpmi-change-the-BCH-layout-setting-f.patch +++ b/bsp/meta-freescale-3rdparty/recipes-kernel/linux/linux-fslc/ccimx6ul/0001-MLK-11719-4-mtd-gpmi-change-the-BCH-layout-setting-f.patch @@ -58,10 +58,10 @@ Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com> 3 files changed, 248 insertions(+), 49 deletions(-) diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c b/drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c -index 88ea2203e263..a4cd9523e220 100644 +index a4768df5083f..72ace805f8c6 100644 --- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c +++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c -@@ -212,7 +212,8 @@ void gpmi_dump_info(struct gpmi_nand_data *this) +@@ -213,7 +213,8 @@ void gpmi_dump_info(struct gpmi_nand_data *this) "ECC Strength : %u\n" "Page Size in Bytes : %u\n" "Metadata Size in Bytes : %u\n" @@ -71,7 +71,7 @@ index 88ea2203e263..a4cd9523e220 100644 "ECC Chunk Count : %u\n" "Payload Size in Bytes : %u\n" "Auxiliary Size in Bytes: %u\n" -@@ -223,7 +224,8 @@ void gpmi_dump_info(struct gpmi_nand_data *this) +@@ -224,7 +225,8 @@ void gpmi_dump_info(struct gpmi_nand_data *this) geo->ecc_strength, geo->page_size, geo->metadata_size, @@ -81,7 +81,7 @@ index 88ea2203e263..a4cd9523e220 100644 geo->ecc_chunk_count, geo->payload_size, geo->auxiliary_size, -@@ -238,7 +240,8 @@ int bch_set_geometry(struct gpmi_nand_data *this) +@@ -239,7 +241,8 @@ int bch_set_geometry(struct gpmi_nand_data *this) struct resources *r = &this->resources; struct bch_geometry *bch_geo = &this->bch_geometry; unsigned int block_count; @@ -91,7 +91,7 @@ index 88ea2203e263..a4cd9523e220 100644 unsigned int metadata_size; unsigned int ecc_strength; unsigned int page_size; -@@ -250,7 +253,8 @@ int bch_set_geometry(struct gpmi_nand_data *this) +@@ -251,7 +254,8 @@ int bch_set_geometry(struct gpmi_nand_data *this) return ret; block_count = bch_geo->ecc_chunk_count - 1; @@ -101,7 +101,7 @@ index 88ea2203e263..a4cd9523e220 100644 metadata_size = bch_geo->metadata_size; ecc_strength = bch_geo->ecc_strength >> 1; page_size = bch_geo->page_size; -@@ -277,13 +281,13 @@ int bch_set_geometry(struct gpmi_nand_data *this) +@@ -276,13 +280,13 @@ int bch_set_geometry(struct gpmi_nand_data *this) | BF_BCH_FLASH0LAYOUT0_META_SIZE(metadata_size) | BF_BCH_FLASH0LAYOUT0_ECC0(ecc_strength, this) | BF_BCH_FLASH0LAYOUT0_GF(gf_len, this) @@ -118,7 +118,7 @@ index 88ea2203e263..a4cd9523e220 100644 /* Set *all* chip selects to use layout 0. */ diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c -index 1c1ebbc82824..bc4a364e5696 100644 +index ed405c9434fe..0dd9d586a934 100644 --- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c +++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c @@ -179,6 +179,36 @@ static inline bool gpmi_check_ecc(struct gpmi_nand_data *this) @@ -373,7 +373,7 @@ index 1c1ebbc82824..bc4a364e5696 100644 } struct dma_chan *get_dma_chan(struct gpmi_nand_data *this) -@@ -997,7 +1156,8 @@ static int gpmi_ecc_read_page_data(struct nand_chip *chip, +@@ -991,7 +1150,8 @@ static int gpmi_ecc_read_page_data(struct nand_chip *chip, /* Read ECC bytes into our internal raw_buffer */ offset = nfc_geo->metadata_size * 8; @@ -383,7 +383,7 @@ index 1c1ebbc82824..bc4a364e5696 100644 offset -= eccbits; bitoffset = offset % 8; eccbytes = DIV_ROUND_UP(offset + eccbits, 8); -@@ -1034,19 +1194,19 @@ static int gpmi_ecc_read_page_data(struct nand_chip *chip, +@@ -1028,19 +1188,19 @@ static int gpmi_ecc_read_page_data(struct nand_chip *chip, if (i == 0) { /* The first block includes metadata */ flips = nand_check_erased_ecc_chunk( @@ -414,7 +414,7 @@ index 1c1ebbc82824..bc4a364e5696 100644 } if (flips > 0) { -@@ -1134,9 +1294,24 @@ static int gpmi_ecc_read_subpage(struct mtd_info *mtd, struct nand_chip *chip, +@@ -1128,9 +1288,24 @@ static int gpmi_ecc_read_subpage(struct nand_chip *chip, uint32_t offs, } } @@ -436,11 +436,11 @@ index 1c1ebbc82824..bc4a364e5696 100644 + else + col = meta + (size + ecc_parity_size) * first; + -+ chip->cmdfunc(mtd, NAND_CMD_RNDOUT, col, -1); ++ chip->legacy.cmdfunc(chip, NAND_CMD_RNDOUT, col, -1); meta = 0; buf = buf + first * size; } -@@ -1149,21 +1324,37 @@ static int gpmi_ecc_read_subpage(struct mtd_info *mtd, struct nand_chip *chip, +@@ -1143,21 +1318,37 @@ static int gpmi_ecc_read_subpage(struct nand_chip *chip, uint32_t offs, /* change the BCH registers and bch_geometry{} */ n = last - first + 1; @@ -481,8 +481,8 @@ index 1c1ebbc82824..bc4a364e5696 100644 geo->auxiliary_status_offset = ALIGN(meta, 4); dev_dbg(this->dev, "page:%d(%d:%d)%d, chunk:(%d:%d), BCH PG size:%d\n", -@@ -1386,7 +1577,7 @@ static int gpmi_ecc_read_page_raw(struct mtd_info *mtd, - { +@@ -1381,7 +1572,7 @@ static int gpmi_ecc_read_page_raw(struct nand_chip *chip, uint8_t *buf, + struct mtd_info *mtd = nand_to_mtd(chip); struct gpmi_nand_data *this = nand_get_controller_data(chip); struct bch_geometry *nfc_geo = &this->bch_geometry; - int eccsize = nfc_geo->ecc_chunk_size; @@ -490,8 +490,8 @@ index 1c1ebbc82824..bc4a364e5696 100644 int eccbits = nfc_geo->ecc_strength * nfc_geo->gf_len; u8 *tmp_buf = this->raw_buffer; size_t src_bit_off; -@@ -1471,7 +1662,7 @@ static int gpmi_ecc_write_page_raw(struct mtd_info *mtd, - { +@@ -1465,7 +1656,7 @@ static int gpmi_ecc_write_page_raw(struct nand_chip *chip, const uint8_t *buf, + struct mtd_info *mtd = nand_to_mtd(chip); struct gpmi_nand_data *this = nand_get_controller_data(chip); struct bch_geometry *nfc_geo = &this->bch_geometry; - int eccsize = nfc_geo->ecc_chunk_size; @@ -499,7 +499,7 @@ index 1c1ebbc82824..bc4a364e5696 100644 int eccbits = nfc_geo->ecc_strength * nfc_geo->gf_len; u8 *tmp_buf = this->raw_buffer; uint8_t *oob = chip->oob_poi; -@@ -1847,7 +2038,7 @@ static int gpmi_init_last(struct gpmi_nand_data *this) +@@ -1845,7 +2036,7 @@ static int gpmi_init_last(struct gpmi_nand_data *this) ecc->read_oob_raw = gpmi_ecc_read_oob_raw; ecc->write_oob_raw = gpmi_ecc_write_oob_raw; ecc->mode = NAND_ECC_HW; @@ -509,7 +509,7 @@ index 1c1ebbc82824..bc4a364e5696 100644 mtd_set_ooblayout(mtd, &gpmi_ooblayout_ops); diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h -index 69cd0cbde4f2..ef4e57256d30 100644 +index d0b79bac2728..4a9dab7c0859 100644 --- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h +++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h @@ -30,9 +30,9 @@ struct resources { |