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 branch 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[pandora-kernel.git]
/
arch
/
arm
/
plat-mxc
/
iomux-v3.c
diff --git
a/arch/arm/plat-mxc/iomux-v3.c
b/arch/arm/plat-mxc/iomux-v3.c
index
77a078f
..
851ca99
100644
(file)
--- a/
arch/arm/plat-mxc/iomux-v3.c
+++ b/
arch/arm/plat-mxc/iomux-v3.c
@@
-29,7
+29,7
@@
#include <asm/mach/map.h>
#include <mach/iomux-v3.h>
#include <asm/mach/map.h>
#include <mach/iomux-v3.h>
-#define IOMUX_BASE IO_ADDRESS(IOMUXC_BASE_ADDR)
+static void __iomem *base;
static unsigned long iomux_v3_pad_alloc_map[0x200 / BITS_PER_LONG];
static unsigned long iomux_v3_pad_alloc_map[0x200 / BITS_PER_LONG];
@@
-45,14
+45,14
@@
int mxc_iomux_v3_setup_pad(struct pad_desc *pad)
if (test_and_set_bit(pad_ofs >> 2, iomux_v3_pad_alloc_map))
return -EBUSY;
if (pad->mux_ctrl_ofs)
if (test_and_set_bit(pad_ofs >> 2, iomux_v3_pad_alloc_map))
return -EBUSY;
if (pad->mux_ctrl_ofs)
- __raw_writel(pad->mux_mode,
IOMUX_BASE
+ pad->mux_ctrl_ofs);
+ __raw_writel(pad->mux_mode,
base
+ pad->mux_ctrl_ofs);
if (pad->select_input_ofs)
__raw_writel(pad->select_input,
if (pad->select_input_ofs)
__raw_writel(pad->select_input,
-
IOMUX_BASE
+ pad->select_input_ofs);
+
base
+ pad->select_input_ofs);
- if (!(pad->pad_ctrl & NO_PAD_CTRL))
- __raw_writel(pad->pad_ctrl,
IOMUX_BASE
+ pad->pad_ctrl_ofs);
+ if (!(pad->pad_ctrl & NO_PAD_CTRL)
&& pad->pad_ctrl_ofs
)
+ __raw_writel(pad->pad_ctrl,
base
+ pad->pad_ctrl_ofs);
return 0;
}
EXPORT_SYMBOL(mxc_iomux_v3_setup_pad);
return 0;
}
EXPORT_SYMBOL(mxc_iomux_v3_setup_pad);
@@
-96,3
+96,8
@@
void mxc_iomux_v3_release_multiple_pads(struct pad_desc *pad_list, int count)
}
}
EXPORT_SYMBOL(mxc_iomux_v3_release_multiple_pads);
}
}
EXPORT_SYMBOL(mxc_iomux_v3_release_multiple_pads);
+
+void mxc_iomux_v3_init(void __iomem *iomux_v3_base)
+{
+ base = iomux_v3_base;
+}