From: kbaidarov@dev•rtsoft.ru (Konstantin Baydarov)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v3 3/7] OMAP2+: use control module mfd driver in omap_type
Date: Wed, 27 Jun 2012 22:04:58 +0400 [thread overview]
Message-ID: <4FEB4B4A.1040204@dev.rtsoft.ru> (raw)
OMAP system control module can be probed early, then
omap_type is safe to use its APIs.
TODO: add support for other omap versions
Signed-off-by: Konstantin Baydarov <kbaidarov@dev•rtsoft.ru>
---
arch/arm/mach-omap2/id.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 00486a8..1b0cec8 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -18,6 +18,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/io.h>
+#include <linux/mfd/omap_control.h>
#include <asm/cputype.h>
@@ -43,13 +44,13 @@ int omap_type(void)
u32 val = 0;
if (cpu_is_omap24xx()) {
- val = omap_ctrl_readl(OMAP24XX_CONTROL_STATUS);
+ val = omap_control_status_read(OMAP24XX_CONTROL_STATUS);
} else if (cpu_is_am33xx()) {
- val = omap_ctrl_readl(AM33XX_CONTROL_STATUS);
+ val = omap_control_status_read(AM33XX_CONTROL_STATUS);
} else if (cpu_is_omap34xx()) {
- val = omap_ctrl_readl(OMAP343X_CONTROL_STATUS);
+ val = omap_control_status_read(OMAP343X_CONTROL_STATUS);
} else if (cpu_is_omap44xx()) {
- val = omap_ctrl_readl(OMAP4_CTRL_MODULE_CORE_STATUS);
+ val = omap_control_status_read(OMAP4_CTRL_MODULE_CORE_STATUS);
} else {
pr_err("Cannot detect omap type!\n");
goto out;
--
1.7.7.6
next reply other threads:[~2012-06-27 18:04 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-27 18:04 Konstantin Baydarov [this message]
2012-06-28 6:32 ` [PATCH v3 3/7] OMAP2+: use control module mfd driver in omap_type Tony Lindgren
2012-08-08 13:50 ` Tony Lindgren
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=4FEB4B4A.1040204@dev.rtsoft.ru \
--to=kbaidarov@dev$(echo .)rtsoft.ru \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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