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>

1 files changed, 4 insertions, 5 deletions

diff --git a/arch/arm/mach-spear3xx/spear310_evb.c b/arch/arm/mach-spear3xx/spear310_evb.c
index 7facf664319..4e55e553a2c 100644
--- a/arch/arm/mach-spear3xx/spear310_evb.c
+++ b/arch/arm/mach-spear3xx/spear310_evb.c
@@ -58,14 +58,13 @@ static void __init spear310_evb_init(void)
 {
         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);
-        spear310_pmx_init();
+
+        /* call spear310 machine init function */
+        spear310_init();
 
         /* Add Platform Devices */
         platform_add_devices(plat_devs, ARRAY_SIZE(plat_devs));