From: Mark Rutland <mark.rutland@arm.com>
To: Tony Lindgren <tony@atomide.com>
Cc: "linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>,
Chris Ball <cjb@laptop.org>,
"linux-mmc@vger.kernel.org" <linux-mmc@vger.kernel.org>
Subject: Re: [PATCH 3/8] mmc: omap: Fix I2C dependency and make driver usable with device tree
Date: Thu, 14 Nov 2013 11:05:33 +0000 [thread overview]
Message-ID: <20131114110533.GD16396@e106331-lin.cambridge.arm.com> (raw)
In-Reply-To: <1384396537-3486-4-git-send-email-tony@atomide.com>
On Thu, Nov 14, 2013 at 02:35:32AM +0000, Tony Lindgren wrote:
> Some features can be configured by the companion I2C chips,
> which may not be available at the probe time. Fix the issue
> by returning -EPROBE_DEFER when the MMC controller slots
> are not configured.
>
> While at it, let's also add minimal device tree support so
> omap24xx platforms can use this driver without legacy mode
> since we claim to support device tree for mach-omap2 based
> systems.
>
> Although adding the minimal device tree support is not strictly
> a fix, it does remove one of the last blockers for dropping a
> bunch of legacy platform data for mach-omap2.
>
> Cc: Chris Ball <cjb@laptop.org>
> Cc: linux-mmc@vger.kernel.org
> Signed-off-by: Tony Lindgren <tony@atomide.com>
> ---
>
> If this looks OK, I'd like to merge this as a fix via arm-soc tree
> along with the other patches in this series as my later patches
> depend on patches in this series.
>
> ---
> drivers/mmc/host/omap.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
> index ed56868..43c66ad 100644
> --- a/drivers/mmc/host/omap.c
> +++ b/drivers/mmc/host/omap.c
> @@ -22,6 +22,7 @@
> #include <linux/delay.h>
> #include <linux/spinlock.h>
> #include <linux/timer.h>
> +#include <linux/of.h>
> #include <linux/omap-dma.h>
> #include <linux/mmc/host.h>
> #include <linux/mmc/card.h>
> @@ -1330,7 +1331,7 @@ static int mmc_omap_probe(struct platform_device *pdev)
> }
> if (pdata->nr_slots == 0) {
> dev_err(&pdev->dev, "no slots\n");
> - return -ENXIO;
> + return -EPROBE_DEFER;
> }
>
> res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> @@ -1553,6 +1554,12 @@ static int mmc_omap_resume(struct platform_device *pdev)
> #define mmc_omap_resume NULL
> #endif
>
> +#if IS_BUILTIN(CONFIG_OF)
> +static const struct of_device_id mmc_omap_match[] = {
> + { .compatible = "ti,omap2420-mmc", },
Missing binding document.
Thanks,
Mark.
WARNING: multiple messages have this Message-ID (diff)
From: mark.rutland@arm.com (Mark Rutland)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/8] mmc: omap: Fix I2C dependency and make driver usable with device tree
Date: Thu, 14 Nov 2013 11:05:33 +0000 [thread overview]
Message-ID: <20131114110533.GD16396@e106331-lin.cambridge.arm.com> (raw)
In-Reply-To: <1384396537-3486-4-git-send-email-tony@atomide.com>
On Thu, Nov 14, 2013 at 02:35:32AM +0000, Tony Lindgren wrote:
> Some features can be configured by the companion I2C chips,
> which may not be available at the probe time. Fix the issue
> by returning -EPROBE_DEFER when the MMC controller slots
> are not configured.
>
> While at it, let's also add minimal device tree support so
> omap24xx platforms can use this driver without legacy mode
> since we claim to support device tree for mach-omap2 based
> systems.
>
> Although adding the minimal device tree support is not strictly
> a fix, it does remove one of the last blockers for dropping a
> bunch of legacy platform data for mach-omap2.
>
> Cc: Chris Ball <cjb@laptop.org>
> Cc: linux-mmc at vger.kernel.org
> Signed-off-by: Tony Lindgren <tony@atomide.com>
> ---
>
> If this looks OK, I'd like to merge this as a fix via arm-soc tree
> along with the other patches in this series as my later patches
> depend on patches in this series.
>
> ---
> drivers/mmc/host/omap.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
> index ed56868..43c66ad 100644
> --- a/drivers/mmc/host/omap.c
> +++ b/drivers/mmc/host/omap.c
> @@ -22,6 +22,7 @@
> #include <linux/delay.h>
> #include <linux/spinlock.h>
> #include <linux/timer.h>
> +#include <linux/of.h>
> #include <linux/omap-dma.h>
> #include <linux/mmc/host.h>
> #include <linux/mmc/card.h>
> @@ -1330,7 +1331,7 @@ static int mmc_omap_probe(struct platform_device *pdev)
> }
> if (pdata->nr_slots == 0) {
> dev_err(&pdev->dev, "no slots\n");
> - return -ENXIO;
> + return -EPROBE_DEFER;
> }
>
> res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> @@ -1553,6 +1554,12 @@ static int mmc_omap_resume(struct platform_device *pdev)
> #define mmc_omap_resume NULL
> #endif
>
> +#if IS_BUILTIN(CONFIG_OF)
> +static const struct of_device_id mmc_omap_match[] = {
> + { .compatible = "ti,omap2420-mmc", },
Missing binding document.
Thanks,
Mark.
next prev parent reply other threads:[~2013-11-14 11:05 UTC|newest]
Thread overview: 98+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-14 2:35 [PATCH 0/8] Various omap device tree usability fixes for v3.13 merge window Tony Lindgren
2013-11-14 2:35 ` Tony Lindgren
2013-11-14 2:35 ` [PATCH 1/8] net: smc91x: Fix device tree based configuration so it's usable Tony Lindgren
2013-11-14 2:35 ` Tony Lindgren
2013-11-14 11:03 ` Mark Rutland
2013-11-14 11:03 ` Mark Rutland
2013-11-14 16:08 ` Tony Lindgren
2013-11-14 16:08 ` Tony Lindgren
2013-11-16 15:16 ` Tony Lindgren
2013-11-16 15:16 ` Tony Lindgren
2013-11-27 18:36 ` Tony Lindgren
2013-11-27 18:36 ` Tony Lindgren
2013-11-14 2:35 ` [PATCH 2/8] mmc: omap: Fix DMA configuration to not rely on device id Tony Lindgren
2013-11-14 2:35 ` Tony Lindgren
2013-11-18 18:47 ` Tony Lindgren
2013-11-18 18:47 ` Tony Lindgren
2013-11-26 23:33 ` Chris Ball
2013-11-26 23:33 ` Chris Ball
2013-11-26 23:52 ` Tony Lindgren
2013-11-26 23:52 ` Tony Lindgren
2013-11-27 20:57 ` Jarkko Nikula
2013-11-27 20:57 ` Jarkko Nikula
2013-11-27 21:37 ` Tony Lindgren
2013-11-27 21:37 ` Tony Lindgren
2013-11-28 17:02 ` Jarkko Nikula
2013-11-28 17:02 ` Jarkko Nikula
2013-11-29 16:34 ` Tony Lindgren
2013-11-29 16:34 ` Tony Lindgren
2013-11-27 21:47 ` Chris Ball
2013-11-27 21:47 ` Chris Ball
2013-11-27 21:59 ` Tony Lindgren
2013-11-27 21:59 ` Tony Lindgren
2013-11-28 16:13 ` Jarkko Nikula
2013-11-28 16:13 ` Jarkko Nikula
2013-11-29 17:13 ` Tony Lindgren
2013-11-29 17:13 ` Tony Lindgren
2013-11-30 0:38 ` Joel Fernandes
2013-11-30 0:38 ` Joel Fernandes
2013-11-30 17:33 ` Tony Lindgren
2013-11-30 17:33 ` Tony Lindgren
2013-11-14 2:35 ` [PATCH 3/8] mmc: omap: Fix I2C dependency and make driver usable with device tree Tony Lindgren
2013-11-14 2:35 ` Tony Lindgren
2013-11-14 11:05 ` Mark Rutland [this message]
2013-11-14 11:05 ` Mark Rutland
2013-11-14 17:25 ` Tony Lindgren
2013-11-14 17:25 ` Tony Lindgren
2013-11-26 23:34 ` Chris Ball
2013-11-26 23:34 ` Chris Ball
[not found] ` <1384396537-3486-1-git-send-email-tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2013-11-14 2:35 ` [PATCH 4/8] i2c: omap: Fix missing device tree flags for omap2 Tony Lindgren
2013-11-14 2:35 ` Tony Lindgren
[not found] ` <1384396537-3486-5-git-send-email-tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2013-11-14 6:58 ` Wolfram Sang
2013-11-14 6:58 ` Wolfram Sang
2013-11-14 17:34 ` Tony Lindgren
2013-11-14 17:34 ` Tony Lindgren
[not found] ` <20131114173429.GF10317-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2013-11-14 17:49 ` Wolfram Sang
2013-11-14 17:49 ` Wolfram Sang
2013-11-14 17:53 ` Tony Lindgren
2013-11-14 17:53 ` Tony Lindgren
2013-11-14 11:07 ` Mark Rutland
2013-11-14 11:07 ` Mark Rutland
2013-11-14 17:30 ` Tony Lindgren
2013-11-14 17:30 ` Tony Lindgren
2013-11-14 2:35 ` [PATCH 5/8] gpio: twl4030: Fix regression for twl gpio output Tony Lindgren
2013-11-14 2:35 ` Tony Lindgren
2013-11-14 9:45 ` Peter Ujfalusi
2013-11-14 9:45 ` Peter Ujfalusi
2013-11-14 17:37 ` Tony Lindgren
2013-11-14 17:37 ` Tony Lindgren
2013-11-18 22:45 ` Linus Walleij
2013-11-18 22:45 ` Linus Walleij
2013-12-03 13:30 ` Roger Quadros
2013-12-03 13:30 ` Roger Quadros
2013-12-09 13:09 ` Linus Walleij
2013-12-09 13:09 ` Linus Walleij
2013-12-09 17:10 ` Tony Lindgren
2013-12-09 17:10 ` Tony Lindgren
2013-12-10 12:17 ` Linus Walleij
2013-12-10 12:17 ` Linus Walleij
2013-12-10 15:20 ` Tony Lindgren
2013-12-10 15:20 ` Tony Lindgren
2013-11-14 2:35 ` [PATCH 6/8] gpio: twl4030: Fix passing of pdata in the device tree case Tony Lindgren
2013-11-14 2:35 ` Tony Lindgren
2013-11-18 18:27 ` Tony Lindgren
2013-11-18 18:27 ` Tony Lindgren
2013-11-18 22:46 ` Linus Walleij
2013-11-18 22:46 ` Linus Walleij
2013-11-14 2:35 ` [PATCH 7/8] ARM: OMAP2+: Fix GPMC and simplify bootloader timings for 8250 and smc91x Tony Lindgren
2013-11-14 2:35 ` Tony Lindgren
2013-11-14 2:35 ` [PATCH 8/8] ARM: dts: Fix omap2 specific dtsi files by adding the missing entries Tony Lindgren
2013-11-14 2:35 ` Tony Lindgren
2013-11-14 23:08 ` [PATCH 9/8] i2c: Fix device tree binding for i2c-cbus-gpio Tony Lindgren
2013-11-14 23:08 ` Tony Lindgren
[not found] ` <20131114230842.GU10317-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2013-11-15 18:49 ` Aaro Koskinen
2013-11-15 18:49 ` Aaro Koskinen
2013-11-15 22:26 ` Wolfram Sang
2013-11-15 22:26 ` Wolfram Sang
2013-11-15 22:30 ` Tony Lindgren
2013-11-15 22:30 ` Tony Lindgren
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=20131114110533.GD16396@e106331-lin.cambridge.arm.com \
--to=mark.rutland@arm.com \
--cc=cjb@laptop.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=tony@atomide.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.