X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=kernel%2Fdrivers%2Finput%2Fkeyboard%2Fsamsung-keypad.c;fp=kernel%2Fdrivers%2Finput%2Fkeyboard%2Fsamsung-keypad.c;h=4e319eb9e19d9f75a67d7c2123cc3bf5550c86ad;hb=e09b41010ba33a20a87472ee821fa407a5b8da36;hp=6b9fdf6cf8e83f017dcdaba0281f8856208c0fc0;hpb=f93b97fd65072de626c074dbe099a1fff05ce060;p=kvmfornfv.git

diff --git a/kernel/drivers/input/keyboard/samsung-keypad.c b/kernel/drivers/input/keyboard/samsung-keypad.c
index 6b9fdf6cf..4e319eb9e 100644
--- a/kernel/drivers/input/keyboard/samsung-keypad.c
+++ b/kernel/drivers/input/keyboard/samsung-keypad.c
@@ -299,8 +299,10 @@ samsung_keypad_parse_dt(struct device *dev)
 	if (of_get_property(np, "linux,input-no-autorepeat", NULL))
 		pdata->no_autorepeat = true;
 
-	if (of_get_property(np, "linux,input-wakeup", NULL))
-		pdata->wakeup = true;
+	pdata->wakeup = of_property_read_bool(np, "wakeup-source") ||
+			/* legacy name */
+			of_property_read_bool(np, "linux,input-wakeup");
+
 
 	return pdata;
 }
@@ -585,7 +587,7 @@ static const struct of_device_id samsung_keypad_dt_match[] = {
 MODULE_DEVICE_TABLE(of, samsung_keypad_dt_match);
 #endif
 
-static struct platform_device_id samsung_keypad_driver_ids[] = {
+static const struct platform_device_id samsung_keypad_driver_ids[] = {
 	{
 		.name		= "samsung-keypad",
 		.driver_data	= KEYPAD_TYPE_SAMSUNG,