From: kbaidarov@dev.rtsoft.ru (Konstantin Baydarov) Date: Mon, 18 Jun 2012 15:32:22 +0400 Subject: [RFC PATCH v2 04/11] OMAP2+: use control module mfd driver in omap_type In-Reply-To: <1337934361-1606-1-git-send-email-eduardo.valentin@ti.com> References: <1337934361-1606-1-git-send-email-eduardo.valentin@ti.com> Message-ID: <4FDF11C6.6000400@dev.rtsoft.ru> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 --- arch/arm/mach-omap2/id.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) Index: linux-2.6/arch/arm/mach-omap2/id.c =================================================================== --- linux-2.6.orig/arch/arm/mach-omap2/id.c +++ linux-2.6/arch/arm/mach-omap2/id.c @@ -18,6 +18,7 @@ #include #include #include +#include #include @@ -38,6 +39,8 @@ unsigned int omap_rev(void) } EXPORT_SYMBOL(omap_rev); +u32 omap_control_readl(u16 offset); + int omap_type(void) { u32 val = 0; @@ -49,7 +52,7 @@ int omap_type(void) } else if (cpu_is_omap34xx()) { val = omap_ctrl_readl(OMAP343X_CONTROL_STATUS); } else if (cpu_is_omap44xx()) { - val = omap_ctrl_readl(OMAP4_CTRL_MODULE_CORE_STATUS); + val = omap_control_readl(OMAP4_CTRL_MODULE_CORE_STATUS); } else { pr_err("Cannot detect omap type!\n"); goto out;