From patchwork Tue Mar 10 21:13:52 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 10981 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n2ALCcE3025111 for ; Tue, 10 Mar 2009 21:13:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751741AbZCJVNy (ORCPT ); Tue, 10 Mar 2009 17:13:54 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753941AbZCJVNy (ORCPT ); Tue, 10 Mar 2009 17:13:54 -0400 Received: from mho-01-bos.mailhop.org ([63.208.196.178]:59790 "EHLO mho-01-bos.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751741AbZCJVNx (ORCPT ); Tue, 10 Mar 2009 17:13:53 -0400 Received: from c-69-181-40-92.hsd1.ca.comcast.net ([69.181.40.92] helo=[127.0.0.1]) by mho-01-bos.mailhop.org with esmtpa (Exim 4.68) (envelope-from ) id 1Lh9Gp-000BbS-OK; Tue, 10 Mar 2009 21:13:51 +0000 X-Mail-Handler: MailHop Outbound by DynDNS X-Originating-IP: 69.181.40.92 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/mailhop/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1+E7uCbKUxE6iPEUhgiMshr Subject: [PATCH 10/12] ARM: OMAP3: mmc-twl4030 allow arbitrary slot names To: linux-arm-kernel@lists.arm.linux.org.uk From: Tony Lindgren Cc: David Brownell , linux-omap@vger.kernel.org, Adrian Hunter Date: Tue, 10 Mar 2009 14:13:52 -0700 Message-ID: <20090310211352.16425.44160.stgit@localhost> In-Reply-To: <20090310205824.16425.97745.stgit@localhost> References: <20090310205824.16425.97745.stgit@localhost> User-Agent: StGit/0.14.3.343.g0584 MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org From: Adrian Hunter Signed-off-by: Adrian Hunter Acked-by: David Brownell Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/mmc-twl4030.c | 5 ++++- arch/arm/mach-omap2/mmc-twl4030.h | 1 + 2 files changed, 5 insertions(+), 1 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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 */ };