From 393a06f0f04d4efa07c129c8f85e156433345ccc Mon Sep 17 00:00:00 2001 From: Haojian Zhuang Date: Mon, 25 Jan 2010 06:03:25 -0500 Subject: [PATCH] --- yaml --- r: 187471 b: refs/heads/master c: 247b4592f385622774de877f568fc30eb37dc831 h: refs/heads/master i: 187469: 084caeee068ff5efc495665ffa901e7eecf8f776 187467: cc633b2beb21364d4d0e6f97feb8888aaac3ad57 187463: d69fc5e6ca8900e18f3e3fa0778c8ef681eba658 187455: d3e01d032d290798bfd2cc87ac1a3a0db25c3fe1 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-mmp/include/mach/mfp-mmp2.h | 4 ++++ trunk/arch/arm/mach-mmp/mmp2.c | 7 +++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index da59614f7a1e..8665de2614b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4e3b4da98e20c5dc58e544ac5b321c1942071f7f +refs/heads/master: 247b4592f385622774de877f568fc30eb37dc831 diff --git a/trunk/arch/arm/mach-mmp/include/mach/mfp-mmp2.h b/trunk/arch/arm/mach-mmp/include/mach/mfp-mmp2.h index 937151085349..9f9f8143e272 100644 --- a/trunk/arch/arm/mach-mmp/include/mach/mfp-mmp2.h +++ b/trunk/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/trunk/arch/arm/mach-mmp/mmp2.c b/trunk/arch/arm/mach-mmp/mmp2.c index a9ca93d97412..561194d3bb43 100644 --- a/trunk/arch/arm/mach-mmp/mmp2.c +++ b/trunk/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)); }