diff options
| author | viresh kumar <viresh.kumar@st.com> | 2011-02-16 09:40:30 +0300 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-09 12:49:44 +0300 |
| commit | 53688c51e412b7fd642e5c8eb8ba8ee19744c4ea (patch) | |
| tree | 3b4ef416df3f04841f48996414107e5220f0ca81 /arch/arm/mach-spear3xx/spear310.c | |
| parent | f9324a85c10ee109022672ec72db9e2eb37050ee (diff) | |
| download | linux-53688c51e412b7fd642e5c8eb8ba8ee19744c4ea.tar.xz | |
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/spear310.c')
| -rw-r--r-- | arch/arm/mach-spear3xx/spear310.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/mach-spear3xx/spear310.c b/arch/arm/mach-spear3xx/spear310.c index 53b41b52d7ee..f38eb2146e2f 100644 --- a/arch/arm/mach-spear3xx/spear310.c +++ b/arch/arm/mach-spear3xx/spear310.c @@ -293,10 +293,11 @@ void __init spear310_init(void) if (ret) printk(KERN_ERR "Error registering Shared IRQ 4\n"); } -} -void spear310_pmx_init(void) -{ - spear_pmx_init(&pmx_driver, SPEAR310_SOC_CONFIG_BASE, - SPEAR310_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); } |