aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-mmp
diff options
context:
space:
mode:
authorHaojian Zhuang <haojian.zhuang@gmail.com>2010-01-25 06:03:25 -0500
committerEric Miao <eric.y.miao@gmail.com>2010-03-02 07:40:56 +0800
commit247b4592f385622774de877f568fc30eb37dc831 (patch)
tree4aab5326553be54e3f4b5b2297b1af8cf2fd5dbe /arch/arm/mach-mmp
parent4e3b4da98e20c5dc58e544ac5b321c1942071f7f (diff)
downloadlinux-2.6.34-ux500-247b4592f385622774de877f568fc30eb37dc831.tar.gz
[ARM] mmp2: add mfpr setting
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/mach-mmp')
-rw-r--r--arch/arm/mach-mmp/include/mach/mfp-mmp2.h4
-rw-r--r--arch/arm/mach-mmp/mmp2.c7
2 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-mmp/include/mach/mfp-mmp2.h b/arch/arm/mach-mmp/include/mach/mfp-mmp2.h
index 93715108534..9f9f8143e27 100644
--- a/arch/arm/mach-mmp/include/mach/mfp-mmp2.h
+++ b/arch/arm/mach-mmp/include/mach/mfp-mmp2.h
@@ -231,6 +231,10 @@
/* Codec*/
#define GPIO23_GPIO23 MFP_CFG(GPIO23, AF0)
+#define GPIO101_GPIO101 MFP_CFG(GPIO101, AF0)
+
+/* PMIC */
+#define PMIC_PMIC_INT MFP_CFG(PMIC_INT, AF0)
#endif /* __ASM_MACH_MFP_MMP2_H */
diff --git a/arch/arm/mach-mmp/mmp2.c b/arch/arm/mach-mmp/mmp2.c
index a9ca93d9741..561194d3bb4 100644
--- a/arch/arm/mach-mmp/mmp2.c
+++ b/arch/arm/mach-mmp/mmp2.c
@@ -28,6 +28,12 @@
#define MFPR_VIRT_BASE (APB_VIRT_BASE + 0x1e000)
+static struct mfp_addr_map mmp2_addr_map[] __initdata = {
+ MFP_ADDR(PMIC_INT, 0x2c4),
+
+ MFP_ADDR_END,
+};
+
/* APB peripheral clocks */
static APBC_CLK(uart1, MMP2_UART1, 1, 26000000);
static APBC_CLK(uart2, MMP2_UART2, 1, 26000000);
@@ -61,6 +67,7 @@ static int __init mmp2_init(void)
{
if (cpu_is_mmp2()) {
mfp_init_base(MFPR_VIRT_BASE);
+ mfp_init_addr(mmp2_addr_map);
clks_register(ARRAY_AND_SIZE(mmp2_clkregs));
}