Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52b2bd7f authored by eric miao's avatar eric miao Committed by Russell King
Browse files

[ARM] 4654/1: pxa: update default MFP register value 



1. update default MFPR value to drive strength fast 3mA and edge
   detection logic disabled

2. update impacted MFP_CFG_xxx() macros

Signed-off-by: default avatarbridge wu <bridge.wu@marvell.com>
Signed-off-by: default avatareric miao <eric.miao@marvell.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 43b35f10

include/asm-arm/arch-pxa/mfp.h

+13 −5
Original line number Diff line number Diff line
@@ -346,23 +346,31 @@ typedef uint32_t mfp_cfg_t; 
#define MFP_CFG_PIN(mfp_cfg)	(((mfp_cfg) >> 16) & 0xffff)

#define MFP_CFG_VAL(mfp_cfg)	((mfp_cfg) & 0xffff)



#define MFPR_DEFAULT	(0x0000)

/*

 * MFP register defaults to

 *   drive strength fast 3mA (010'b)

 *   edge detection logic disabled

 *   alternate function 0

 */

#define MFPR_DEFAULT	(0x0840)



#define MFP_CFG(pin, af)		\

	((MFP_PIN_##pin << 16) | MFPR_DEFAULT | (MFP_##af))



#define MFP_CFG_DRV(pin, af, drv)	\

	((MFP_PIN_##pin << 16) | MFPR_DEFAULT |\

	((MFP_PIN_##pin << 16) | (MFPR_DEFAULT & ~MFPR_DRV_MASK) |\

	 ((MFP_##drv) << 10) | (MFP_##af))



#define MFP_CFG_LPM(pin, af, lpm)	\

	((MFP_PIN_##pin << 16) | MFPR_DEFAULT | (MFP_##af) |\

	((MFP_PIN_##pin << 16) | (MFPR_DEFAULT & ~MFPR_LPM_MASK) |\

	 (((MFP_LPM_##lpm) & 0x3) << 7)  |\

	 (((MFP_LPM_##lpm) & 0x4) << 12) |\

	 (((MFP_LPM_##lpm) & 0x8) << 10))

	 (((MFP_LPM_##lpm) & 0x8) << 10) |\

	 (MFP_##af))



#define MFP_CFG_X(pin, af, drv, lpm)	\

	((MFP_PIN_##pin << 16) | MFPR_DEFAULT |\

	((MFP_PIN_##pin << 16) |\

	 (MFPR_DEFAULT & ~(MFPR_DRV_MASK | MFPR_LPM_MASK)) |\

	 ((MFP_##drv) << 10) | (MFP_##af) |\

	 (((MFP_LPM_##lpm) & 0x3) << 7)  |\

	 (((MFP_LPM_##lpm) & 0x4) << 12) |\