On Fri, Feb 12, 2016 at 1:11 PM, Rafał Miłecki <zajec5@xxxxxxxxx> wrote: > This allows specifying algorithm used for NAND ECC. There are two > available values: "bch" and "hamming". It's important as having just > ECC parameters (step, strength) isn't enough to determine algorithm, > e.g. you can't distinct BCH-1 and Hamming. > > Signed-off-by: Rafał Miłecki <zajec5@xxxxxxxxx> Reviewed-by: Kamal Dasu <kdasu.kdev@xxxxxxxxx> Thanks Rafal > --- > Documentation/devicetree/bindings/mtd/nand.txt | 3 +++ > drivers/of/of_mtd.c | 33 ++++++++++++++++++++++++++ > include/linux/mtd/nand.h | 5 ++++ > include/linux/of_mtd.h | 6 +++++ > 4 files changed, 47 insertions(+) > > diff --git a/Documentation/devicetree/bindings/mtd/nand.txt b/Documentation/devicetree/bindings/mtd/nand.txt > index b53f92e..a2c2df5 100644 > --- a/Documentation/devicetree/bindings/mtd/nand.txt > +++ b/Documentation/devicetree/bindings/mtd/nand.txt > @@ -3,6 +3,9 @@ > - nand-ecc-mode : String, operation mode of the NAND ecc mode. > Supported values are: "none", "soft", "hw", "hw_syndrome", "hw_oob_first", > "soft_bch". > +- nand-ecc-algo : string, algorithm of NAND ecc. > + Supported values are: "bch", "hamming". The default one is > + "bch". > - nand-bus-width : 8 or 16 bus width if not present 8 > - nand-on-flash-bbt: boolean to enable on flash bbt option if not present false > > diff --git a/drivers/of/of_mtd.c b/drivers/of/of_mtd.c > index b7361ed..f2a6630 100644 > --- a/drivers/of/of_mtd.c > +++ b/drivers/of/of_mtd.c > @@ -50,6 +50,39 @@ int of_get_nand_ecc_mode(struct device_node *np) > EXPORT_SYMBOL_GPL(of_get_nand_ecc_mode); > > /** > + * It maps 'enum nand_ecc_algo' found in include/linux/mtd/nand.h into the > + * device tree binding of 'nand-ecc-algo'. > + */ > +static const char * const nand_ecc_algos[] = { > + [NAND_ECC_BCH] = "bch", > + [NAND_ECC_HAMMING] = "hamming", > +}; > + > +/** > + * of_get_nand_ecc_algo - Get nand ecc algorithm for given device_node > + * @np: Pointer to the given device_node > + * > + * The function gets ecc algorithm string from property 'nand-ecc-algo' and > + * returns its index in nand_ecc_algos table, or errno in error case. > + */ > +int of_get_nand_ecc_algo(struct device_node *np) > +{ > + const char *pm; > + int err, i; > + > + err = of_property_read_string(np, "nand-ecc-algo", &pm); > + if (err < 0) > + return err; > + > + for (i = 0; i < ARRAY_SIZE(nand_ecc_algos); i++) > + if (!strcasecmp(pm, nand_ecc_algos[i])) > + return i; > + > + return -ENODEV; > +} > +EXPORT_SYMBOL_GPL(of_get_nand_ecc_algo); > + > +/** > * of_get_nand_ecc_step_size - Get ECC step size associated to > * the required ECC strength (see below). > * @np: Pointer to the given device_node > diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h > index 7604f4b..25854d2 100644 > --- a/include/linux/mtd/nand.h > +++ b/include/linux/mtd/nand.h > @@ -119,6 +119,11 @@ typedef enum { > NAND_ECC_SOFT_BCH, > } nand_ecc_modes_t; > > +enum nand_ecc_algo { > + NAND_ECC_BCH, > + NAND_ECC_HAMMING, > +}; > + > /* > * Constants for Hardware ECC > */ > diff --git a/include/linux/of_mtd.h b/include/linux/of_mtd.h > index e266caa..0f6aca5 100644 > --- a/include/linux/of_mtd.h > +++ b/include/linux/of_mtd.h > @@ -13,6 +13,7 @@ > > #include <linux/of.h> > int of_get_nand_ecc_mode(struct device_node *np); > +int of_get_nand_ecc_algo(struct device_node *np); > int of_get_nand_ecc_step_size(struct device_node *np); > int of_get_nand_ecc_strength(struct device_node *np); > int of_get_nand_bus_width(struct device_node *np); > @@ -25,6 +26,11 @@ static inline int of_get_nand_ecc_mode(struct device_node *np) > return -ENOSYS; > } > > +static inline int of_get_nand_ecc_algo(struct device_node *np) > +{ > + return -ENOSYS; > +} > + > static inline int of_get_nand_ecc_step_size(struct device_node *np) > { > return -ENOSYS; > -- > 1.8.4.5 > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html