aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-spear3xx/spear320.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.c
parentf9324a85c10ee109022672ec72db9e2eb37050ee (diff)
downloadkernel_goldelico_gta04-53688c51e412b7fd642e5c8eb8ba8ee19744c4ea.zip
kernel_goldelico_gta04-53688c51e412b7fd642e5c8eb8ba8ee19744c4ea.tar.gz
kernel_goldelico_gta04-53688c51e412b7fd642e5c8eb8ba8ee19744c4ea.tar.bz2
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.c')
-rw-r--r--arch/arm/mach-spear3xx/spear320.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/mach-spear3xx/spear320.c b/arch/arm/mach-spear3xx/spear320.c
index 88b4652..456bb33 100644
--- a/arch/arm/mach-spear3xx/spear320.c
+++ b/arch/arm/mach-spear3xx/spear320.c
@@ -540,10 +540,11 @@ void __init spear320_init(void)
if (ret)
printk(KERN_ERR "Error registering Shared IRQ 4\n");
}
-}
-void spear320_pmx_init(void)
-{
- spear_pmx_init(&pmx_driver, SPEAR320_SOC_CONFIG_BASE,
- SPEAR320_SOC_CONFIG_SIZE);
+ /* pmx initialization */
+ pmx_driver.base = base;
+ ret = pmx_register(&pmx_driver);
+ if (ret)
+ printk(KERN_ERR "padmux: registeration failed. err no: %d\n",
+ ret);
}