dt-bindings: mtd: brcmnand: Make nand-ecc-strength and nand-ecc-step-size optional
Subsystems (4)
PATCH v3 1/2 dt-bindings: mtd: brcmnand: Make nand-ecc-strength and nand-ecc-step-size optional
nand-ecc-strength and nand-ecc-step-size can be made optional as brcmnand driver can support using raw NAND layer detected values.
--- Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt +3 -3
@@ -101,12 +101,12 @@ Required properties: number (e.g., 0, 1, 2, etc.) - #address-cells : see partition.txt - #size-cells : see partition.txt -- nand-ecc-strength : see nand.txt -- nand-ecc-step-size : must be 512 or 1024. See nand.txt Optional properties: +- nand-ecc-strength : see nand-controller.yaml +- nand-ecc-step-size : must be 512 or 1024. See nand-controller.yaml - nand-on-flash-bbt : boolean, to enable the on-flash BBT for this - chip-select. See nand.txt + chip-select. See nand-controller.yaml - brcm,nand-oob-sector-size : integer, to denote the spare area sector size expected for the ECC layout in use. This size, in addition to the strength and step-size,
Signature · 1 line
1.9.0.138.g2de3478
PATCH v3 2/2 mtd: nand: raw: brcmnand: fallback to detected ecc-strength, ecc-step-size
This change supports nand-ecc-step-size and nand-ecc-strength fields in brcmnand DT node to be optional.
see: Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt
If both nand-ecc-strength and nand-ecc-step-size are not specified in device tree node for NAND, raw NAND layer does detect ECC information by reading ONFI extended parameter page for parts using ONFI >= 2.1. In case of non-ONFI NAND parts there could be a nand_id table entry with ECC information. If there is valid device tree entry for nand-ecc-strength and nand-ecc-step-size fields it still shall override the detected values.
--- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/mtd/nand/raw/brcmnand/brcmnand.c +11 -0
@@ -2144,6 +2144,17 @@ static int brcmnand_setup_dev(struct brcmnand_host *host)return -EINVAL ; } +if (chip->ecc.mode !=NAND_ECC_NONE && + (!chip->ecc.size || !chip->ecc.strength)) { +if (chip->base.eccreq.step_size && chip->base.eccreq.strength) { +/* use detected ECC parameters */ + chip->ecc.size = chip->base.eccreq.step_size; + chip->ecc.strength = chip->base.eccreq.strength; +dev_info (ctrl->dev,"Using ECC step-size %d, strength %d\n" , + chip->ecc.size, chip->ecc.strength); + } + } +switch (chip->ecc.size) {case 512 :if (chip->ecc.algo ==NAND_ECC_HAMMING )
Signature · 1 line
1.9.0.138.g2de3478
Quoted 4 lines · Kamal Dasu
nand-ecc-strength and nand-ecc-step-size can be made optional as brcmnand driver can support using raw NAND layer detected values.
Signed-off-by Kamal Dasu <[email protected]>
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks.
Miquel