aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-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 937151085349..9f9f8143e272 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 @@
231/* Codec*/ 231/* Codec*/
232#define GPIO23_GPIO23 MFP_CFG(GPIO23, AF0) 232#define GPIO23_GPIO23 MFP_CFG(GPIO23, AF0)
233 233
234#define GPIO101_GPIO101 MFP_CFG(GPIO101, AF0)
235
236/* PMIC */
237#define PMIC_PMIC_INT MFP_CFG(PMIC_INT, AF0)
234 238
235#endif /* __ASM_MACH_MFP_MMP2_H */ 239#endif /* __ASM_MACH_MFP_MMP2_H */
236 240
diff --git a/arch/arm/mach-mmp/mmp2.c b/arch/arm/mach-mmp/mmp2.c
index a9ca93d97412..561194d3bb43 100644
--- a/arch/arm/mach-mmp/mmp2.c
+++ b/arch/arm/mach-mmp/mmp2.c
@@ -28,6 +28,12 @@
28 28
29#define MFPR_VIRT_BASE (APB_VIRT_BASE + 0x1e000) 29#define MFPR_VIRT_BASE (APB_VIRT_BASE + 0x1e000)
30 30
31static struct mfp_addr_map mmp2_addr_map[] __initdata = {
32 MFP_ADDR(PMIC_INT, 0x2c4),
33
34 MFP_ADDR_END,
35};
36
31/* APB peripheral clocks */ 37/* APB peripheral clocks */
32static APBC_CLK(uart1, MMP2_UART1, 1, 26000000); 38static APBC_CLK(uart1, MMP2_UART1, 1, 26000000);
33static APBC_CLK(uart2, MMP2_UART2, 1, 26000000); 39static APBC_CLK(uart2, MMP2_UART2, 1, 26000000);
@@ -61,6 +67,7 @@ static int __init mmp2_init(void)
61{ 67{
62 if (cpu_is_mmp2()) { 68 if (cpu_is_mmp2()) {
63 mfp_init_base(MFPR_VIRT_BASE); 69 mfp_init_base(MFPR_VIRT_BASE);
70 mfp_init_addr(mmp2_addr_map);
64 clks_register(ARRAY_AND_SIZE(mmp2_clkregs)); 71 clks_register(ARRAY_AND_SIZE(mmp2_clkregs));
65 } 72 }
66 73