native support for wl1271 on ZOOM

Make this go away:

drivers/mmc/host/omap_hsmmc.c: In function 'omap_hsmmc_suspend':
drivers/mmc/host/omap_hsmmc.c:2328: warning: unused variable 'state'

Signed-off-by Ohad Ben-Cohen <[email protected]>

---
 drivers/mmc/host/omap_hsmmc.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

drivers/mmc/host/omap_hsmmc.c +0 -1

index b032828..d50e917 100644
@@ -2272,7 +2272,6 @@ static int omap_hsmmc_suspend(struct device *dev)
 	int ret = 0;
 	struct platform_device *pdev = to_platform_device(dev);
 	struct omap_hsmmc_host *host = platform_get_drvdata(pdev);
-	pm_message_t state = PMSG_SUSPEND; /* unused by MMC core */
 
 	if (host && host->suspended)
 		return 0;

Quoted 5 lines · Ohad Ben-Cohen

Make this go away:

drivers/mmc/host/omap_hsmmc.c: In function 'omap_hsmmc_suspend':
drivers/mmc/host/omap_hsmmc.c:2328: warning: unused variable 'state'

Was done a while ago.

See 1a13f8fa76c880be41d6b1e6a2b44404bcbfdf9e in linus' tree.

Quoted 18 lines

Signed-off-by Ohad Ben-Cohen <[email protected]>

---
?drivers/mmc/host/omap_hsmmc.c | ? ?1 -
?1 files changed, 0 insertions(+), 1 deletions(-)

drivers/mmc/host/omap_hsmmc.c +0 -1

index b032828..d50e917 100644
@@ -2272,7 +2272,6 @@ static int omap_hsmmc_suspend(struct device *dev)
 ? ? ? ?int ret = 0;
 ? ? ? ?struct platform_device *pdev = to_platform_device(dev);
 ? ? ? ?struct omap_hsmmc_host *host = platform_get_drvdata(pdev);
- ? ? ? pm_message_t state = PMSG_SUSPEND; /* unused by MMC core */
 ? ? ? ?if (host && host->suspended)
 ? ? ? ? ? ? ? ?return 0;

Quoted 6 lines · Adrian Hunter

Quoted 4 lines · Ohad Ben-Cohen

Make this go away:

drivers/mmc/host/omap_hsmmc.c: In function 'omap_hsmmc_suspend':
drivers/mmc/host/omap_hsmmc.c:2328: warning: unused variable 'state'

Was done a while ago.

Are you sure ?

I can still see the unused state variable in Linus' tree:

http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;f=drivers/mmc/host/omap_hsmmc.c;h=b032828c61263028963bd412a7455546d5e86ce7;hb=HEAD#l2275

Quoted 1 line

See 1a13f8fa76c880be41d6b1e6a2b44404bcbfdf9e in linus' tree.

This commit only seem to adapt to the API change (the state variable is not removed):

drivers/mmc/host/omap_hsmmc.c +1 -1

index d25b19b..b032828 100644
@@ -2292,7 +2292,7 @@ static int omap_hsmmc_suspend(struct device *dev)
                }
                cancel_work_sync(&host->mmc_carddetect_work);
                mmc_host_enable(host->mmc);
