1 files changed, 8 insertions, 1 deletions

diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c
index a60f14e7983e..7f7b72464a37 100644
--- a/drivers/input/keyboard/pxa27x_keypad.c
+++ b/drivers/input/keyboard/pxa27x_keypad.c
@@ -391,7 +391,14 @@ static void pxa27x_keypad_config(struct pxa27x_keypad *keypad)
         if (pdata->direct_key_num > direct_key_num)
                 direct_key_num = pdata->direct_key_num;
 
-        keypad->direct_key_mask = ((1 << direct_key_num) - 1) & ~mask;
+        /*
+         * Direct keys usage may not start from KP_DKIN0, check the platfrom
+         * mask data to config the specific.
+         */
+        if (pdata->direct_key_mask)
+                keypad->direct_key_mask = pdata->direct_key_mask;
+        else
+                keypad->direct_key_mask = ((1 << direct_key_num) - 1) & ~mask;
 
         /* enable direct key */
         if (direct_key_num)