Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=52b2bd7f97e2677f8d6f5cef675f86bba732e860
Commit:     52b2bd7f97e2677f8d6f5cef675f86bba732e860
Parent:     43b35f104d20c03fd1741d25c370a94485e2cae6
Author:     eric miao <[EMAIL PROTECTED]>
AuthorDate: Tue Nov 20 01:36:44 2007 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Mon Nov 26 14:38:57 2007 +0000

    [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: bridge wu <[EMAIL PROTECTED]>
    Signed-off-by: eric miao <[EMAIL PROTECTED]>
    Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 include/asm-arm/arch-pxa/mfp.h |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/include/asm-arm/arch-pxa/mfp.h b/include/asm-arm/arch-pxa/mfp.h
index ac4157a..03c508d 100644
--- a/include/asm-arm/arch-pxa/mfp.h
+++ b/include/asm-arm/arch-pxa/mfp.h
@@ -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) |\
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to