gmane.linux.kernel.mmc

[PATCH V2 3/3] mmc: mmci: Save and restore register context

Ulf Hansson — 2013-05-23T09:45:07

From: Ulf Hansson <ulf.hansson< at >linaro.org>

If a corresponding power domain exists for the device and it manages
to cut the domain regulator while the device is runtime suspended,
the IP loses it's registers context. We restore the context in the
.runtime_resume callback from the existing register caches to adapt
to this siutuation.

We also want to make sure the registers are in a known state while
restoring context in the case when the power domain did not drop the
power, since there are restrictions for the order of writing to these
registers. To handle this, we clear the registers in the
.runtime_suspend callback.

Signed-off-by: Ulf Hansson <ulf.hansson< at >linaro.org>
---

Changes in v2:
Rebased on top of recently merged patchset for UHS card support.
---
 drivers/mmc/host/mmci.c |   43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 8f70e5b..ec9f17c 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
< at >< at > -62,6 +62,7 < at >< at > static unsigned int fmax = 515633;
  * < at >signal_direction: input/out direction of bus signals can be indicated
  * < at >pwrreg_clkgate: MMCIPOWER register must be used to gate the clock
  * < at >busy_detect: true if busy detection on dat0 is supported
+ * < at >pwrreg_nopower: bits in MMCIPOWER don't controls ext. power supply
  */
 struct variant_data {
 unsigned intclkreg;
< at >< at > -76,6 +77,7 < at >< at > struct variant_data {
 boolsignal_direction;
 boolpwrreg_clkgate;
 boolbusy_detect;
+boolpwrreg_nopower;
 };
 
 static struct variant_data variant_arm = {
< at >< at > -109,6 +111,7 < at >< at > static struct variant_data variant_u300 = {
 .pwrreg_powerup= MCI_PWR_ON,
 .signal_direction= true,
 .pwrreg_clkgate= true,
+.pwrreg_nopower= true,
 };
 
 static struct variant_data variant_nomadik = {
< at >< at > -121,6 +124,7 < at >< at > static struct variant_data variant_nomadik = {
 .pwrreg_powerup= MCI_PWR_ON,
 .signal_direction= true,
 .pwrreg_clkgate= true,
+.pwrreg_nopower= true,
 };
 
 static struct variant_data variant_ux500 = {
< at >< at > -135,6 +139,7 < at >< at > static struct variant_data variant_ux500 = {
 .signal_direction= true,
 .pwrreg_clkgate= true,
 .busy_detect= true,
+.pwrreg_nopower= true,
 };
 
 static struct variant_data variant_ux500v2 = {
< at >< at > -150,6 +155,7 < at >< at > static struct variant_data variant_ux500v2 = {
 .signal_direction= true,
 .pwrreg_clkgate= true,
 .busy_detect= true,
+.pwrreg_nopower= true,
 };
 
 static int mmci_card_busy(struct mmc_host *mmc)
< at >< at > -1782,6 +1788,41 < at >< at > static int mmci_resume(struct device *dev)
 #endif
 
 #ifdef CONFIG_PM_RUNTIME
+static void mmci_save(struct mmci_host *host)
+{
+unsigned long flags;
+
+if (host->variant->pwrreg_nopower) {
+spin_lock_irqsave(&host->lock, flags);
+
+writel(0, host->base + MMCIMASK0);
+writel(0, host->base + MMCIDATACTRL);
+writel(0, host->base + MMCIPOWER);
+writel(0, host->base + MMCICLOCK);
+mmci_reg_delay(host);
+
+spin_unlock_irqrestore(&host->lock, flags);
+}
+
+}
+
+static void mmci_restore(struct mmci_host *host)
+{
+unsigned long flags;
+
+if (host->variant->pwrreg_nopower) {
+spin_lock_irqsave(&host->lock, flags);
+
+writel(host->clk_reg, host->base + MMCICLOCK);
+writel(host->datactrl_reg, host->base + MMCIDATACTRL);
+writel(host->pwr_reg, host->base + MMCIPOWER);
+writel(MCI_IRQENABLE, host->base + MMCIMASK0);
+mmci_reg_delay(host);
+
+spin_unlock_irqrestore(&host->lock, flags);
+}
+}
+
 static int mmci_runtime_suspend(struct device *dev)
 {
 struct amba_device *adev = to_amba_device(dev);
< at >< at > -1794,6 +1835,7 < at >< at > static int mmci_runtime_suspend(struct device *dev)
 if (!IS_ERR(host->pins_sleep))
 pinctrl_select_state(host->pinctrl, host->pins_sleep);
 
+mmci_save(host);
 clk_disable_unprepare(host->clk);
 }
 
< at >< at > -1809,6 +1851,7 < at >< at > static int mmci_runtime_resume(struct device *dev)
 struct mmci_host *host = mmc_priv(mmc);
 
 clk_prepare_enable(host->clk);
+mmci_restore(host);
 
 /* Optionally enable pins to be muxed in and configured */
 if (!IS_ERR(host->pins_default))

[PATCH V2 1/3] mmc: mmci: Use optional sleep pinctrl state

Ulf Hansson — 2013-05-23T09:45:05

From: Ulf Hansson <ulf.hansson< at >linaro.org>

By optionally putting the pins into sleep state in the .runtime_suspend
callback we can accomplish two things. One is to minimize current leakage
from pins and thus save power, second we can prevent the IP from driving
pins output in an uncontrolled manner, which may happen if the power domain
drops the domain regulator.

When returning from idle, entering .runtime_resume callback, the pins
are restored to default state.

Signed-off-by: Ulf Hansson <ulf.hansson< at >linaro.org>
Reviewed-by: Linus Walleij <linus.walleij< at >linaro.org>
---

Changes in v2:
Just adding Linus reviewed by.
---
 drivers/mmc/host/mmci.c |   16 ++++++++++++++++
 drivers/mmc/host/mmci.h |    1 +
 2 files changed, 17 insertions(+)

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index c3785ed..9fa8855 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
< at >< at > -1527,6 +1527,12 < at >< at > static int mmci_probe(struct amba_device *dev,
 } else
 dev_warn(&dev->dev, "could not get default pinstate\n");
 
+/* fetch optional sleep state of pins */
+host->pins_sleep = pinctrl_lookup_state(host->pinctrl,
+PINCTRL_STATE_SLEEP);
+if (IS_ERR(host->pins_sleep))
+dev_dbg(&dev->dev, "could not get sleep pinstate\n");
+
 /* Get regulators and the supported OCR mask */
 mmc_regulator_get_supply(mmc);
 if (!mmc->ocr_avail)
< at >< at > -1767,6 +1773,11 < at >< at > static int mmci_runtime_suspend(struct device *dev)
 
 if (mmc) {
 struct mmci_host *host = mmc_priv(mmc);
+
+/* Optionally let pins go into sleep state */
+if (!IS_ERR(host->pins_sleep))
+pinctrl_select_state(host->pinctrl, host->pins_sleep);
+
 clk_disable_unprepare(host->clk);
 }
 
< at >< at > -1780,7 +1791,12 < at >< at > static int mmci_runtime_resume(struct device *dev)
 
 if (mmc) {
 struct mmci_host *host = mmc_priv(mmc);
+
 clk_prepare_enable(host->clk);
+
+/* Optionally enable pins to be muxed in and configured */
+if (!IS_ERR(host->pins_default))
+pinctrl_select_state(host->pinctrl, host->pins_default);
 }
 
 return 0;
diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h
index 69080fa..060f919 100644
--- a/drivers/mmc/host/mmci.h
+++ b/drivers/mmc/host/mmci.h
< at >< at > -203,6 +203,7 < at >< at > struct mmci_host {
 /* pinctrl handles */
 struct pinctrl*pinctrl;
 struct pinctrl_state*pins_default;
+struct pinctrl_state*pins_sleep;
 
 #ifdef CONFIG_DMA_ENGINE
 /* DMA stuff */

[PATCH V2 2/3] mmc: mmci: Adapt to register write restrictions

Ulf Hansson — 2013-05-23T09:45:06

From: Ulf Hansson <ulf.hansson< at >linaro.org>

After a write to the MMCICLOCK register data cannot be written to this
register for three feedback clock cycles. Writes to the MMCIPOWER
register must be separated by three MCLK cycles. Previously no issues
has been observered, but using higher ARM clock frequencies on STE-
platforms has triggered this problem.

The MMCICLOCK register is written to in .set_ios and for some data
transmissions for SDIO. We do not need a delay at the data transmission
path, because sending and receiving data will require more than three
clock cycles. Then we use a simple logic to only delay in .set_ios and
thus we don't affect throughput performance.

Signed-off-by: Ulf Hansson <ulf.hansson< at >linaro.org>
Signed-off-by: Johan Rudholm <jrudholm< at >gmail.com>
---

Changes in v2:
None
---
 drivers/mmc/host/mmci.c |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 9fa8855..8f70e5b 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
< at >< at > -189,6 +189,21 < at >< at > static int mmci_validate_data(struct mmci_host *host,
 return 0;
 }
 
+static void mmci_reg_delay(struct mmci_host *host)
+{
+/*
+ * According to the spec, at least three feedback clock cycles
+ * of max 52 MHz must pass between two writes to the MMCICLOCK reg.
+ * Three MCLK clock cycles must pass between two MMCIPOWER reg writes.
+ * Worst delay time during card init is at 100 kHz => 30 us.
+ * Worst delay time when up and running is at 25 MHz => 120 ns.
+ */
+if (host->cclk < 20000000)
+udelay(30);
+else
+ndelay(120);
+}
+
 /*
  * This must be called with host->lock held
  */
< at >< at > -1264,6 +1279,7 < at >< at > static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 
 mmci_set_clkreg(host, ios->clock);
 mmci_write_pwrreg(host, pwr);
+mmci_reg_delay(host);
 
 spin_unlock_irqrestore(&host->lock, flags);

[PATCH V2 0/3] mmc: mmci: Support ap_sleep in cpuidle for ux500

Ulf Hansson — 2013-05-23T09:45:04

From: Ulf Hansson <ulf.hansson< at >linaro.org>

To be able to enter ap_sleep state in cpuidle were the APE power domain
regulator will be cut, a register save and restore mechanism needs to be
implemented. This patchset adapts to these restrictions.

Ulf Hansson (3):
  mmc: mmci: Use optional sleep pinctrl state
  mmc: mmci: Adapt to register write restrictions
  mmc: mmci: Save and restore register context

 drivers/mmc/host/mmci.c |   75 +++++++++++++++++++++++++++++++++++++++++++++++
 drivers/mmc/host/mmci.h |    1 +
 2 files changed, 76 insertions(+)

[PATCH] mmc: dw_mmc: exynos: Add a new compatible string for exynos5420

Yuvaraj Kumar C D — 2013-05-23T09:09:27

The Exynos5420 has a DWMMC controller which is different from prior
versions.This patch adds a new compatible string for Exynos5420.

Signed-off-by: Abhilash Kesavan <a.kesavan< at >samsung.com>
---
 drivers/mmc/host/dw_mmc-exynos.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/mmc/host/dw_mmc-exynos.c b/drivers/mmc/host/dw_mmc-exynos.c
index f013e7e..f883b17 100644
--- a/drivers/mmc/host/dw_mmc-exynos.c
+++ b/drivers/mmc/host/dw_mmc-exynos.c
< at >< at > -41,6 +41,7 < at >< at > enum dw_mci_exynos_type {
 DW_MCI_TYPE_EXYNOS4210,
 DW_MCI_TYPE_EXYNOS4412,
 DW_MCI_TYPE_EXYNOS5250,
+DW_MCI_TYPE_EXYNOS5420,
 };
 
 /* Exynos implementation specific driver private data */
< at >< at > -64,6 +65,9 < at >< at > static struct dw_mci_exynos_compatible {
 }, {
 .compatible= "samsung,exynos5250-dw-mshc",
 .ctrl_type= DW_MCI_TYPE_EXYNOS5250,
+}, {
+.compatible= "samsung,exynos5420-dw-mshc",
+.ctrl_type= DW_MCI_TYPE_EXYNOS5420,
 },
 };
 
< at >< at > -92,7 +96,8 < at >< at > static int dw_mci_exynos_setup_clock(struct dw_mci *host)
 {
 struct dw_mci_exynos_priv_data *priv = host->priv;
 
-if (priv->ctrl_type == DW_MCI_TYPE_EXYNOS5250)
+if (priv->ctrl_type == DW_MCI_TYPE_EXYNOS5250 ||
+priv->ctrl_type == DW_MCI_TYPE_EXYNOS5420)
 host->bus_hz /= (priv->ciu_div + 1);
 else if (priv->ctrl_type == DW_MCI_TYPE_EXYNOS4412)
 host->bus_hz /= EXYNOS4412_FIXED_CIU_CLK_DIV;
< at >< at > -175,6 +180,8 < at >< at > static const struct of_device_id dw_mci_exynos_match[] = {
 .data = &exynos_drv_data, },
 { .compatible = "samsung,exynos5250-dw-mshc",
 .data = &exynos_drv_data, },
+{ .compatible = "samsung,exynos5420-dw-mshc",
+.data = &exynos_drv_data, },
 {},
 };
 MODULE_DEVICE_TABLE(of, dw_mci_exynos_match);

Re: [PATCH 1/2] mmc: sdhci: Added set_power sdhci_ops handler.

Guennadi Liakhovetski — 2013-05-23T07:25:16


Ok, understand. Your second patch in this series adds such a callback in 
your SDHCI host driver and there it just calls a platform callback. I 
don't think this is a good idea. First, we want to go away from platform 
callbacks, because they are incompatible with DT. Second, because the 
proper solution IMHO would be for your platform to export a regulator, and 
the SDHCI core driver already includes regulator support.


Which, however, doesn't yet mean, it's a good idea :)

Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
--
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

Re: [PATCH] mmc: core: Update the ext-csd.rev check for eMMC5.1

Doug Anderson — 2013-05-23T00:08:25

Correction,

On Wed, May 22, 2013 at 5:06 PM, Doug Anderson <dianders< at >google.com> wrote:

...with the caveat the Alim's email address be corrected.

Signed-off-by: Alim Akhtar <alim.akhtar< at >samsung.com>
--
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

Re: [PATCH] mmc: core: Update the ext-csd.rev check for eMMC5.1

Doug Anderson — 2013-05-23T00:06:08

Yavaraj,

On Tue, May 21, 2013 at 2:38 AM, Yuvaraj Kumar C D <yuvaraj.cd< at >gmail.com> wrote:

Looks reasonable.

Reviewed-by: Doug Anderson <dianders< at >chromium.org>
--
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

Re: [PATCH 1/2] mmc: sdhci: Added set_power sdhci_ops handler.

Felipe Ferreri Tonello — 2013-05-22T21:22:45

Hi Guennadi,

On Wednesday, May 22, 2013 10:30:40 PM Guennadi Liakhovetski wrote:

Sorry about that.

One example that I can think of is when you have a wifi module connected as a 
mmc card via sdio. So you can register a callback function in your machine 
source code to turn on/off the wifi module based on the mmc host power.

I've seen this implementation in others mmc hosts, such as omap.

Regards,

Felipe

--
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

Re: [PATCH V3 00/10] mmc_of_parse() adaptations, DT support for Sheevaplugs

Simon Baatz — 2013-05-22T19:25:02

Hi Jason,

On Tue, May 21, 2013 at 09:14:55AM -0400, Jason Cooper wrote:

If you don't mind too much, as this crosses two trees, I would prefer
to keep the series "self-contained" if people want to test.
Additionally, I have two Acked-bys for 9 and 10 from Andrew that are
not part of the patches yet.
 

Even without reinstalling, can you please have a look if your
"plug:green:health" LED is really green (mine is blue)?  And if your
kernel already has a "plug:red:misc" LED could you verify whether it
is really there?  Do you happen to know which board revision you
have?


Thanks,
   Simon
--
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

[PATCH 0/2] Added set_power handler to mmc sdhci host

Felipe F. Tonello — 2013-05-22T17:47:10

From: "Felipe F. Tonello" <eu< at >felipetonello.com>

This set_power handler is useful for modules that need to be turned off when
the mmc host turns off.

Felipe F. Tonello (2):
  mmc: sdhci: Added set_power sdhci_ops handler.
  mmc: sdhci-s3c: Added set_power handler to platdata

 drivers/mmc/host/sdhci-s3c.c                | 8 ++++++++
 drivers/mmc/host/sdhci.c                    | 8 ++++++++
 drivers/mmc/host/sdhci.h                    | 1 +
 include/linux/platform_data/mmc-sdhci-s3c.h | 1 +
 4 files changed, 18 insertions(+)

Re: [PATCH V3 00/10] mmc_of_parse() adaptations, DT support for Sheevaplugs

Jason Cooper — 2013-05-21T13:14:55

Patches 7, 9, and 10 already pulled into mvebu/dt.  You can drop those
from this series if you need to do another revision.


I happen to have one.  Unfortunately, it is currently my primary email
server, dhcp, dns, file server, and a few other irreplaceable things. :(
I *really* need to upgrade/reconfigure ...

thx,

Jason.
--
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

[PATCH] mmc: core: Update the ext-csd.rev check for eMMC5.1

Yuvaraj Kumar C D — 2013-05-21T09:38:43

With the new eMMC5.1 spec,there is a new EXT_CSD register with
the revision number(EXT_CSD_REV) 7.This patch updates the check
for ext-csd.rev number as 7.

Signed-off-by: Alim Akhtar <alim.akthar< at >samsung.com>
Signed-off-by: Yuvaraj Kumar C D <yuvaraj.cd< at >samsung.com>
---
 drivers/mmc/core/mmc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 0cbd1ef..73f58e0 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
< at >< at > -293,7 +293,7 < at >< at > static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)
 }
 
 card->ext_csd.rev = ext_csd[EXT_CSD_REV];
-if (card->ext_csd.rev > 6) {
+if (card->ext_csd.rev > 7) {
 pr_err("%s: unrecognised EXT_CSD revision %d\n",
 mmc_hostname(card->host), card->ext_csd.rev);
 err = -EINVAL;

Re: [PATCH V3 01/10] mmc: return mmc_of_parse() errors to caller

Ulf Hansson — 2013-05-21T07:00:09

Reviewed-by: Ulf Hansson <ulf.hansson< at >linaro.org>
--
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

Re: [PATCH V3 10/10] ARM: Kirkwood: add DT support for Sheevaplug and Sheevaplug eSATA

Andrew Lunn — 2013-05-21T05:13:15

Acked-by: Andrew Lunn <andrew< at >lunn.ch>
--
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

Re: [PATCH V3 09/10] ARM: Kirkwood: Add dts files for Sheevaplug and eSATA Sheevaplug

Andrew Lunn — 2013-05-21T05:11:32

Hi Simon

Looks good

Acked-by: Andrew Lunn <andrew< at >lunn.ch>
--
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

[PATCH V3 10/10] ARM: Kirkwood: add DT support for Sheevaplug and Sheevaplug eSATA

Simon Baatz — 2013-05-20T23:01:51

Signed-off-by: Simon Baatz <gmbnomis< at >gmail.com>
---
 arch/arm/mach-kirkwood/Kconfig            |    7 +++++++
 arch/arm/mach-kirkwood/Makefile           |    1 +
 arch/arm/mach-kirkwood/board-dt.c         |    4 ++++
 arch/arm/mach-kirkwood/board-sheevaplug.c |   27 +++++++++++++++++++++++++++
 arch/arm/mach-kirkwood/common.h           |    5 +++++
 5 files changed, 44 insertions(+)
 create mode 100644 arch/arm/mach-kirkwood/board-sheevaplug.c

diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
index 7509a89..58518a2 100644
--- a/arch/arm/mach-kirkwood/Kconfig
+++ b/arch/arm/mach-kirkwood/Kconfig
< at >< at > -296,6 +296,13 < at >< at > config MACH_READYNAS_DT
   Say 'Y' here if you want your kernel to support the
   NETGEAR ReadyNAS Duo v2 using Fattened Device Tree.
 
+config MACH_SHEEVAPLUG_DT
+bool "Marvell (eSATA) SheevaPlug (Flattened Device Tree)"
+select ARCH_KIRKWOOD_DT
+help
+  Say 'Y' here if you want your kernel to support the
+  Marvell (eSATA) SheevaPlug (Flattened Device Tree).
+
 config MACH_TOPKICK_DT
 bool "USI Topkick (Flattened Device Tree)"
 select ARCH_KIRKWOOD_DT
diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
index e1f3735..8846abf 100644
--- a/arch/arm/mach-kirkwood/Makefile
+++ b/arch/arm/mach-kirkwood/Makefile
< at >< at > -40,5 +40,6 < at >< at > obj-$(CONFIG_MACH_NETSPACE_V2_DT)+= board-ns2.o
 obj-$(CONFIG_MACH_NSA310_DT)+= board-nsa310.o
 obj-$(CONFIG_MACH_OPENBLOCKS_A6_DT)+= board-openblocks_a6.o
 obj-$(CONFIG_MACH_READYNAS_DT)+= board-readynas.o
+obj-$(CONFIG_MACH_SHEEVAPLUG_DT)+= board-sheevaplug.o
 obj-$(CONFIG_MACH_TOPKICK_DT)+= board-usi_topkick.o
 obj-$(CONFIG_MACH_TS219_DT)+= board-ts219.o tsx1x-common.o
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index e9647b8..a09dbac 100644
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
< at >< at > -112,6 +112,9 < at >< at > static void __init kirkwood_dt_init(void)
 if (of_machine_is_compatible("globalscale,guruplug"))
 guruplug_dt_init();
 
+if (of_machine_is_compatible("globalscale,sheevaplug"))
+sheevaplug_dt_init();
+
 if (of_machine_is_compatible("dlink,dns-kirkwood"))
 dnskw_init();
 
< at >< at > -165,6 +168,7 < at >< at > static void __init kirkwood_dt_init(void)
 static const char * const kirkwood_dt_board_compat[] = {
 "globalscale,dreamplug",
 "globalscale,guruplug",
+"globalscale,sheevaplug",
 "dlink,dns-320",
 "dlink,dns-325",
 "iom,iconnect",
diff --git a/arch/arm/mach-kirkwood/board-sheevaplug.c b/arch/arm/mach-kirkwood/board-sheevaplug.c
new file mode 100644
index 0000000..fa38937
--- /dev/null
+++ b/arch/arm/mach-kirkwood/board-sheevaplug.c
< at >< at > -0,0 +1,27 < at >< at >
+/*
+ * arch/arm/mach-kirkwood/board-sheevaplug.c
+ *
+ * Marvell Sheevaplug Reference Board Init for drivers not converted to
+ * flattened device tree yet.
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/mv643xx_eth.h>
+#include "common.h"
+
+static struct mv643xx_eth_platform_data sheevaplug_ge00_data = {
+.phy_addr= MV643XX_ETH_PHY_ADDR(0),
+};
+
+void __init sheevaplug_dt_init(void)
+{
+/*
+ * Basic setup. Needs to be called early.
+ */
+kirkwood_ge00_init(&sheevaplug_ge00_data);
+}
diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
index 21da3b1..974442e 100644
--- a/arch/arm/mach-kirkwood/common.h
+++ b/arch/arm/mach-kirkwood/common.h
< at >< at > -65,6 +65,11 < at >< at > void guruplug_dt_init(void);
 #else
 static inline void guruplug_dt_init(void) {};
 #endif
+#ifdef CONFIG_MACH_SHEEVAPLUG_DT
+void sheevaplug_dt_init(void);
+#else
+static inline void sheevaplug_dt_init(void) {};
+#endif
 #ifdef CONFIG_MACH_TS219_DT
 void qnap_dt_ts219_init(void);
 #else

[PATCH V3 09/10] ARM: Kirkwood: Add dts files for Sheevaplug and eSATA Sheevaplug

Simon Baatz — 2013-05-20T23:01:50

Signed-off-by: Simon Baatz <gmbnomis< at >gmail.com>
---
 arch/arm/boot/dts/Makefile                        |    2 +
 arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi |   97 +++++++++++++++++++++
 arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts   |   40 +++++++++
 arch/arm/boot/dts/kirkwood-sheevaplug.dts         |   45 ++++++++++
 4 files changed, 184 insertions(+)
 create mode 100644 arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
 create mode 100644 arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-sheevaplug.dts

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index b9f7121..e81a387 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
< at >< at > -84,6 +84,8 < at >< at > dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
 kirkwood-ns2max.dtb \
 kirkwood-ns2mini.dtb \
 kirkwood-nsa310.dtb \
+kirkwood-sheevaplug.dtb \
+kirkwood-sheevaplug-esata.dtb \
 kirkwood-topkick.dtb \
 kirkwood-ts219-6281.dtb \
 kirkwood-ts219-6282.dtb \
diff --git a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
new file mode 100644
index 0000000..9d59475
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
< at >< at > -0,0 +1,97 < at >< at >
+/*
+ * kirkwood-sheevaplug-common.dts - Common parts for Sheevaplugs
+ *
+ * Copyright (C) 2013 Simon Baatz <gmbnomis< at >gmail.com>
+ *
+ * Licensed under GPLv2
+ */
+
+/include/ "kirkwood.dtsi"
+/include/ "kirkwood-6281.dtsi"
+
+/ {
+memory {
+device_type = "memory";
+reg = <0x00000000 0x20000000>;
+};
+
+chosen {
+bootargs = "console=ttyS0,115200n8 earlyprintk";
+};
+
+ocp< at >f1000000 {
+pinctrl: pinctrl< at >10000 {
+
+pmx_usb_power_enable: pmx-usb-power-enable {
+marvell,pins = "mpp29";
+marvell,function = "gpio";
+};
+pmx_led_red: pmx-led-red {
+marvell,pins = "mpp46";
+marvell,function = "gpio";
+};
+pmx_led_blue: pmx-led-blue {
+marvell,pins = "mpp49";
+marvell,function = "gpio";
+};
+pmx_sdio_cd: pmx-sdio-cd {
+marvell,pins = "mpp44";
+marvell,function = "gpio";
+};
+pmx_sdio_wp: pmx-sdio-wp {
+marvell,pins = "mpp47";
+marvell,function = "gpio";
+};
+};
+serial< at >12000 {
+status = "okay";
+};
+
+nand< at >3000000 {
+status = "okay";
+
+partition< at >0 {
+label = "u-boot";
+reg = <0x0000000 0x100000>;
+};
+
+partition< at >100000 {
+label = "uImage";
+reg = <0x0100000 0x400000>;
+};
+
+partition< at >500000 {
+label = "root";
+reg = <0x0500000 0x1fb00000>;
+};
+};
+};
+
+regulators {
+compatible = "simple-bus";
+#address-cells = <1>;
+#size-cells = <0>;
+
+usb_power: regulator< at >1 {
+compatible = "regulator-fixed";
+reg = <1>;
+regulator-name = "USB Power";
+regulator-min-microvolt = <5000000>;
+regulator-max-microvolt = <5000000>;
+enable-active-high;
+regulator-always-on;
+regulator-boot-on;
+gpio = <&gpio0 29 0>;
+};
+};
+
+gpio-leds {
+compatible = "gpio-leds";
+
+health {
+label = "sheevaplug:blue:health";
+gpios = <&gpio1 17 1>;
+linux,default-trigger = "default-on";
+};
+};
+};
diff --git a/arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts b/arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts
new file mode 100644
index 0000000..1c6946a
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts
< at >< at > -0,0 +1,40 < at >< at >
+/*
+ * kirkwood-sheevaplug-esata.dts - Device tree file for eSATA Sheevaplug
+ *
+ * Copyright (C) 2013 Simon Baatz <gmbnomis< at >gmail.com>
+ *
+ * Licensed under GPLv2
+ */
+
+/dts-v1/;
+
+/include/ "kirkwood-sheevaplug-common.dtsi"
+
+/ {
+model = "Globalscale Technologies eSATA SheevaPlug";
+compatible = "globalscale,sheevaplug-esata-rev13", "globalscale,sheevaplug-esata", "globalscale,sheevaplug", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+ocp< at >f1000000 {
+pinctrl: pinctrl< at >10000 {
+
+pinctrl-0 = < &pmx_nand &pmx_uart0
+      &pmx_usb_power_enable
+      &pmx_led_blue>;
+pinctrl-names = "default";
+
+};
+
+sata< at >80000 {
+status = "okay";
+nr-ports = <2>;
+};
+
+mvsdio< at >90000 {
+pinctrl-0 = <&pmx_sdio &pmx_sdio_cd &pmx_sdio_wp>;
+pinctrl-names = "default";
+status = "okay";
+cd-gpios = <&gpio1 12 1>;
+wp-gpios = <&gpio1 15 0>;
+};
+};
+};
diff --git a/arch/arm/boot/dts/kirkwood-sheevaplug.dts b/arch/arm/boot/dts/kirkwood-sheevaplug.dts
new file mode 100644
index 0000000..f7684066
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-sheevaplug.dts
< at >< at > -0,0 +1,45 < at >< at >
+/*
+ * kirkwood-sheevaplug-esata.dts - Device tree file for Sheevaplug
+ *
+ * Copyright (C) 2013 Simon Baatz <gmbnomis< at >gmail.com>
+ *
+ * Licensed under GPLv2
+ */
+
+/dts-v1/;
+
+/include/ "kirkwood-sheevaplug-common.dtsi"
+
+/ {
+model = "Globalscale Technologies SheevaPlug";
+compatible = "globalscale,sheevaplug", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+ocp< at >f1000000 {
+pinctrl: pinctrl< at >10000 {
+
+pinctrl-0 = < &pmx_nand &pmx_uart0
+      &pmx_usb_power_enable
+      &pmx_led_red
+      &pmx_led_blue>;
+pinctrl-names = "default";
+
+};
+
+mvsdio< at >90000 {
+pinctrl-0 = <&pmx_sdio>;
+pinctrl-names = "default";
+status = "okay";
+/* No CD or WP GPIOs */
+broken-cd;
+};
+};
+
+gpio-leds {
+compatible = "gpio-leds";
+
+misc {
+label = "sheevaplug:red:misc";
+gpios = <&gpio1 14 1>;
+};
+};
+};

[PATCH V3 06/10] mmc: tegra: handle mmc_of_parse() errors during probe

Simon Baatz — 2013-05-20T23:01:47

Signed-off-by: Simon Baatz <gmbnomis< at >gmail.com>
---
 drivers/mmc/host/sdhci-tegra.c |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index e0dba74..7eb62f8 100644
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
< at >< at > -205,7 +205,7 < at >< at > static const struct of_device_id sdhci_tegra_dt_match[] = {
 };
 MODULE_DEVICE_TABLE(of, sdhci_tegra_dt_match);
 
-static void sdhci_tegra_parse_dt(struct device *dev)
+static int sdhci_tegra_parse_dt(struct device *dev)
 {
 struct device_node *np = dev->of_node;
 struct sdhci_host *host = dev_get_drvdata(dev);
< at >< at > -213,7 +213,7 < at >< at > static void sdhci_tegra_parse_dt(struct device *dev)
 struct sdhci_tegra *tegra_host = pltfm_host->priv;
 
 tegra_host->power_gpio = of_get_named_gpio(np, "power-gpios", 0);
-mmc_of_parse(host->mmc);
+return mmc_of_parse(host->mmc);
 }
 
 static int sdhci_tegra_probe(struct platform_device *pdev)
< at >< at > -245,7 +245,9 < at >< at > static int sdhci_tegra_probe(struct platform_device *pdev)
 tegra_host->soc_data = soc_data;
 pltfm_host->priv = tegra_host;
 
-sdhci_tegra_parse_dt(&pdev->dev);
+rc = sdhci_tegra_parse_dt(&pdev->dev);
+if (rc)
+goto err_parse_dt;
 
 if (gpio_is_valid(tegra_host->power_gpio)) {
 rc = gpio_request(tegra_host->power_gpio, "sdhci_power");
< at >< at > -278,6 +280,7 < at >< at > err_add_host:
 err_clk_get:
 if (gpio_is_valid(tegra_host->power_gpio))
 gpio_free(tegra_host->power_gpio);
+err_parse_dt:
 err_power_req:
 err_alloc_tegra_host:
 sdhci_pltfm_free(pdev);

[PATCH V3 08/10] mmc: mvsdio: use standard MMC device-tree binding parser mmc_of_parse()

Simon Baatz — 2013-05-20T23:01:49

Instead of parsing the DT binding on our own, use the standard parser
mmc_of_parse(), introduced by commit 6c56e7a.

Signed-off-by: Simon Baatz <gmbnomis< at >gmail.com>
---
 drivers/mmc/host/mvsdio.c |   73 +++++++++++++++++++++++++--------------------
 1 file changed, 40 insertions(+), 33 deletions(-)

diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
index 8960fc8..edfc481 100644
--- a/drivers/mmc/host/mvsdio.c
+++ b/drivers/mmc/host/mvsdio.c
< at >< at > -35,7 +35,7 < at >< at >
 
 #define DRIVER_NAME"mvsdio"
 
-static int maxfreq = MVSD_CLOCKRATE_MAX;
+static int maxfreq;
 static int nodma;
 
 struct mvsd_host {
< at >< at > -685,7 +685,6 < at >< at > static int __init mvsd_probe(struct platform_device *pdev)
 const struct mbus_dram_target_info *dram;
 struct resource *r;
 int ret, irq;
-int gpio_card_detect, gpio_write_protect;
 struct pinctrl *pinctrl;
 
 r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
< at >< at > -718,6 +717,20 < at >< at > static int __init mvsd_probe(struct platform_device *pdev)
 if (!IS_ERR(host->clk))
 clk_prepare_enable(host->clk);
 
+mmc->ops = &mvsd_ops;
+
+mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
+
+mmc->f_min = DIV_ROUND_UP(host->base_clock, MVSD_BASE_DIV_MAX);
+mmc->f_max = MVSD_CLOCKRATE_MAX;
+
+mmc->max_blk_size = 2048;
+mmc->max_blk_count = 65535;
+
+mmc->max_segs = 1;
+mmc->max_seg_size = mmc->max_blk_size * mmc->max_blk_count;
+mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count;
+
 if (np) {
 if (IS_ERR(host->clk)) {
 dev_err(&pdev->dev, "DT platforms must have a clock associated\n");
< at >< at > -726,35 +739,38 < at >< at > static int __init mvsd_probe(struct platform_device *pdev)
 }
 
 host->base_clock = clk_get_rate(host->clk) / 2;
-gpio_card_detect = of_get_named_gpio(np, "cd-gpios", 0);
-gpio_write_protect = of_get_named_gpio(np, "wp-gpios", 0);
+ret = mmc_of_parse(mmc);
+if (ret < 0)
+goto out;
 } else {
 const struct mvsdio_platform_data *mvsd_data;
+
 mvsd_data = pdev->dev.platform_data;
 if (!mvsd_data) {
 ret = -ENXIO;
 goto out;
 }
+mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO_IRQ |
+    MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED;
 host->base_clock = mvsd_data->clock / 2;
-gpio_card_detect = mvsd_data->gpio_card_detect ? : -EINVAL;
-gpio_write_protect = mvsd_data->gpio_write_protect ? : -EINVAL;
-}
-
-mmc->ops = &mvsd_ops;
-
-mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
-mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO_IRQ |
-    MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED;
-
-mmc->f_min = DIV_ROUND_UP(host->base_clock, MVSD_BASE_DIV_MAX);
-mmc->f_max = maxfreq;
+/* GPIO 0 regarded as invalid for backward compatibility */
+if (mvsd_data->gpio_card_detect &&
+    gpio_is_valid(mvsd_data->gpio_card_detect)) {
+ret = mmc_gpio_request_cd(mmc,
+  mvsd_data->gpio_card_detect);
+if (ret)
+goto out;
+} else {
+mmc->caps |= MMC_CAP_NEEDS_POLL;
+}
 
-mmc->max_blk_size = 2048;
-mmc->max_blk_count = 65535;
+if (mvsd_data->gpio_write_protect &&
+    gpio_is_valid(mvsd_data->gpio_write_protect))
+mmc_gpio_request_ro(mmc, mvsd_data->gpio_write_protect);
+}
 
-mmc->max_segs = 1;
-mmc->max_seg_size = mmc->max_blk_size * mmc->max_blk_count;
-mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count;
+if (maxfreq)
+mmc->f_max = maxfreq;
 
 spin_lock_init(&host->lock);
 
< at >< at > -777,15 +793,6 < at >< at > static int __init mvsd_probe(struct platform_device *pdev)
 goto out;
 }
 
-if (gpio_is_valid(gpio_card_detect)) {
-ret = mmc_gpio_request_cd(mmc, gpio_card_detect);
-if (ret)
-goto out;
-} else
-mmc->caps |= MMC_CAP_NEEDS_POLL;
-
-mmc_gpio_request_ro(mmc, gpio_write_protect);
-
 setup_timer(&host->timer, mvsd_timeout_timer, (unsigned long)host);
 platform_set_drvdata(pdev, mmc);
 ret = mmc_add_host(mmc);
< at >< at > -793,10 +800,10 < at >< at > static int __init mvsd_probe(struct platform_device *pdev)
 goto out;
 
 if (!(mmc->caps & MMC_CAP_NEEDS_POLL))
-dev_notice(&pdev->dev, "using GPIO %d for card detection\n",
-   gpio_card_detect);
+dev_notice(&pdev->dev, "using GPIO for card detection\n");
 else
-dev_notice(&pdev->dev, "lacking card detect (fall back to polling)\n");
+dev_notice(&pdev->dev,
+   "lacking card detect (fall back to polling)\n");
 return 0;
 
 out:

[PATCH V3 04/10] mmc: mxcmmc: handle mmc_of_parse() errors during probe

Simon Baatz — 2013-05-20T23:01:45

Signed-off-by: Simon Baatz <gmbnomis< at >gmail.com>
---
 drivers/mmc/host/mxcmmc.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c
index d503635..f47546f 100644
--- a/drivers/mmc/host/mxcmmc.c
+++ b/drivers/mmc/host/mxcmmc.c
< at >< at > -1067,7 +1067,9 < at >< at > static int mxcmci_probe(struct platform_device *pdev)
 goto out_release_mem;
 }
 
-mmc_of_parse(mmc);
+ret = mmc_of_parse(mmc);
+if (ret)
+goto out_free;
 mmc->ops = &mxcmci_ops;
 
 /* For devicetree parsing, the bus width is read from devicetree */