linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 12/14] omap3: Zoom2/3: Update hsmmc board config params
Date: Fri, 11 Dec 2009 15:54:39 -0800	[thread overview]
Message-ID: <20091211235439.3189.64256.stgit@localhost> (raw)
In-Reply-To: <20091211234919.3189.95607.stgit@localhost>

From: Madhusudhan Chikkature <madhu.cr@ti.com>

Update the hsmmc zoom peripheral configuration to support:
Power saving mode
mmc2 8-bit support
Configure mmc2 as non removable

Signed-off-by: Madhusudhan Chikkature <madhu.cr@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/mach-omap2/board-zoom-peripherals.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c
index 221a8e3..258794d 100755
--- a/arch/arm/mach-omap2/board-zoom-peripherals.c
+++ b/arch/arm/mach-omap2/board-zoom-peripherals.c
@@ -152,14 +152,20 @@ static struct regulator_init_data zoom_vsim = {
 
 static struct twl4030_hsmmc_info mmc[] __initdata = {
 	{
+		.name		= "external",
 		.mmc		= 1,
 		.wires		= 4,
 		.gpio_wp	= -EINVAL,
+		.power_saving	= true,
 	},
 	{
+		.name		= "internal",
 		.mmc		= 2,
-		.wires		= 4,
+		.wires		= 8,
+		.gpio_cd	= -EINVAL,
 		.gpio_wp	= -EINVAL,
+		.nonremovable	= true,
+		.power_saving	= true,
 	},
 	{}      /* Terminator */
 };
@@ -167,11 +173,8 @@ static struct twl4030_hsmmc_info mmc[] __initdata = {
 static int zoom_twl_gpio_setup(struct device *dev,
 		unsigned gpio, unsigned ngpio)
 {
-	/* gpio + 0 is "mmc0_cd" (input/IRQ),
-	 * gpio + 1 is "mmc1_cd" (input/IRQ)
-	 */
+	/* gpio + 0 is "mmc0_cd" (input/IRQ) */
 	mmc[0].gpio_cd = gpio + 0;
-	mmc[1].gpio_cd = gpio + 1;
 	twl4030_mmc_init(mmc);
 
 	/* link regulators to MMC adapters ... we "know" the

  parent reply	other threads:[~2009-12-11 23:54 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-12-11 23:52 [PATCH 00/14] Mostly fixes for 2.6.33 Tony Lindgren
2009-12-11 23:52 ` [PATCH 01/14] omap3: cm-t35: add mux initialization Tony Lindgren
2009-12-11 23:52 ` [PATCH 02/14] OMAP3: serial - allow platforms specify which UARTs to initialize Tony Lindgren
2009-12-11 23:52 ` [PATCH 03/14] omap: Correcting GPMC_CONFIG1_DEVICETYPE_NAND Tony Lindgren
2009-12-11 23:53 ` [PATCH 04/14] omap: arch/arm/plat-omap/devices.c - sort alphabetically Tony Lindgren
2009-12-11 23:53 ` [PATCH 05/14] omap: header: remove unused data-type Tony Lindgren
2009-12-11 23:53 ` [PATCH 06/14] omap1: LCD_DMA: Use some define rather than a hexadecimal Tony Lindgren
2009-12-11 23:53 ` [PATCH 07/14] omap1: htcherald: Update defconfig to include mux support Tony Lindgren
2009-12-11 23:53 ` [PATCH 08/14] omap3: zoom2/3: make MMC slot work again Tony Lindgren
2009-12-11 23:54 ` [PATCH 09/14] omap3: rx51: Use wl1251 in SPI mode 3 Tony Lindgren
2009-12-11 23:54 ` [PATCH 10/14] omap3: id code detection 3525 vs 3515 Tony Lindgren
2009-12-11 23:54 ` [PATCH 11/14] omap3 : Enable TWL4030 Keypad for Zoom2 and Zoom3 boards Tony Lindgren
2009-12-11 23:54 ` Tony Lindgren [this message]
2009-12-12  0:09 ` [PATCH 13/14] omap: serial: fix non-empty uart fifo read abort Tony Lindgren
2009-12-12  0:10 ` [PATCH 14/14] omap3: Fix OMAP35XX_REV macros 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=20091211235439.3189.64256.stgit@localhost \
    --to=tony@atomide.com \
    --cc=linux-arm-kernel@lists.infradead.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).