On 12/17/2013 10:50 AM, Brian Norris wrote:

On Thu, Dec 05, 2013 at 07:25:55PM +0200, Ivan Khoronzhuk wrote:

quoted

--- a/drivers/mtd/nand/davinci_nand.c
+++ b/drivers/mtd/nand/davinci_nand.c

@@ -558,6 +557,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) ||

Is it possible to use the of_get_nand_ecc_mode() helper? It's
unfortunate that davinci_nand had to use custom bindings in the first
place, making this more difficult... So I can take this patch as-is.

Yes, I will do nothing for that

quoted

+		    !of_property_read_string(pdev->dev.of_node,
  			"ti,davinci-ecc-mode", &mode)) {
  			if (!strncmp("none", mode, 4))
  				pdata->ecc_mode = NAND_ECC_NONE;

@@ -570,11 +571,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) ||

Similar story here, with of_get_nand_bus_width().

It seems for bus width I can replace it on:

prop = of_get_nand_bus_width(pdev->dev.of_node);
if ( 0 < prop || !of_property_read_u32(pdev->dev.of_node,
	     "ti,davinci-nand-buswidth", &prop))
     if (prop == 16)
	     pdata->options |= NAND_BUSWIDTH_16;

quoted

+		    !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;
  	}
  

Brian

-- 
Regards,
Ivan Khoronzhuk