* [PATCH] mtd: bcm963xx-flash: try JEDEC probe if CFI fails
@ 2010-10-29 14:17 Guillaume LECERF
2010-10-29 16:32 ` Florian Fainelli
2010-11-13 9:39 ` Artem Bityutskiy
0 siblings, 2 replies; 3+ messages in thread
From: Guillaume LECERF @ 2010-10-29 14:17 UTC (permalink / raw)
To: linux-mtd; +Cc: Mike Albon, Daniel Dickinson, David Woodhouse, Florian Fainelli
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 */
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] mtd: bcm963xx-flash: try JEDEC probe if CFI fails
2010-10-29 14:17 [PATCH] mtd: bcm963xx-flash: try JEDEC probe if CFI fails Guillaume LECERF
@ 2010-10-29 16:32 ` Florian Fainelli
2010-11-13 9:39 ` Artem Bityutskiy
1 sibling, 0 replies; 3+ messages in thread
From: Florian Fainelli @ 2010-10-29 16:32 UTC (permalink / raw)
To: Guillaume LECERF; +Cc: Mike Albon, Daniel Dickinson, linux-mtd, David Woodhouse
On Friday 29 October 2010 16:17:49 Guillaume LECERF wrote:
> Signed-off-by: Guillaume LECERF <glecerf@gmail.com>
Acked-by: Florian Fainelli <florian@openwrt.org>
> ---
> 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 */
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] mtd: bcm963xx-flash: try JEDEC probe if CFI fails
2010-10-29 14:17 [PATCH] mtd: bcm963xx-flash: try JEDEC probe if CFI fails Guillaume LECERF
2010-10-29 16:32 ` Florian Fainelli
@ 2010-11-13 9:39 ` Artem Bityutskiy
1 sibling, 0 replies; 3+ messages in thread
From: Artem Bityutskiy @ 2010-11-13 9:39 UTC (permalink / raw)
To: Guillaume LECERF
Cc: Mike Albon, Daniel Dickinson, linux-mtd, David Woodhouse,
Florian Fainelli
On Fri, 2010-10-29 at 16:17 +0200, Guillaume LECERF wrote:
> Signed-off-by: Guillaume LECERF <glecerf@gmail.com>
> ---
> drivers/mtd/maps/bcm963xx-flash.c | 5 +++++
> 1 files changed, 5 insertions(+), 0 deletions(-)
Pushed to l2-mtd-2.6.git, thanks you.
--
Best Regards,
Artem Bityutskiy (Артём Битюцкий)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-11-13 9:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-29 14:17 [PATCH] mtd: bcm963xx-flash: try JEDEC probe if CFI fails Guillaume LECERF
2010-10-29 16:32 ` Florian Fainelli
2010-11-13 9:39 ` Artem Bityutskiy
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).