From: pHilipp Zabel <philipp.zabel@gmail.com>
To: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: Ian Molton <ian@mnementh.co.uk>,
linux-kernel@vger.kernel.org, Magnus Damm <damm@opensource.se>,
akpm@linux-foundation.org, Matt Fleming <matt@console-pimps.org>,
Philip Langdale <philipl@overt.org>
Subject: Re: [PATCH] tmio_mmc: Optionally support using platform clock
Date: Wed, 29 Jul 2009 17:20:40 +0200 [thread overview]
Message-ID: <74d0deb30907290820x13214f68u82dea4ad229ebdac@mail.gmail.com> (raw)
In-Reply-To: <Pine.LNX.4.64.0907280937000.4943@axis700.grange>
On Tue, Jul 28, 2009 at 9:51 AM, Guennadi
Liakhovetski<g.liakhovetski@gmx.de> wrote:
> If the platform device has a clock associated with the tmio-mmc device,
> use it.
>
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> Cc: Magnus Damm <damm@opensource.se>
> ---
>
> Depends (at least logically) on
> http://marc.info/?l=linux-kernel&m=124782904228865&w=2
>
> Sorry if I forgot anyone who volunteered to help out with MMC patches.
>
> drivers/mmc/host/tmio_mmc.c | 21 +++++++++++++++++++++
> drivers/mmc/host/tmio_mmc.h | 3 +++
> include/linux/mfd/tmio.h | 1 +
> 3 files changed, 25 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c
> index c246191..2a01572 100644
> --- a/drivers/mmc/host/tmio_mmc.c
> +++ b/drivers/mmc/host/tmio_mmc.c
> @@ -32,6 +32,7 @@
> #include <linux/mmc/host.h>
> #include <linux/mfd/core.h>
> #include <linux/mfd/tmio.h>
> +#include <linux/clk.h>
>
> #include "tmio_mmc.h"
>
> @@ -57,10 +58,18 @@ static void tmio_mmc_clk_stop(struct tmio_mmc_host *host)
> sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, ~0x0100 &
> sd_ctrl_read16(host, CTL_SD_CARD_CLK_CTL));
> msleep(10);
> + if (!IS_ERR(host->clk) && host->clk_is_running) {
> + clk_disable(host->clk);
> + host->clk_is_running = false;
> + }
> }
>
> static void tmio_mmc_clk_start(struct tmio_mmc_host *host)
> {
> + if (!IS_ERR(host->clk) && !host->clk_is_running &&
> + !clk_enable(host->clk))
> + host->clk_is_running = true;
> +
> sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, 0x0100 |
> sd_ctrl_read16(host, CTL_SD_CARD_CLK_CTL));
> msleep(10);
> @@ -567,6 +576,11 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev)
> goto unmap_cnf;
> }
>
> + host->clk = clk_get(&dev->dev, pdata->clk_name);
Instead of pdata->clk_name, this should be either NULL or better
"HCLK" (to differentiate from CLK32, not sure if we want to be able to
toggle that, too, in the future).
Passing the clock consumer ID via pdata is just wrong and shouldn't be
needed with clkdev.
> +
> + if (!IS_ERR(host->clk) && !clk_enable(host->clk))
> + host->clk_is_running = true;
> +
> /* Enable the MMC/SD Control registers */
> sd_config_write16(host, CNF_CMD, SDCREN);
> sd_config_write32(host, CNF_CTL_BASE,
> @@ -608,6 +622,11 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev)
> return 0;
>
> unmap_cnf:
> + if (!IS_ERR(host->clk)) {
> + clk_disable(host->clk);
> + host->clk_is_running = false;
> + clk_put(host->clk);
> + }
> if (host->cnf)
> iounmap(host->cnf);
> unmap_ctl:
> @@ -632,6 +651,8 @@ static int __devexit tmio_mmc_remove(struct platform_device *dev)
> if (host->cnf)
> iounmap(host->cnf);
> mmc_free_host(mmc);
> + if (!IS_ERR(host->clk))
> + clk_put(host->clk);
> }
>
> return 0;
> diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h
> index 45f06aa..a76d237 100644
> --- a/drivers/mmc/host/tmio_mmc.h
> +++ b/drivers/mmc/host/tmio_mmc.h
> @@ -108,6 +108,7 @@
> sd_ctrl_write32((host), CTL_STATUS, mask); \
> } while (0)
>
> +struct clk;
>
> struct tmio_mmc_host {
> void __iomem *cnf;
> @@ -117,6 +118,8 @@ struct tmio_mmc_host {
> struct mmc_request *mrq;
> struct mmc_data *data;
> struct mmc_host *mmc;
> + struct clk *clk;
> + bool clk_is_running;
> int irq;
>
> /* pio related stuff */
> diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h
> index 6b9c5d0..e405895 100644
> --- a/include/linux/mfd/tmio.h
> +++ b/include/linux/mfd/tmio.h
> @@ -23,6 +23,7 @@
> */
> struct tmio_mmc_data {
> const unsigned int hclk;
> + const char *clk_name;
Drop that.
> };
>
> /*
> --
> 1.6.2.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
Otherwise that patch doesn't seem wrong to me?
As soon as we have the possibility for MFD drivers to provide their
own clk API implementation, this should also work with ASIC3/TMIO.
I'll try to register my ASIC3 HCLK with clkdev and see if this patch
works.
regards
Philipp
next prev parent reply other threads:[~2009-07-29 15:41 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-28 7:51 Guennadi Liakhovetski
2009-07-28 11:48 ` Matt Fleming
2009-07-28 13:39 ` Ian Molton
2009-07-28 13:46 ` Ian Molton
2009-07-28 15:45 ` Guennadi Liakhovetski
2009-07-28 17:09 ` Ian Molton
2009-08-01 14:10 ` Dmitry Eremin-Solenikov
2009-08-03 17:30 ` Ian Molton
2009-08-03 21:57 ` Dmitry Eremin-Solenikov
2009-07-29 15:20 ` pHilipp Zabel [this message]
2009-07-29 15:24 ` Magnus Damm
2009-07-29 15:33 ` pHilipp Zabel
2009-07-29 15:32 ` pHilipp Zabel
2009-07-29 23:40 ` Ian Molton
2009-07-29 21:12 ` pHilipp Zabel
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=74d0deb30907290820x13214f68u82dea4ad229ebdac@mail.gmail.com \
--to=philipp.zabel@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=damm@opensource.se \
--cc=g.liakhovetski@gmx.de \
--cc=ian@mnementh.co.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=matt@console-pimps.org \
--cc=philipl@overt.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
all inboxes | Powered by JetHome®