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.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
arch
/
arm
/
plat-mxc
/
audmux-v2.c
diff --git
a/arch/arm/plat-mxc/audmux-v2.c
b/arch/arm/plat-mxc/audmux-v2.c
index
b06954a
..
d983cd6
100644
(file)
--- a/
arch/arm/plat-mxc/audmux-v2.c
+++ b/
arch/arm/plat-mxc/audmux-v2.c
@@
-190,7
+190,10
@@
static int mxc_audmux_v2_init(void)
{
int ret;
{
int ret;
- if (cpu_is_mx35()) {
+ if (cpu_is_mx31())
+ audmux_base = MX31_IO_ADDRESS(MX31_AUDMUX_BASE_ADDR);
+
+ else if (cpu_is_mx35()) {
audmux_clk = clk_get(NULL, "audmux");
if (IS_ERR(audmux_clk)) {
ret = PTR_ERR(audmux_clk);
audmux_clk = clk_get(NULL, "audmux");
if (IS_ERR(audmux_clk)) {
ret = PTR_ERR(audmux_clk);
@@
-198,11
+201,9
@@
static int mxc_audmux_v2_init(void)
ret);
return ret;
}
ret);
return ret;
}
+ audmux_base = MX35_IO_ADDRESS(MX35_AUDMUX_BASE_ADDR);
}
}
- if (cpu_is_mx31() || cpu_is_mx35())
- audmux_base = IO_ADDRESS(AUDMUX_BASE_ADDR);
-
audmux_debugfs_init();
return 0;
audmux_debugfs_init();
return 0;