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
Merge git://git.infradead.org/battery-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-spear3xx
/
spear310_evb.c
diff --git
a/arch/arm/mach-spear3xx/spear310_evb.c
b/arch/arm/mach-spear3xx/spear310_evb.c
index
7facf66
..
2d7f333
100644
(file)
--- a/
arch/arm/mach-spear3xx/spear310_evb.c
+++ b/
arch/arm/mach-spear3xx/spear310_evb.c
@@
-14,7
+14,7
@@
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
#include <mach/generic.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
#include <mach/generic.h>
-#include <mach/
spear
.h>
+#include <mach/
hardware
.h>
/* padmux devices to enable */
static struct pmx_dev *pmx_devs[] = {
/* padmux devices to enable */
static struct pmx_dev *pmx_devs[] = {
@@
-58,14
+58,13
@@
static void __init spear310_evb_init(void)
{
unsigned int i;
{
unsigned int i;
- /* call spear310 machine init function */
- spear310_init();
-
- /* padmux initialization */
+ /* padmux initialization, must be done before spear310_init */
pmx_driver.mode = NULL;
pmx_driver.devs = pmx_devs;
pmx_driver.devs_count = ARRAY_SIZE(pmx_devs);
pmx_driver.mode = NULL;
pmx_driver.devs = pmx_devs;
pmx_driver.devs_count = ARRAY_SIZE(pmx_devs);
- spear310_pmx_init();
+
+ /* call spear310 machine init function */
+ spear310_init();
/* Add Platform Devices */
platform_add_devices(plat_devs, ARRAY_SIZE(plat_devs));
/* Add Platform Devices */
platform_add_devices(plat_devs, ARRAY_SIZE(plat_devs));
@@
-79,6
+78,6
@@
MACHINE_START(SPEAR310, "ST-SPEAR310-EVB")
.boot_params = 0x00000100,
.map_io = spear3xx_map_io,
.init_irq = spear3xx_init_irq,
.boot_params = 0x00000100,
.map_io = spear3xx_map_io,
.init_irq = spear3xx_init_irq,
- .timer = &spear
_sys
_timer,
+ .timer = &spear
3xx
_timer,
.init_machine = spear310_evb_init,
MACHINE_END
.init_machine = spear310_evb_init,
MACHINE_END