From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH V2 5/6] pcmcia: sa1111: provide device clock
Date: Mon, 24 Nov 2014 23:05:35 +0000 [thread overview]
Message-ID: <1416870336-30114-6-git-send-email-dbaryshkov@gmail.com> (raw)
In-Reply-To: <1416870336-30114-1-git-send-email-dbaryshkov@gmail.com>
Both pxa2xx (long ago) and sa1100 (now) make use of clock device to get
the cpu speed. Make sa1111 glue code provide clock to platform layer.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
drivers/pcmcia/sa1111_generic.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c
index 65b02c3..7bae7e5 100644
--- a/drivers/pcmcia/sa1111_generic.c
+++ b/drivers/pcmcia/sa1111_generic.c
@@ -145,6 +145,12 @@ int sa1111_pcmcia_add(struct sa1111_dev *dev, struct pcmcia_low_level *ops,
return -ENOMEM;
s->soc.nr = ops->first + i;
+ s->soc.clk = clk_get(&dev->dev, NULL);
+ if (IS_ERR(s->soc.clk)) {
+ ret = PTR_ERR(s->soc.clk);
+ kfree(s);
+ return ret;
+ }
soc_pcmcia_init_one(&s->soc, ops, &dev->dev);
s->dev = dev;
if (s->soc.nr) {
@@ -220,6 +226,7 @@ static int pcmcia_remove(struct sa1111_dev *dev)
for (; s; s = next) {
next = s->next;
soc_pcmcia_remove_one(&s->soc);
+ clk_put(s->soc.clk);
kfree(s);
}
--
2.1.3
next prev parent reply other threads:[~2014-11-24 23:05 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-24 23:05 [PATCH V2 0/6] ARM: sa1100: use clock api to get cpu freq in fb and pcmcia drivers Dmitry Eremin-Solenikov
2014-11-24 23:05 ` [PATCH V2 1/6] ARM: sa1100: add cpu clock Dmitry Eremin-Solenikov
2014-11-24 23:05 ` [PATCH V2 2/6] ARM: sa1100: add a clock alias for sa1111 pcmcia device Dmitry Eremin-Solenikov
2014-11-24 23:05 ` [PATCH V2 3/6] fbdev: sa1100fb: make use of device clock Dmitry Eremin-Solenikov
2014-11-24 23:05 ` [PATCH V2 4/6] pcmcia: soc-common: enable/disable socket clocks Dmitry Eremin-Solenikov
2014-11-24 23:05 ` Dmitry Eremin-Solenikov [this message]
2014-11-24 23:05 ` [PATCH V2 6/6] pcmcia: sa1100: make use of device clock Dmitry Eremin-Solenikov
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=1416870336-30114-6-git-send-email-dbaryshkov@gmail.com \
--to=dbaryshkov@gmail.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).