Commit 3345cc4f authored by Guillaume LECERF's avatar Guillaume LECERF Committed by David Woodhouse
Browse files

mtd: bcm963xx-flash: try JEDEC probe if CFI fails 



Signed-off-by: default avatarGuillaume LECERF <glecerf@gmail.com>
Acked-by: default avatarFlorian Fainelli <florian@openwrt.org>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 79346507

drivers/mtd/maps/bcm963xx-flash.c

+5 −0
Original line number Diff line number Diff line
@@ -196,10 +196,15 @@ static int bcm963xx_probe(struct platform_device *pdev) 
	bcm963xx_mtd_info = do_map_probe("cfi_probe", &bcm963xx_map);

	if (!bcm963xx_mtd_info) {

		dev_err(&pdev->dev, "failed to probe using CFI\n");

		bcm963xx_mtd_info = do_map_probe("jedec_probe", &bcm963xx_map);

		if (bcm963xx_mtd_info)

			goto probe_ok;

		dev_err(&pdev->dev, "failed to probe using JEDEC\n");

		err = -EIO;

		goto err_probe;

	}



probe_ok:

	bcm963xx_mtd_info->owner = THIS_MODULE;



	/* This is mutually exclusive */

CRA Git | Maintained and supported by SUSTech CRA and CCSE