All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tony Lindgren <tony@atomide.com>
To: linux-arm-kernel@lists.arm.linux.org.uk
Cc: David Brownell <dbrownell@users.sourceforge.net>,
	linux-omap@vger.kernel.org,
	Adrian Hunter <adrian.hunter@nokia.com>
Subject: [PATCH 10/12] ARM: OMAP3: mmc-twl4030 allow arbitrary slot names
Date: Tue, 10 Mar 2009 14:13:52 -0700	[thread overview]
Message-ID: <20090310211352.16425.44160.stgit@localhost> (raw)
In-Reply-To: <20090310205824.16425.97745.stgit@localhost>

From: Adrian Hunter <adrian.hunter@nokia.com>

Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/mach-omap2/mmc-twl4030.c |    5 ++++-
 arch/arm/mach-omap2/mmc-twl4030.h |    1 +
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c
index 9f53d22..9831b2b 100644
--- a/arch/arm/mach-omap2/mmc-twl4030.c
+++ b/arch/arm/mach-omap2/mmc-twl4030.c
@@ -402,7 +402,10 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers)
 			return;
 		}
 
-		sprintf(twl->name, "mmc%islot%i", c->mmc, 1);
+		if (c->name)
+			strncpy(twl->name, c->name, HSMMC_NAME_LEN);
+		else
+			sprintf(twl->name, "mmc%islot%i", c->mmc, 1);
 		mmc->slots[0].name = twl->name;
 		mmc->nr_slots = 1;
 		mmc->slots[0].wires = c->wires;
diff --git a/arch/arm/mach-omap2/mmc-twl4030.h b/arch/arm/mach-omap2/mmc-twl4030.h
index 0aa1686..ea59e86 100644
--- a/arch/arm/mach-omap2/mmc-twl4030.h
+++ b/arch/arm/mach-omap2/mmc-twl4030.h
@@ -14,6 +14,7 @@ struct twl4030_hsmmc_info {
 	bool	cover_only;	/* No card detect - just cover switch */
 	int	gpio_cd;	/* or -EINVAL */
 	int	gpio_wp;	/* or -EINVAL */
+	char	*name;		/* or NULL for default */
 	struct device *dev;	/* returned: pointer to mmc adapter */
 };
 


  parent reply	other threads:[~2009-03-10 21:13 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-10 21:00 [PATCH 00/12] Omap3 updates for the merge window after 2.6.29 Tony Lindgren
2009-03-10 21:02 ` [PATCH 01/12] ARM: OMAP3: Remove unused CONFIG_I2C2_OMAP_BEAGLE Tony Lindgren
2009-03-10 21:03 ` [PATCH 02/12] ARM: OMAP3: Store reboot mode in scratchpad on OMAP34xx Tony Lindgren
2009-03-15 15:51   ` Russell King - ARM Linux
2009-03-16 16:07     ` Juha Yrjola
2009-03-16 17:10       ` Russell King - ARM Linux
2009-03-16 17:40         ` Juha Yrjola
2009-03-16 22:21           ` Russell King - ARM Linux
2009-03-18 18:28             ` Tony Lindgren
2009-03-18 19:26               ` Russell King - ARM Linux
2009-03-18 20:10                 ` Tony Lindgren
2009-03-18 20:15                   ` Tony Lindgren
2009-03-19  0:08                   ` Russell King - ARM Linux
2009-03-19 15:56                     ` Tony Lindgren
2009-03-24  1:11   ` Tony Lindgren
2009-03-10 21:04 ` [PATCH 03/12] ARM: OMAP3: Add more GPIO mux options Tony Lindgren
2009-03-10 21:06 ` [PATCH 04/12] ARM: OMAP3: mmc-twl4030 fix name buffer length Tony Lindgren
2009-03-15 16:00   ` Russell King - ARM Linux
2009-03-16 10:04     ` Adrian Hunter
2009-03-16 10:14       ` Russell King - ARM Linux
2009-03-16 17:42         ` Tony Lindgren
2009-03-16 22:22           ` Russell King - ARM Linux
2009-03-10 21:07 ` [PATCH 05/12] ARM: OMAP3: mmc-twl4030 voltage cleanup Tony Lindgren
2009-03-10 21:08 ` [PATCH 06/12] ARM: OMAP3: mmc-twl4030 init passes device nodes back Tony Lindgren
2009-03-15 16:02   ` Russell King - ARM Linux
2009-03-16 17:44     ` Tony Lindgren
2009-03-16 22:22       ` Russell King - ARM Linux
2009-03-10 21:10 ` [PATCH 07/12] ARM: OMAP3: mmc-twl4030 add MMC3 support Tony Lindgren
2009-03-15 16:04   ` Russell King - ARM Linux
2009-03-15 17:27     ` Grazvydas Ignotas
2009-03-15 17:40       ` Russell King - ARM Linux
2009-03-16 17:56         ` [PATCH 07/12] ARM: OMAP3: mmc-twl4030 add MMC3 support, v2 Tony Lindgren
2009-03-10 21:11 ` [PATCH 08/12] ARM: OMAP3: mmc-twl4030 fix for vmmc = 0 Tony Lindgren
2009-03-10 21:12 ` [PATCH 09/12] ARM: OMAP3: mmc-twl4030 add cover switch Tony Lindgren
2009-03-10 21:13 ` Tony Lindgren [this message]
2009-03-15 16:08   ` [PATCH 10/12] ARM: OMAP3: mmc-twl4030 allow arbitrary slot names Russell King - ARM Linux
2009-03-16 10:04     ` Adrian Hunter
2009-03-16 10:05     ` Adrian Hunter
2009-03-16 10:16       ` Russell King - ARM Linux
2009-03-16 18:01         ` Tony Lindgren
2009-03-10 21:15 ` [PATCH 11/12] ARM: OMAP3: Add base address definitions and resources for OMAP 3 IS Tony Lindgren
2009-03-24  1:37   ` [PATCH 11/12] ARM: OMAP3: Add base address definitions and resources for OMAP 3 IS, v2 Tony Lindgren
2009-03-10 21:16 ` [PATCH 12/12] ARM: OMAP3: MUSB initialization for omap hw Tony Lindgren
2009-03-15 16:14   ` Russell King - ARM Linux
2009-03-15 18:46     ` David Brownell
2009-03-16 22:42       ` [PATCH] ARM: OMAP: Add name for musb clocks Tony Lindgren
2009-05-12 17:40         ` [APPLIED] " Tony Lindgren
2009-03-16 22:37     ` [PATCH 12/12] ARM: OMAP3: MUSB initialization for omap hw, v2 Tony Lindgren
2009-03-24  2:51 ` [PATCH 00/12] Omap3 updates for the merge window after 2.6.29 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=20090310211352.16425.44160.stgit@localhost \
    --to=tony@atomide.com \
    --cc=adrian.hunter@nokia.com \
    --cc=dbrownell@users.sourceforge.net \
    --cc=linux-arm-kernel@lists.arm.linux.org.uk \
    --cc=linux-omap@vger.kernel.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 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.