| Message ID | 4F5844B3A985794BA902E12C070812375F8D20@DNCE04.ent.ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Monday 11 November 2013 10:31 PM, Khoronzhuk, Ivan wrote: > The properties davinci-ecc-mode, davinci-nand-use-bbt, davinci-nand-buswidth > are MTD generic. Correct names for them are: nand-ecc-mode, nand-on-flash-bbt, > nand-bus-width accordingly. So rename them in dts and documentation. > > Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> > --- > .../devicetree/bindings/mtd/davinci-nand.txt | 25 ++++++++++++++++---- > drivers/mtd/nand/davinci_nand.c | 11 ++++++--- > 2 files changed, 28 insertions(+), 8 deletions(-) > > diff --git a/Documentation/devicetree/bindings/mtd/davinci-nand.txt b/Documentation/devicetree/bindings/mtd/davinci-nand.txt > index d2a3fc0..befaa5b 100644 > --- a/Documentation/devicetree/bindings/mtd/davinci-nand.txt > +++ b/Documentation/devicetree/bindings/mtd/davinci-nand.txt > @@ -37,7 +37,7 @@ Recommended properties : > - ti,davinci-mask-chipsel: mask for chipselect address. Needed to mask > addresses for given chipselect. > > -- ti,davinci-ecc-mode: operation mode of the NAND ecc mode. ECC mode > +- nand-ecc-mode: operation mode of the NAND ecc mode. ECC mode > valid values for davinci driver: > - "none" > - "soft" > @@ -45,10 +45,25 @@ Recommended properties : > > - ti,davinci-ecc-bits: used ECC bits, currently supported 1 or 4. > > -- ti,davinci-nand-buswidth: buswidth 8 or 16. Shouldn't we keep the documentation for existing bindings while just marking them as deprecated? Thanks, Sekhar
On 11/26/2013 09:03 AM, Sekhar Nori wrote: > On Monday 11 November 2013 10:31 PM, Khoronzhuk, Ivan wrote: >> The properties davinci-ecc-mode, davinci-nand-use-bbt, davinci-nand-buswidth >> are MTD generic. Correct names for them are: nand-ecc-mode, nand-on-flash-bbt, >> nand-bus-width accordingly. So rename them in dts and documentation. >> >> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> >> --- >> .../devicetree/bindings/mtd/davinci-nand.txt | 25 ++++++++++++++++---- >> drivers/mtd/nand/davinci_nand.c | 11 ++++++--- >> 2 files changed, 28 insertions(+), 8 deletions(-) >> >> diff --git a/Documentation/devicetree/bindings/mtd/davinci-nand.txt b/Documentation/devicetree/bindings/mtd/davinci-nand.txt >> index d2a3fc0..befaa5b 100644 >> --- a/Documentation/devicetree/bindings/mtd/davinci-nand.txt >> +++ b/Documentation/devicetree/bindings/mtd/davinci-nand.txt >> @@ -37,7 +37,7 @@ Recommended properties : >> - ti,davinci-mask-chipsel: mask for chipselect address. Needed to mask >> addresses for given chipselect. >> >> -- ti,davinci-ecc-mode: operation mode of the NAND ecc mode. ECC mode >> +- nand-ecc-mode: operation mode of the NAND ecc mode. ECC mode >> valid values for davinci driver: >> - "none" >> - "soft" >> @@ -45,10 +45,25 @@ Recommended properties : >> >> - ti,davinci-ecc-bits: used ECC bits, currently supported 1 or 4. >> >> -- ti,davinci-nand-buswidth: buswidth 8 or 16. > > Shouldn't we keep the documentation for existing bindings while just > marking them as deprecated? I haven't found any requirements about this in doc. It's done in both way in other drivers - some keep properties in bindings documentation and some are not. Regards, -grygorii
On 11/26/2013 12:30 PM, Grygorii Strashko wrote: > On 11/26/2013 09:03 AM, Sekhar Nori wrote: >> On Monday 11 November 2013 10:31 PM, Khoronzhuk, Ivan wrote: >>> The properties davinci-ecc-mode, davinci-nand-use-bbt, davinci-nand-buswidth >>> are MTD generic. Correct names for them are: nand-ecc-mode, nand-on-flash-bbt, >>> nand-bus-width accordingly. So rename them in dts and documentation. >>> >>> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> >>> --- >>> .../devicetree/bindings/mtd/davinci-nand.txt | 25 ++++++++++++++++---- >>> drivers/mtd/nand/davinci_nand.c | 11 ++++++--- >>> 2 files changed, 28 insertions(+), 8 deletions(-) >>> >>> diff --git a/Documentation/devicetree/bindings/mtd/davinci-nand.txt b/Documentation/devicetree/bindings/mtd/davinci-nand.txt >>> index d2a3fc0..befaa5b 100644 >>> --- a/Documentation/devicetree/bindings/mtd/davinci-nand.txt >>> +++ b/Documentation/devicetree/bindings/mtd/davinci-nand.txt >>> @@ -37,7 +37,7 @@ Recommended properties : >>> - ti,davinci-mask-chipsel: mask for chipselect address. Needed to mask >>> addresses for given chipselect. >>> >>> -- ti,davinci-ecc-mode: operation mode of the NAND ecc mode. ECC mode >>> +- nand-ecc-mode: operation mode of the NAND ecc mode. ECC mode >>> valid values for davinci driver: >>> - "none" >>> - "soft" >>> @@ -45,10 +45,25 @@ Recommended properties : >>> >>> - ti,davinci-ecc-bits: used ECC bits, currently supported 1 or 4. >>> >>> -- ti,davinci-nand-buswidth: buswidth 8 or 16. >> >> Shouldn't we keep the documentation for existing bindings while just >> marking them as deprecated? > > I haven't found any requirements about this in doc. > It's done in both way in other drivers - some keep properties in bindings > documentation and some are not. > > Regards, > -grygorii > For me this is not needed, but for example from mtd: Documentation/devicetree/bindings/mtd/gpmc-nand.txt ,it contains deprecated properties, like a lot of others. And this sad me I should remain deprecated properties. Anyway if we have these properties in driver we should describe them.
diff --git a/Documentation/devicetree/bindings/mtd/davinci-nand.txt b/Documentation/devicetree/bindings/mtd/davinci-nand.txt index d2a3fc0..befaa5b 100644 --- a/Documentation/devicetree/bindings/mtd/davinci-nand.txt +++ b/Documentation/devicetree/bindings/mtd/davinci-nand.txt @@ -37,7 +37,7 @@ Recommended properties : - ti,davinci-mask-chipsel: mask for chipselect address. Needed to mask addresses for given chipselect. -- ti,davinci-ecc-mode: operation mode of the NAND ecc mode. ECC mode +- nand-ecc-mode: operation mode of the NAND ecc mode. ECC mode valid values for davinci driver: - "none" - "soft" @@ -45,10 +45,25 @@ Recommended properties : - ti,davinci-ecc-bits: used ECC bits, currently supported 1 or 4. -- ti,davinci-nand-buswidth: buswidth 8 or 16. +- nand-bus-width: buswidth 8 or 16. If not present 8. + +- nand-on-flash-bbt: use flash based bad block table support. OOB + identifier is saved in OOB area. If not present + false. + +Deprecated properties: + +- ti,davinci-ecc-mode: operation mode of the NAND ecc mode. ECC mode + valid values for davinci driver: + - "none" + - "soft" + - "hw" + +- ti,davinci-nand-buswidth: buswidth 8 or 16. If not present 8. - ti,davinci-nand-use-bbt: use flash based bad block table support. OOB - identifier is saved in OOB area. + identifier is saved in OOB area. If not present + false. Nand device bindings may contain additional sub-nodes describing partitions of the address space. See partition.txt for more detail. The NAND Flash timing @@ -66,9 +81,9 @@ nand_cs3@62000000 { ti,davinci-mask-ale = <0>; ti,davinci-mask-cle = <0>; ti,davinci-mask-chipsel = <0>; - ti,davinci-ecc-mode = "hw"; + nand-ecc-mode = "hw"; ti,davinci-ecc-bits = <4>; - ti,davinci-nand-use-bbt; + nand-on-flash-bbt; partition@180000 { label = "ubifs"; diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c index 9bcbaa9..78b8d66 100644 --- a/drivers/mtd/nand/davinci_nand.c +++ b/drivers/mtd/nand/davinci_nand.c @@ -534,7 +534,6 @@ static struct davinci_nand_pdata struct davinci_nand_pdata *pdata; const char *mode; u32 prop; - int len; pdata = devm_kzalloc(&pdev->dev, sizeof(struct davinci_nand_pdata), @@ -559,6 +558,8 @@ static struct davinci_nand_pdata "ti,davinci-mask-chipsel", &prop)) pdata->mask_chipsel = prop; if (!of_property_read_string(pdev->dev.of_node, + "nand-ecc-mode", &mode) || + !of_property_read_string(pdev->dev.of_node, "ti,davinci-ecc-mode", &mode)) { if (!strncmp("none", mode, 4)) pdata->ecc_mode = NAND_ECC_NONE; @@ -571,11 +572,15 @@ static struct davinci_nand_pdata "ti,davinci-ecc-bits", &prop)) pdata->ecc_bits = prop; if (!of_property_read_u32(pdev->dev.of_node, + "nand-bus-width", &prop) || + !of_property_read_u32(pdev->dev.of_node, "ti,davinci-nand-buswidth", &prop)) if (prop == 16) pdata->options |= NAND_BUSWIDTH_16; - if (of_find_property(pdev->dev.of_node, - "ti,davinci-nand-use-bbt", &len)) + if (of_property_read_bool(pdev->dev.of_node, + "nand-on-flash-bbt") || + of_property_read_bool(pdev->dev.of_node, + "ti,davinci-nand-use-bbt")) pdata->bbt_options = NAND_BBT_USE_FLASH; }
The properties davinci-ecc-mode, davinci-nand-use-bbt, davinci-nand-buswidth are MTD generic. Correct names for them are: nand-ecc-mode, nand-on-flash-bbt, nand-bus-width accordingly. So rename them in dts and documentation. Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> --- .../devicetree/bindings/mtd/davinci-nand.txt | 25 ++++++++++++++++---- drivers/mtd/nand/davinci_nand.c | 11 ++++++--- 2 files changed, 28 insertions(+), 8 deletions(-) -- 1.7.9.5