-               ret = mmc_suspend_host(host->mmc, state);
+               ret = mmc_suspend_host(host->mmc);
                if (ret == 0) {
                        omap_hsmmc_disable_irq(host);
                        OMAP_HSMMC_WRITE(host->base, HCTL,

Quoted 18 lines

Quoted 17 lines

Signed-off-by Ohad Ben-Cohen <[email protected]>

---
 drivers/mmc/host/omap_hsmmc.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

drivers/mmc/host/omap_hsmmc.c +0 -1

index b032828..d50e917 100644
@@ -2272,7 +2272,6 @@ static int omap_hsmmc_suspend(struct device *dev)
       int ret = 0;
       struct platform_device *pdev = to_platform_device(dev);
       struct omap_hsmmc_host *host = platform_get_drvdata(pdev);
-       pm_message_t state = PMSG_SUSPEND; /* unused by MMC core */
       if (host && host->suspended)
               return 0;

Prepare for mmc3 regulator power control by splitting the power control functions of mmc2 and mmc3, and expecting mmc3 to have a single, dedicated, regulator support.

Signed-off-by Ohad Ben-Cohen<[email protected]>

---
  arch/arm/mach-omap2/hsmmc.c   |   10 ++++--
  drivers/mmc/host/omap_hsmmc.c |   67 ++++++++++++++++++++++++++++++++++++----
  2 files changed, 66 insertions(+), 11 deletions(-)

arch/arm/mach-omap2/hsmmc.c +6 -4

index 1ef54b0..5d3d789 100644
@@ -174,7 +174,7 @@ static void omap4_hsmmc1_after_set_reg(struct device *dev, int slot,
  	}
  }
 
-static void hsmmc23_before_set_reg(struct device *dev, int slot,
+static void hsmmc2_before_set_reg(struct device *dev, int slot,
  				   int power_on, int vdd)
  {
  	struct omap_mmc_platform_data *mmc = dev->platform_data;

@@ -325,14 +325,16 @@ void __init omap2_hsmmc_init(struct omap2_hsmmc_info *controllers)
  				c->transceiver = 1;
  			if (c->transceiver&&  c->wires>  4)
  				c->wires = 4;
-			/* FALLTHROUGH */
-		case 3:
  			if (mmc->slots[0].features&  HSMMC_HAS_PBIAS) {
  				/* off-chip level shifting, or none */
-				mmc->slots[0].before_set_reg = hsmmc23_before_set_reg;
+				mmc->slots[0].before_set_reg = hsmmc2_before_set_reg;
  				mmc->slots[0].after_set_reg = NULL;
  			}
  			break;
+		case 3:
+			mmc->slots[0].before_set_reg = NULL;
+			mmc->slots[0].after_set_reg = NULL;
+			break;
  		default:
  			pr_err("MMC%d configuration not supported!\n", c->mmc);
  			kfree(mmc);

drivers/mmc/host/omap_hsmmc.c +2 -1

index d50e917..6f5cea0 100644
@@ -258,7 +258,7 @@ static int omap_hsmmc_1_set_power(struct device *dev, int slot, int power_on,
  	return ret;
  }
 
-static int omap_hsmmc_23_set_power(struct device *dev, int slot, int power_on,
+static int omap_hsmmc_2_set_power(struct device *dev, int slot, int power_on,
  				   int vdd)
  {
  	struct omap_hsmmc_host *host =

@@ -309,6 +309,31 @@ static int omap_hsmmc_23_set_power(struct device *dev, int slot, int power_on,
  	return ret;
  }
 
+static int omap_hsmmc_3_set_power(struct device *dev, int slot, int power_on,

drivers/mmc/host/omap_hsmmc.c +4 -0

+		if (ret == 0&&  host->vcc) {
+			ret = regulator_enable(host->vcc);
+			if (ret<  0)
+				ret = mmc_regulator_set_ocr(host->vcc, 0);

Prepare for mmc3 regulator power control by splitting the power control functions of mmc2 and mmc3, and expecting mmc3 to have a single, dedicated, regulator support.

Signed-off-by Ohad Ben-Cohen <[email protected]>

---
 arch/arm/mach-omap2/hsmmc.c   |   10 ++++--
 drivers/mmc/host/omap_hsmmc.c |   67 ++++++++++++++++++++++++++++++++++++----
 2 files changed, 66 insertions(+), 11 deletions(-)

arch/arm/mach-omap2/hsmmc.c +6 -4

index 1ef54b0..5d3d789 100644
@@ -174,7 +174,7 @@ static void omap4_hsmmc1_after_set_reg(struct device *dev, int slot,
 	}
 }
 
-static void hsmmc23_before_set_reg(struct device *dev, int slot,
+static void hsmmc2_before_set_reg(struct device *dev, int slot,
 				   int power_on, int vdd)
 {
 	struct omap_mmc_platform_data *mmc = dev->platform_data;

@@ -325,14 +325,16 @@ void __init omap2_hsmmc_init(struct omap2_hsmmc_info *controllers)
 				c->transceiver = 1;
 			if (c->transceiver && c->wires > 4)
 				c->wires = 4;
-			/* FALLTHROUGH */
-		case 3:
 			if (mmc->slots[0].features & HSMMC_HAS_PBIAS) {
 				/* off-chip level shifting, or none */
-				mmc->slots[0].before_set_reg = hsmmc23_before_set_reg;
+				mmc->slots[0].before_set_reg = hsmmc2_before_set_reg;
 				mmc->slots[0].after_set_reg = NULL;
 			}
 			break;
+		case 3:
+			mmc->slots[0].before_set_reg = NULL;
+			mmc->slots[0].after_set_reg = NULL;
+			break;
 		default:
 			pr_err("MMC%d configuration not supported!\n", c->mmc);
 			kfree(mmc);

drivers/mmc/host/omap_hsmmc.c +60 -7

index d50e917..6f5cea0 100644
@@ -258,7 +258,7 @@ static int omap_hsmmc_1_set_power(struct device *dev, int slot, int power_on,
 	return ret;
 }
 
-static int omap_hsmmc_23_set_power(struct device *dev, int slot, int power_on,
+static int omap_hsmmc_2_set_power(struct device *dev, int slot, int power_on,
 				   int vdd)
 {
 	struct omap_hsmmc_host *host =

@@ -309,6 +309,31 @@ static int omap_hsmmc_23_set_power(struct device *dev, int slot, int power_on,
 	return ret;
 }
 
+static int omap_hsmmc_3_set_power(struct device *dev, int slot, int power_on,
+				   int vdd)
+{
+	struct omap_hsmmc_host *host =
+		platform_get_drvdata(to_platform_device(dev));
+	int ret = 0;
+
+	if (power_on) {
+		ret = mmc_regulator_set_ocr(host->vcc, vdd);
+		/* Enable interface voltage rail, if needed */
+		if (ret == 0 && host->vcc) {
+			ret = regulator_enable(host->vcc);
+			if (ret < 0)
+				ret = mmc_regulator_set_ocr(host->vcc, 0);
+		}
+	} else {
+		if (host->vcc)
+			ret = regulator_disable(host->vcc);
+		if (ret == 0)
+			ret = mmc_regulator_set_ocr(host->vcc, 0);
+	}
+
+	return ret;
+}
+
 static int omap_hsmmc_1_set_sleep(struct device *dev, int slot, int sleep,
 				  int vdd, int cardsleep)
 {

@@ -319,7 +344,7 @@ static int omap_hsmmc_1_set_sleep(struct device *dev, int slot, int sleep,
 	return regulator_set_mode(host->vcc, mode);
 }
 
-static int omap_hsmmc_23_set_sleep(struct device *dev, int slot, int sleep,
+static int omap_hsmmc_2_set_sleep(struct device *dev, int slot, int sleep,
 				   int vdd, int cardsleep)
 {
 	struct omap_hsmmc_host *host =

@@ -358,6 +383,31 @@ static int omap_hsmmc_23_set_sleep(struct device *dev, int slot, int sleep,
 		return regulator_enable(host->vcc_aux);
 }
 
+static int omap_hsmmc_3_set_sleep(struct device *dev, int slot, int sleep,
+				   int vdd, int cardsleep)
+{
+	struct omap_hsmmc_host *host =
+		platform_get_drvdata(to_platform_device(dev));
+	int err = 0;
+
+	/*
+	 * If we don't see a Vcc regulator, assume it's a fixed
+	 * voltage always-on regulator.
+	 */
+	if (!host->vcc)
+		return 0;
+
+	if (cardsleep) {
+		/* VCC can be turned off if card is asleep */
+		if (sleep)
+			err = mmc_regulator_set_ocr(host->vcc, 0);
+		else
+			err = mmc_regulator_set_ocr(host->vcc, vdd);
+	}
+
+	return err;
+}
+
 static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host)
 {
 	struct regulator *reg;

@@ -370,10 +420,13 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host)
 		mmc_slot(host).set_sleep = omap_hsmmc_1_set_sleep;
 		break;
 	case OMAP_MMC2_DEVID:
-	case OMAP_MMC3_DEVID:
 		/* Off-chip level shifting, or none */
-		mmc_slot(host).set_power = omap_hsmmc_23_set_power;
-		mmc_slot(host).set_sleep = omap_hsmmc_23_set_sleep;
+		mmc_slot(host).set_power = omap_hsmmc_2_set_power;
+		mmc_slot(host).set_sleep = omap_hsmmc_2_set_sleep;
+		break;
+	case OMAP_MMC3_DEVID:
+		mmc_slot(host).set_power = omap_hsmmc_3_set_power;
+		mmc_slot(host).set_sleep = omap_hsmmc_3_set_sleep;
 		break;
 	default:
 		pr_err("MMC%d configuration not supported!\n", host->id);

@@ -386,9 +439,9 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host)
 		/*
 		* HACK: until fixed.c regulator is usable,
 		* we don't require a main regulator
-		* for MMC2 or MMC3
+		* for MMC2
 		*/
-		if (host->id == OMAP_MMC1_DEVID) {
+		if (host->id != OMAP_MMC2_DEVID) {
 			ret = PTR_ERR(reg);
 			goto err;
 		}

Quoted 3 lines · Ohad Ben-Cohen

Prepare for mmc3 regulator power control by splitting the power control functions of mmc2 and mmc3, and expecting mmc3 to have a single, dedicated, regulator support.

Why? Can't the controller be connected to an eMMC with 2 power supplies? At a glance, it is not obvious why this patch is needed.

Quoted 3 lines · Hunter Adrian (Nokia-MS/Helsinki)

Quoted 1 line · Ohad Ben-Cohen

Quoted 7 lines

Quoted 3 lines

Prepare for mmc3 regulator power control by splitting the power control functions of mmc2 and mmc3, and expecting mmc3 to have a single, dedicated, regulator support.

Why? ?Can't the controller be connected to an eMMC with 2 power supplies? ?At a glance, it is not obvious why this patch is needed.

I agree with Adrian. This patch is not required at all.

Quoted 4 lines · Ohad Ben-Cohen

Prepare for mmc3 regulator power control by splitting the power control functions of mmc2 and mmc3, and expecting mmc3 to have a single, dedicated, regulator support.

Why? ?Can't the controller be connected to an eMMC with 2 power supplies? ?At a glance, it is not obvious why this patch is needed.

Add MMC3 support on ZOOM, which has the wl1271 device hardwired to.

The wl1271 is a 4-wire, 1.8V, embedded SDIO WLAN device with an external IRQ line, and power-controlled by a GPIO-based fixed regulator.

Signed-off-by Ohad Ben-Cohen<[email protected]>

---
  arch/arm/mach-omap2/board-zoom-peripherals.c |   34 ++++++++++++++++++++++++++
  1 files changed, 34 insertions(+), 0 deletions(-)

arch/arm/mach-omap2/board-zoom-peripherals.c +25 -0

index de88635..82776bc 100644
@@ -17,6 +17,8 @@
  #include<linux/i2c/twl.h>
  #include<linux/regulator/machine.h>
  #include<linux/regulator/fixed.h>
+#include<linux/mmc/host.h>
+#include<linux/wl12xx.h>
 
  #include<asm/mach-types.h>
  #include<asm/mach/arch.h>

@@ -29,6 +31,7 @@
  #include "hsmmc.h"
 
  #define OMAP_ZOOM_WLAN_PMENA_GPIO	(101)
+#define OMAP_ZOOM_WLAN_IRQ_GPIO		(162)
 
  /* Zoom2 has Qwerty keyboard*/
  static int board_keymap[] = {

@@ -185,6 +188,28 @@ static struct platform_device omap_vwlan_device = {
  	},
  };
 
+struct wl12xx_platform_data omap_zoom_wlan_data = {
+	/* ZOOM ref clock is 26 MHz */
+	.board_ref_clock = 1,
+};
+
+static struct resource omap_zoom_wl1271_resources[] = {
+	{
+		.start = OMAP_GPIO_IRQ(OMAP_ZOOM_WLAN_IRQ_GPIO),
+		.end = OMAP_GPIO_IRQ(OMAP_ZOOM_WLAN_IRQ_GPIO),
+		.flags = IORESOURCE_IRQ,
+	}
+};
+static struct platform_device omap_zoom_wl1271 = {
+	.name		= "wl1271_plat.2",
+	.id		= -1,
+	.resource	= omap_zoom_wl1271_resources,
+	.num_resources	= ARRAY_SIZE(omap_zoom_wl1271_resources),
+	.dev = {
+		.platform_data =&omap_zoom_wlan_data,
+	},
+};
+
  static struct omap2_hsmmc_info mmc[] __initdata = {
  	{
  		.name		= "external",

Quoted 61 lines · ext Ohad Ben-Cohen

Add MMC3 support on ZOOM, which has the wl1271 device hardwired to.

The wl1271 is a 4-wire, 1.8V, embedded SDIO WLAN device with an external IRQ line, and power-controlled by a GPIO-based fixed regulator.

Signed-off-by Ohad Ben-Cohen<[email protected]>

---
   arch/arm/mach-omap2/board-zoom-peripherals.c |   34 ++++++++++++++++++++++++++
   1 files changed, 34 insertions(+), 0 deletions(-)

arch/arm/mach-omap2/board-zoom-peripherals.c +25 -0

index de88635..82776bc 100644
@@ -17,6 +17,8 @@
   #include<linux/i2c/twl.h>
   #include<linux/regulator/machine.h>
   #include<linux/regulator/fixed.h>
+#include<linux/mmc/host.h>
+#include<linux/wl12xx.h>
 
   #include<asm/mach-types.h>
   #include<asm/mach/arch.h>

@@ -29,6 +31,7 @@
   #include "hsmmc.h"
 
   #define OMAP_ZOOM_WLAN_PMENA_GPIO	(101)
+#define OMAP_ZOOM_WLAN_IRQ_GPIO		(162)
 
   /* Zoom2 has Qwerty keyboard*/
   static int board_keymap[] = {

@@ -185,6 +188,28 @@ static struct platform_device omap_vwlan_device = {
   	},
   };
 
+struct wl12xx_platform_data omap_zoom_wlan_data = {
+	/* ZOOM ref clock is 26 MHz */
+	.board_ref_clock = 1,
+};
+
+static struct resource omap_zoom_wl1271_resources[] = {
+	{
+		.start = OMAP_GPIO_IRQ(OMAP_ZOOM_WLAN_IRQ_GPIO),
+		.end = OMAP_GPIO_IRQ(OMAP_ZOOM_WLAN_IRQ_GPIO),
+		.flags = IORESOURCE_IRQ,
+	}
+};
+static struct platform_device omap_zoom_wl1271 = {
+	.name		= "wl1271_plat.2",
+	.id		= -1,
+	.resource	= omap_zoom_wl1271_resources,
+	.num_resources	= ARRAY_SIZE(omap_zoom_wl1271_resources),
+	.dev = {
+		.platform_data =&omap_zoom_wlan_data,
+	},
+};
+
   static struct omap2_hsmmc_info mmc[] __initdata = {
   	{
   		.name		= "external",

arch/arm/mach-omap2/board-zoom-peripherals.c static struct omap2_hsmmc_info mmc[] __initdata = { · line 236

Quoted 10 lines

arch/arm/mach-omap2/board-zoom-peripherals.c +7 -0

@@ -202,6 +227,14 @@ static struct omap2_hsmmc_info mmc[] __initdata = {
   		.nonremovable	= true,
   		.power_saving	= true,
   	},
+	{
+		.name		= "wl1271",
+		.mmc		= 3,
+		.wires		= 4,
+		.gpio_wp	= -EINVAL,
+		.gpio_cd	= -EINVAL,
+		.ocr_mask	= MMC_VDD_165_195,

Do we really need to specify ocr_mask here?
It seems to be set in omap_hsmmc_reg_get() by calling mmc_regulator_get_ocrmask().

This should automatically pick the right mask if you have defined the "vmmc" regulator output voltage correctly.

Also shouldn't .nonremovable be set to true? as this is a non-removable card slot.

regards,
-roger

Quoted 1 line

+ ? ? ? ? ? ? ? .ocr_mask ? ? ? = MMC_VDD_165_195,

Do we really need to specify ocr_mask here?

Quoted 3 lines · Roger Quadros

Quoted 1 line

+ ? ? ? ? ? ? ? .ocr_mask ? ? ? = MMC_VDD_165_195,

Do we really need to specify ocr_mask here?

Removed, thanks!
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo at vger.kernel.org
More majordomo info at ?http://vger.kernel.org/majordomo-info.html

Since you specified the voltage source is fixed, and if MMC3 has any dedicated regulator as MMC1 & MMC2 you can go with Roger's comments.

If the LDO is fixed voltage source from TWL then since regulator framework supports only adjustable LDO's, I think you can have ocr_mask defined as above in board file.

Regards,
Kishore

Quoted 7 lines

Removed, thanks!
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo at vger.kernel.org
More majordomo info at ?http://vger.kernel.org/majordomo-info.html

Hi Kishore,

Quoted 3 lines · kishore kadiyala

Since you specified the voltage source is fixed, and if MMC3 has any dedicated regulator as MMC1 & MMC2 you can go with Roger's comments.

You are reading an old batch of the patches.

Scroll down to v4 ;)

Thanks,
Ohad.

Quoted 14 lines

If the LDO is fixed voltage source from TWL then since regulator framework supports only adjustable LDO's, I think you can have ocr_mask defined as above in board file.

Regards,
Kishore

Quoted 7 lines

Removed, thanks!
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo at vger.kernel.org
More majordomo info at ?http://vger.kernel.org/majordomo-info.html

If the LDO is fixed voltage source from TWL then since regulator framework supports only adjustable LDO's, I think you can