* [PATCH v1 1/2] mmc: sdhci-dove: Add SDHCI_QUIRK_NO_HISPD_BIT
@ 2012-07-05 10:14 Sebastian Hesselbarth
2012-07-05 10:14 ` [PATCH v1 2/2] mmc: sdhci-dove: Prepare for common clock framework Sebastian Hesselbarth
2012-07-21 23:29 ` [PATCH v1 1/2] mmc: sdhci-dove: Add SDHCI_QUIRK_NO_HISPD_BIT Chris Ball
0 siblings, 2 replies; 4+ messages in thread
From: Sebastian Hesselbarth @ 2012-07-05 10:14 UTC (permalink / raw)
To: Sebastian Hesselbarth
Cc: Chris Ball, Anton Vorontsov, Shawn Guo, Viresh Kumar,
Manuel Lauss, linux-mmc, linux-arm-kernel, linux-kernel
The sdio controller on dove doesn't have a bit to indicate
high-speed. With the quirk set it fixes accessing high-speed
sdcards.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@googlemail.com>
Cc: Chris Ball <cjb@laptop.org>
Cc: Anton Vorontsov <cbouatmailru@gmail.com>
Cc: Shawn Guo <shawn.guo@linaro.org>
Cc: Viresh Kumar <viresh.kumar@st.com>
Cc: Manuel Lauss <manuel.lauss@googlemail.com>
Cc: linux-mmc@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
---
drivers/mmc/host/sdhci-dove.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/host/sdhci-dove.c b/drivers/mmc/host/sdhci-dove.c
index 177f697..9c85368 100644
--- a/drivers/mmc/host/sdhci-dove.c
+++ b/drivers/mmc/host/sdhci-dove.c
@@ -66,7 +66,8 @@ static struct sdhci_pltfm_data sdhci_dove_pdata = {
.quirks = SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER |
SDHCI_QUIRK_NO_BUSY_IRQ |
SDHCI_QUIRK_BROKEN_TIMEOUT_VAL |
- SDHCI_QUIRK_FORCE_DMA,
+ SDHCI_QUIRK_FORCE_DMA |
+ SDHCI_QUIRK_NO_HISPD_BIT,
};
static int __devinit sdhci_dove_probe(struct platform_device *pdev)
--
1.7.10
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v1 2/2] mmc: sdhci-dove: Prepare for common clock framework
2012-07-05 10:14 [PATCH v1 1/2] mmc: sdhci-dove: Add SDHCI_QUIRK_NO_HISPD_BIT Sebastian Hesselbarth
@ 2012-07-05 10:14 ` Sebastian Hesselbarth
2012-07-21 23:30 ` Chris Ball
2012-07-21 23:29 ` [PATCH v1 1/2] mmc: sdhci-dove: Add SDHCI_QUIRK_NO_HISPD_BIT Chris Ball
1 sibling, 1 reply; 4+ messages in thread
From: Sebastian Hesselbarth @ 2012-07-05 10:14 UTC (permalink / raw)
To: Sebastian Hesselbarth
Cc: Chris Ball, Anton Vorontsov, Shawn Guo, Viresh Kumar,
Manuel Lauss, linux-mmc, linux-arm-kernel, linux-kernel
As mach-dove is moving towards common clock framework prepare
the sdhci driver to grab it's clock.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@googlemail.com>
Cc: Chris Ball <cjb@laptop.org>
Cc: Anton Vorontsov <cbouatmailru@gmail.com>
Cc: Shawn Guo <shawn.guo@linaro.org>
Cc: Viresh Kumar <viresh.kumar@st.com>
Cc: Manuel Lauss <manuel.lauss@googlemail.com>
Cc: linux-mmc@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
---
drivers/mmc/host/sdhci-dove.c | 48 ++++++++++++++++++++++++++++++++++++++++-
1 file changed, 47 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/host/sdhci-dove.c b/drivers/mmc/host/sdhci-dove.c
index 9c85368..a6e53a1 100644
--- a/drivers/mmc/host/sdhci-dove.c
+++ b/drivers/mmc/host/sdhci-dove.c
@@ -20,11 +20,17 @@
*/
#include <linux/io.h>
+#include <linux/clk.h>
+#include <linux/err.h>
#include <linux/module.h>
#include <linux/mmc/host.h>
#include "sdhci-pltfm.h"
+struct sdhci_dove_priv {
+ struct clk *clk;
+};
+
static u16 sdhci_dove_readw(struct sdhci_host *host, int reg)
{
u16 ret;
@@ -72,11 +78,51 @@ static struct sdhci_pltfm_data sdhci_dove_pdata = {
static int __devinit sdhci_dove_probe(struct platform_device *pdev)
{
- return sdhci_pltfm_register(pdev, &sdhci_dove_pdata);
+ struct sdhci_host *host;
+ struct sdhci_pltfm_host *pltfm_host;
+ struct sdhci_dove_priv *priv;
+ int ret;
+
+ ret = sdhci_pltfm_register(pdev, &sdhci_dove_pdata);
+ if (ret)
+ goto sdhci_dove_register_fail;
+
+ priv = devm_kzalloc(&pdev->dev, sizeof(struct sdhci_dove_priv),
+ GFP_KERNEL);
+ if (!priv) {
+ dev_err(&pdev->dev, "unable to allocate private data");
+ ret = -ENOMEM;
+ goto sdhci_dove_allocate_fail;
+ }
+
+ host = platform_get_drvdata(pdev);
+ pltfm_host = sdhci_priv(host);
+ pltfm_host->priv = priv;
+
+ priv->clk = clk_get(&pdev->dev, NULL);
+ if (!IS_ERR(priv->clk))
+ clk_prepare_enable(priv->clk);
+ return 0;
+
+sdhci_dove_allocate_fail:
+ sdhci_pltfm_unregister(pdev);
+sdhci_dove_register_fail:
+ return ret;
}
static int __devexit sdhci_dove_remove(struct platform_device *pdev)
{
+ struct sdhci_host *host = platform_get_drvdata(pdev);
+ struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+ struct sdhci_dove_priv *priv = pltfm_host->priv;
+
+ if (priv->clk) {
+ if (!IS_ERR(priv->clk)) {
+ clk_disable_unprepare(priv->clk);
+ clk_put(priv->clk);
+ }
+ devm_kfree(&pdev->dev, priv->clk);
+ }
return sdhci_pltfm_unregister(pdev);
}
--
1.7.10
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v1 1/2] mmc: sdhci-dove: Add SDHCI_QUIRK_NO_HISPD_BIT
2012-07-05 10:14 [PATCH v1 1/2] mmc: sdhci-dove: Add SDHCI_QUIRK_NO_HISPD_BIT Sebastian Hesselbarth
2012-07-05 10:14 ` [PATCH v1 2/2] mmc: sdhci-dove: Prepare for common clock framework Sebastian Hesselbarth
@ 2012-07-21 23:29 ` Chris Ball
1 sibling, 0 replies; 4+ messages in thread
From: Chris Ball @ 2012-07-21 23:29 UTC (permalink / raw)
To: Sebastian Hesselbarth
Cc: Anton Vorontsov, Shawn Guo, Viresh Kumar, Manuel Lauss,
linux-mmc, linux-arm-kernel, linux-kernel
Hi Sebastian,
On Thu, Jul 05 2012, Sebastian Hesselbarth wrote:
> The sdio controller on dove doesn't have a bit to indicate
> high-speed. With the quirk set it fixes accessing high-speed
> sdcards.
>
> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@googlemail.com>
> Cc: Chris Ball <cjb@laptop.org>
> Cc: Anton Vorontsov <cbouatmailru@gmail.com>
> Cc: Shawn Guo <shawn.guo@linaro.org>
> Cc: Viresh Kumar <viresh.kumar@st.com>
> Cc: Manuel Lauss <manuel.lauss@googlemail.com>
> Cc: linux-mmc@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-kernel@vger.kernel.org
> ---
> drivers/mmc/host/sdhci-dove.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/sdhci-dove.c b/drivers/mmc/host/sdhci-dove.c
> index 177f697..9c85368 100644
> --- a/drivers/mmc/host/sdhci-dove.c
> +++ b/drivers/mmc/host/sdhci-dove.c
> @@ -66,7 +66,8 @@ static struct sdhci_pltfm_data sdhci_dove_pdata = {
> .quirks = SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER |
> SDHCI_QUIRK_NO_BUSY_IRQ |
> SDHCI_QUIRK_BROKEN_TIMEOUT_VAL |
> - SDHCI_QUIRK_FORCE_DMA,
> + SDHCI_QUIRK_FORCE_DMA |
> + SDHCI_QUIRK_NO_HISPD_BIT,
> };
>
> static int __devinit sdhci_dove_probe(struct platform_device *pdev)
Thanks, pushed to mmc-next for 3.6.
- Chris.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v1 2/2] mmc: sdhci-dove: Prepare for common clock framework
2012-07-05 10:14 ` [PATCH v1 2/2] mmc: sdhci-dove: Prepare for common clock framework Sebastian Hesselbarth
@ 2012-07-21 23:30 ` Chris Ball
0 siblings, 0 replies; 4+ messages in thread
From: Chris Ball @ 2012-07-21 23:30 UTC (permalink / raw)
To: Sebastian Hesselbarth
Cc: Anton Vorontsov, Shawn Guo, Viresh Kumar, Manuel Lauss,
linux-mmc, linux-arm-kernel, linux-kernel
Hi,
On Thu, Jul 05 2012, Sebastian Hesselbarth wrote:
> As mach-dove is moving towards common clock framework prepare
> the sdhci driver to grab it's clock.
>
> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@googlemail.com>
> Cc: Chris Ball <cjb@laptop.org>
> Cc: Anton Vorontsov <cbouatmailru@gmail.com>
> Cc: Shawn Guo <shawn.guo@linaro.org>
> Cc: Viresh Kumar <viresh.kumar@st.com>
> Cc: Manuel Lauss <manuel.lauss@googlemail.com>
> Cc: linux-mmc@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-kernel@vger.kernel.org
> ---
> drivers/mmc/host/sdhci-dove.c | 48 ++++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 47 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/sdhci-dove.c b/drivers/mmc/host/sdhci-dove.c
> index 9c85368..a6e53a1 100644
> --- a/drivers/mmc/host/sdhci-dove.c
> +++ b/drivers/mmc/host/sdhci-dove.c
> @@ -20,11 +20,17 @@
> */
>
> #include <linux/io.h>
> +#include <linux/clk.h>
> +#include <linux/err.h>
> #include <linux/module.h>
> #include <linux/mmc/host.h>
>
> #include "sdhci-pltfm.h"
>
> +struct sdhci_dove_priv {
> + struct clk *clk;
> +};
> +
> static u16 sdhci_dove_readw(struct sdhci_host *host, int reg)
> {
> u16 ret;
> @@ -72,11 +78,51 @@ static struct sdhci_pltfm_data sdhci_dove_pdata = {
>
> static int __devinit sdhci_dove_probe(struct platform_device *pdev)
> {
> - return sdhci_pltfm_register(pdev, &sdhci_dove_pdata);
> + struct sdhci_host *host;
> + struct sdhci_pltfm_host *pltfm_host;
> + struct sdhci_dove_priv *priv;
> + int ret;
> +
> + ret = sdhci_pltfm_register(pdev, &sdhci_dove_pdata);
> + if (ret)
> + goto sdhci_dove_register_fail;
> +
> + priv = devm_kzalloc(&pdev->dev, sizeof(struct sdhci_dove_priv),
> + GFP_KERNEL);
> + if (!priv) {
> + dev_err(&pdev->dev, "unable to allocate private data");
> + ret = -ENOMEM;
> + goto sdhci_dove_allocate_fail;
> + }
> +
> + host = platform_get_drvdata(pdev);
> + pltfm_host = sdhci_priv(host);
> + pltfm_host->priv = priv;
> +
> + priv->clk = clk_get(&pdev->dev, NULL);
> + if (!IS_ERR(priv->clk))
> + clk_prepare_enable(priv->clk);
> + return 0;
> +
> +sdhci_dove_allocate_fail:
> + sdhci_pltfm_unregister(pdev);
> +sdhci_dove_register_fail:
> + return ret;
> }
>
> static int __devexit sdhci_dove_remove(struct platform_device *pdev)
> {
> + struct sdhci_host *host = platform_get_drvdata(pdev);
> + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
> + struct sdhci_dove_priv *priv = pltfm_host->priv;
> +
> + if (priv->clk) {
> + if (!IS_ERR(priv->clk)) {
> + clk_disable_unprepare(priv->clk);
> + clk_put(priv->clk);
> + }
> + devm_kfree(&pdev->dev, priv->clk);
> + }
> return sdhci_pltfm_unregister(pdev);
> }
Thanks, pushed to mmc-next for 3.6.
- Chris.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-07-21 23:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-05 10:14 [PATCH v1 1/2] mmc: sdhci-dove: Add SDHCI_QUIRK_NO_HISPD_BIT Sebastian Hesselbarth
2012-07-05 10:14 ` [PATCH v1 2/2] mmc: sdhci-dove: Prepare for common clock framework Sebastian Hesselbarth
2012-07-21 23:30 ` Chris Ball
2012-07-21 23:29 ` [PATCH v1 1/2] mmc: sdhci-dove: Add SDHCI_QUIRK_NO_HISPD_BIT Chris Ball
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).