From: eric@eukrea.com (Eric Bénard)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/2] usb: fsl_mxc_udc.c: fix mxc_ahb_clk disable for i.MX25
Date: Tue, 8 May 2012 09:18:30 +0200 [thread overview]
Message-ID: <1336461510-30190-2-git-send-email-eric@eukrea.com> (raw)
In-Reply-To: <1336461510-30190-1-git-send-email-eric@eukrea.com>
as i.MX35, i.MX25 doesn't have this clock so don't try to disable/put it.
Signed-off-by: Eric B?nard <eric@eukrea.com>
Cc: Sascha Hauer <kernel@pengutronix.de>
---
drivers/usb/gadget/fsl_mxc_udc.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/gadget/fsl_mxc_udc.c b/drivers/usb/gadget/fsl_mxc_udc.c
index 8bbf673..4e30fb6 100644
--- a/drivers/usb/gadget/fsl_mxc_udc.c
+++ b/drivers/usb/gadget/fsl_mxc_udc.c
@@ -78,10 +78,10 @@ eclkrate:
clk_put(mxc_usb_clk);
mxc_usb_clk = NULL;
egusb:
- if (!cpu_is_mx35())
+ if (!cpu_is_mx35() && !cpu_is_mx25())
clk_disable(mxc_ahb_clk);
eenahb:
- if (!cpu_is_mx35())
+ if (!cpu_is_mx35() && !cpu_is_mx25())
clk_put(mxc_ahb_clk);
return ret;
}
@@ -120,7 +120,7 @@ void fsl_udc_clk_release(void)
clk_disable(mxc_usb_clk);
clk_put(mxc_usb_clk);
}
- if (!cpu_is_mx35()) {
+ if (!cpu_is_mx35() && !cpu_is_mx25()) {
clk_disable(mxc_ahb_clk);
clk_put(mxc_ahb_clk);
}
--
1.7.7.6
next prev parent reply other threads:[~2012-05-08 7:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-08 7:18 [PATCH 1/2] usb: fsl_mxc_udc.c: add workaround for ENGcm09152 for i.MX25 Eric Bénard
2012-05-08 7:18 ` Eric Bénard [this message]
2012-05-09 2:59 ` Chen Peter-B29397
2012-05-09 7:24 ` Sascha Hauer
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=1336461510-30190-2-git-send-email-eric@eukrea.com \
--to=eric@eukrea.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).