From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Subject: [PATCH 1/3] of: mtd: add helper reading "nand-ecc-algo" from DT Date: Fri, 12 Feb 2016 19:11:23 +0100 Message-ID: <1455300685-27009-1-git-send-email-zajec5@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Brian Norris , linux-mtd-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org Cc: Hauke Mehrtens , Kamal Dasu , Rob Herring , Frank Rowand , Grant Likely , devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= List-Id: devicetree@vger.kernel.org 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=C5=82 Mi=C5=82ecki --- 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/Documenta= tion/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_f= irst", "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 pres= ent false =20 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); =20 /** + * 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[] =3D { + [NAND_ECC_BCH] =3D "bch", + [NAND_ECC_HAMMING] =3D "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 =3D of_property_read_string(np, "nand-ecc-algo", &pm); + if (err < 0) + return err; + + for (i =3D 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; =20 +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 @@ =20 #include 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; } =20 +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; --=20 1.8.4.5 -- To unsubscribe from this list: send the line "unsubscribe devicetree" i= n the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html