git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: OMAP2+: Export SoC information to userspace
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
io.c
diff --git
a/arch/arm/mach-omap2/io.c
b/arch/arm/mach-omap2/io.c
index
a5d8dce
..
d2f3077
100644
(file)
--- a/
arch/arm/mach-omap2/io.c
+++ b/
arch/arm/mach-omap2/io.c
@@
-321,7
+321,6
@@
void __iomem *omap_irq_base;
static void __init omap_common_init_early(void)
{
static void __init omap_common_init_early(void)
{
- omap2_check_revision();
omap_ioremap_init();
omap_init_consistent_dma_size();
}
omap_ioremap_init();
omap_init_consistent_dma_size();
}
@@
-359,9
+358,11
@@
static void __init omap_hwmod_init_postsetup(void)
omap_pm_if_early_init();
}
omap_pm_if_early_init();
}
+#ifdef CONFIG_ARCH_OMAP2
void __init omap2420_init_early(void)
{
omap2_set_globals_242x();
void __init omap2420_init_early(void)
{
omap2_set_globals_242x();
+ omap2xxx_check_revision();
omap_common_init_early();
omap2xxx_voltagedomains_init();
omap242x_powerdomains_init();
omap_common_init_early();
omap2xxx_voltagedomains_init();
omap242x_powerdomains_init();
@@
-374,6
+375,7
@@
void __init omap2420_init_early(void)
void __init omap2430_init_early(void)
{
omap2_set_globals_243x();
void __init omap2430_init_early(void)
{
omap2_set_globals_243x();
+ omap2xxx_check_revision();
omap_common_init_early();
omap2xxx_voltagedomains_init();
omap243x_powerdomains_init();
omap_common_init_early();
omap2xxx_voltagedomains_init();
omap243x_powerdomains_init();
@@
-382,14
+384,18
@@
void __init omap2430_init_early(void)
omap_hwmod_init_postsetup();
omap2430_clk_init();
}
omap_hwmod_init_postsetup();
omap2430_clk_init();
}
+#endif
/*
* Currently only board-omap3beagle.c should call this because of the
* same machine_id for 34xx and 36xx beagle.. Will get fixed with DT.
*/
/*
* Currently only board-omap3beagle.c should call this because of the
* same machine_id for 34xx and 36xx beagle.. Will get fixed with DT.
*/
+#ifdef CONFIG_ARCH_OMAP3
void __init omap3_init_early(void)
{
omap2_set_globals_3xxx();
void __init omap3_init_early(void)
{
omap2_set_globals_3xxx();
+ omap3xxx_check_revision();
+ omap3xxx_check_features();
omap_common_init_early();
omap3xxx_voltagedomains_init();
omap3xxx_powerdomains_init();
omap_common_init_early();
omap3xxx_voltagedomains_init();
omap3xxx_powerdomains_init();
@@
-422,6
+428,8
@@
void __init am35xx_init_early(void)
void __init ti816x_init_early(void)
{
omap2_set_globals_ti816x();
void __init ti816x_init_early(void)
{
omap2_set_globals_ti816x();
+ omap3xxx_check_revision();
+ ti81xx_check_features();
omap_common_init_early();
omap3xxx_voltagedomains_init();
omap3xxx_powerdomains_init();
omap_common_init_early();
omap3xxx_voltagedomains_init();
omap3xxx_powerdomains_init();
@@
-430,10
+438,14
@@
void __init ti816x_init_early(void)
omap_hwmod_init_postsetup();
omap3xxx_clk_init();
}
omap_hwmod_init_postsetup();
omap3xxx_clk_init();
}
+#endif
+#ifdef CONFIG_ARCH_OMAP4
void __init omap4430_init_early(void)
{
omap2_set_globals_443x();
void __init omap4430_init_early(void)
{
omap2_set_globals_443x();
+ omap4xxx_check_revision();
+ omap4xxx_check_features();
omap_common_init_early();
omap44xx_voltagedomains_init();
omap44xx_powerdomains_init();
omap_common_init_early();
omap44xx_voltagedomains_init();
omap44xx_powerdomains_init();
@@
-442,6
+454,7
@@
void __init omap4430_init_early(void)
omap_hwmod_init_postsetup();
omap4xxx_clk_init();
}
omap_hwmod_init_postsetup();
omap4xxx_clk_init();
}
+#endif
void __init omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0,
struct omap_sdrc_params *sdrc_cs1)
void __init omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0,
struct omap_sdrc_params *sdrc_cs1)