linux-mtd.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: Guillaume LECERF <glecerf@gmail.com>
To: linux-mtd@lists.infradead.org
Cc: Mike Albon <malbon@openwrt.org>,
	Daniel Dickinson <cshore@csolve.net>,
	David Woodhouse <dwmw2@infradead.org>,
	Florian Fainelli <florian@openwrt.org>
Subject: [PATCH] mtd: bcm963xx-flash: try JEDEC probe if CFI fails
Date: Fri, 29 Oct 2010 16:17:49 +0200	[thread overview]
Message-ID: <20101029141749.23774.90495.stgit@dev.siriade.com> (raw)

Signed-off-by: Guillaume LECERF <glecerf@gmail.com>
---
 drivers/mtd/maps/bcm963xx-flash.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/drivers/mtd/maps/bcm963xx-flash.c b/drivers/mtd/maps/bcm963xx-flash.c
index d175c12..1f30495 100644
--- a/drivers/mtd/maps/bcm963xx-flash.c
+++ b/drivers/mtd/maps/bcm963xx-flash.c
@@ -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 */

             reply	other threads:[~2010-10-29 14:19 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-10-29 14:17 Guillaume LECERF [this message]
2010-10-29 16:32 ` [PATCH] mtd: bcm963xx-flash: try JEDEC probe if CFI fails Florian Fainelli
2010-11-13  9:39 ` Artem Bityutskiy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20101029141749.23774.90495.stgit@dev.siriade.com \
    --to=glecerf@gmail.com \
    --cc=cshore@csolve.net \
    --cc=dwmw2@infradead.org \
    --cc=florian@openwrt.org \
    --cc=linux-mtd@lists.infradead.org \
    --cc=malbon@openwrt.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).