summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-spear3xx/spear320_evb.c
diff options
context:
space:
mode:
authorviresh kumar <viresh.kumar@st.com>2011-02-16 07:40:30 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-03-09 09:49:44 +0000
commit53688c51e412b7fd642e5c8eb8ba8ee19744c4ea (patch)
tree3b4ef416df3f04841f48996414107e5220f0ca81 /arch/arm/mach-spear3xx/spear320_evb.c
parentf9324a85c10ee109022672ec72db9e2eb37050ee (diff)
downloadtalos-op-linux-53688c51e412b7fd642e5c8eb8ba8ee19744c4ea.tar.gz
talos-op-linux-53688c51e412b7fd642e5c8eb8ba8ee19744c4ea.zip
ARM: 6678/1: SPEAr: update padmux code
- compile padmux only for spear3xx - padmux initialization code rearranged in evaluation board and machine files. Reviewed-by: Stanley Miao <stanley.miao@windriver.com> Signed-off-by: Viresh Kumar <viresh.kumar@st.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-spear3xx/spear320_evb.c')
-rw-r--r--arch/arm/mach-spear3xx/spear320_evb.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/mach-spear3xx/spear320_evb.c b/arch/arm/mach-spear3xx/spear320_evb.c
index 62ac685a4135..7083a06df9b6 100644
--- a/arch/arm/mach-spear3xx/spear320_evb.c
+++ b/arch/arm/mach-spear3xx/spear320_evb.c
@@ -55,14 +55,13 @@ static void __init spear320_evb_init(void)
{
unsigned int i;
- /* call spear320 machine init function */
- spear320_init();
-
- /* padmux initialization */
+ /* padmux initialization, must be done before spear320_init */
pmx_driver.mode = &auto_net_mii_mode;
pmx_driver.devs = pmx_devs;
pmx_driver.devs_count = ARRAY_SIZE(pmx_devs);
- spear320_pmx_init();
+
+ /* call spear320 machine init function */
+ spear320_init();
/* Add Platform Devices */
platform_add_devices(plat_devs, ARRAY_SIZE(plat_devs));
OpenPOWER on IntegriCloud