aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaxman Dewangan <ldewangan@nvidia.com>2013-12-02 08:09:57 -0500
committerStephen Warren <swarren@nvidia.com>2013-12-16 16:09:20 -0500
commit6bccbd5e18f65ca57b509ad25c9a8b0ad208627e (patch)
treea28f76d51f62232ac6c8305b9a2773bf2427b7b9
parente013485d12456e83838687cb779aebf366fd4fa1 (diff)
ARM: tegra: convert device tree files to use key defines
Use key code macros for all key code refernced for keys. For tegra20-seaboard.dts and tegra20-harmony.dts: The key comment for key (16th row and 1st column) is KEY_KPSLASH but code is 0x004e which is the key code for KEY_KPPLUS. As there other key exist with KY_KPPLUS, I am assuming key code is wrong and comment is fine. With this assumption, I am keeping the key code as KEY_KPSLASH. Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat
-rw-r--r--arch/arm/boot/dts/tegra20-harmony.dts221
-rw-r--r--arch/arm/boot/dts/tegra20-paz00.dts3
-rw-r--r--arch/arm/boot/dts/tegra20-seaboard.dts261
-rw-r--r--arch/arm/boot/dts/tegra20-trimslice.dts3
-rw-r--r--arch/arm/boot/dts/tegra20-ventana.dts3
-rw-r--r--arch/arm/boot/dts/tegra20-whistler.dts9
6 files changed, 253 insertions, 247 deletions
diff --git a/arch/arm/boot/dts/tegra20-harmony.dts b/arch/arm/boot/dts/tegra20-harmony.dts
index 94d2189a47a7..7e578f4ce296 100644
--- a/arch/arm/boot/dts/tegra20-harmony.dts
+++ b/arch/arm/boot/dts/tegra20-harmony.dts
@@ -1,5 +1,6 @@
1/dts-v1/; 1/dts-v1/;
2 2
3#include <dt-bindings/input/input.h>
3#include "tegra20.dtsi" 4#include "tegra20.dtsi"
4 5
5/ { 6/ {
@@ -421,115 +422,115 @@
421 nvidia,repeat-delay-ms = <160>; 422 nvidia,repeat-delay-ms = <160>;
422 nvidia,kbc-row-pins = <0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15>; 423 nvidia,kbc-row-pins = <0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15>;
423 nvidia,kbc-col-pins = <16 17 18 19 20 21 22 23>; 424 nvidia,kbc-col-pins = <16 17 18 19 20 21 22 23>;
424 linux,keymap = <0x00020011 /* KEY_W */ 425 linux,keymap = <MATRIX_KEY(0x00, 0x02, KEY_W)
425 0x0003001F /* KEY_S */ 426 MATRIX_KEY(0x00, 0x03, KEY_S)
426 0x0004001E /* KEY_A */ 427 MATRIX_KEY(0x00, 0x04, KEY_A)
427 0x0005002C /* KEY_Z */ 428 MATRIX_KEY(0x00, 0x05, KEY_Z)
428 0x000701D0 /* KEY_FN */ 429 MATRIX_KEY(0x00, 0x07, KEY_FN)
429 0x0107008B /* KEY_MENU */ 430 MATRIX_KEY(0x01, 0x07, KEY_MENU)
430 0x02060038 /* KEY_LEFTALT */ 431 MATRIX_KEY(0x02, 0x06, KEY_LEFTALT)
431 0x02070064 /* KEY_RIGHTALT */ 432 MATRIX_KEY(0x02, 0x07, KEY_RIGHTALT)
432 0x03000006 /* KEY_5 */ 433 MATRIX_KEY(0x03, 0x00, KEY_5)
433 0x03010005 /* KEY_4 */ 434 MATRIX_KEY(0x03, 0x01, KEY_4)
434 0x03020013 /* KEY_R */ 435 MATRIX_KEY(0x03, 0x02, KEY_R)
435 0x03030012 /* KEY_E */ 436 MATRIX_KEY(0x03, 0x03, KEY_E)
436 0x03040021 /* KEY_F */ 437 MATRIX_KEY(0x03, 0x04, KEY_F)
437 0x03050020 /* KEY_D */ 438 MATRIX_KEY(0x03, 0x05, KEY_D)
438 0x0306002D /* KEY_X */ 439 MATRIX_KEY(0x03, 0x06, KEY_X)
439 0x04000008 /* KEY_7 */ 440 MATRIX_KEY(0x04, 0x00, KEY_7)
440 0x04010007 /* KEY_6 */ 441 MATRIX_KEY(0x04, 0x01, KEY_6)
441 0x04020014 /* KEY_T */ 442 MATRIX_KEY(0x04, 0x02, KEY_T)
442 0x04030023 /* KEY_H */ 443 MATRIX_KEY(0x04, 0x03, KEY_H)
443 0x04040022 /* KEY_G */ 444 MATRIX_KEY(0x04, 0x04, KEY_G)
444 0x0405002F /* KEY_V */ 445 MATRIX_KEY(0x04, 0x05, KEY_V)
445 0x0406002E /* KEY_C */ 446 MATRIX_KEY(0x04, 0x06, KEY_C)
446 0x04070039 /* KEY_SPACE */ 447 MATRIX_KEY(0x04, 0x07, KEY_SPACE)
447 0x0500000A /* KEY_9 */ 448 MATRIX_KEY(0x05, 0x00, KEY_9)
448 0x05010009 /* KEY_8 */ 449 MATRIX_KEY(0x05, 0x01, KEY_8)
449 0x05020016 /* KEY_U */ 450 MATRIX_KEY(0x05, 0x02, KEY_U)
450 0x05030015 /* KEY_Y */ 451 MATRIX_KEY(0x05, 0x03, KEY_Y)
451 0x05040024 /* KEY_J */ 452 MATRIX_KEY(0x05, 0x04, KEY_J)
452 0x05050031 /* KEY_N */ 453 MATRIX_KEY(0x05, 0x05, KEY_N)
453 0x05060030 /* KEY_B */ 454 MATRIX_KEY(0x05, 0x06, KEY_B)
454 0x0507002B /* KEY_BACKSLASH */ 455 MATRIX_KEY(0x05, 0x07, KEY_BACKSLASH)
455 0x0600000C /* KEY_MINUS */ 456 MATRIX_KEY(0x06, 0x00, KEY_MINUS)
456 0x0601000B /* KEY_0 */ 457 MATRIX_KEY(0x06, 0x01, KEY_0)
457 0x06020018 /* KEY_O */ 458 MATRIX_KEY(0x06, 0x02, KEY_O)
458 0x06030017 /* KEY_I */ 459 MATRIX_KEY(0x06, 0x03, KEY_I)
459 0x06040026 /* KEY_L */ 460 MATRIX_KEY(0x06, 0x04, KEY_L)
460 0x06050025 /* KEY_K */ 461 MATRIX_KEY(0x06, 0x05, KEY_K)
461 0x06060033 /* KEY_COMMA */ 462 MATRIX_KEY(0x06, 0x06, KEY_COMMA)
462 0x06070032 /* KEY_M */ 463 MATRIX_KEY(0x06, 0x07, KEY_M)
463 0x0701000D /* KEY_EQUAL */ 464 MATRIX_KEY(0x07, 0x01, KEY_EQUAL)
464 0x0702001B /* KEY_RIGHTBRACE */ 465 MATRIX_KEY(0x07, 0x02, KEY_RIGHTBRACE)
465 0x0703001C /* KEY_ENTER */ 466 MATRIX_KEY(0x07, 0x03, KEY_ENTER)
466 0x0707008B /* KEY_MENU */ 467 MATRIX_KEY(0x07, 0x07, KEY_MENU)
467 0x0804002A /* KEY_LEFTSHIFT */ 468 MATRIX_KEY(0x08, 0x04, KEY_LEFTSHIFT)
468 0x08050036 /* KEY_RIGHTSHIFT */ 469 MATRIX_KEY(0x08, 0x05, KEY_RIGHTSHIFT)
469 0x0905001D /* KEY_LEFTCTRL */ 470 MATRIX_KEY(0x09, 0x05, KEY_LEFTCTRL)
470 0x09070061 /* KEY_RIGHTCTRL */ 471 MATRIX_KEY(0x09, 0x07, KEY_RIGHTCTRL)
471 0x0B00001A /* KEY_LEFTBRACE */ 472 MATRIX_KEY(0x0B, 0x00, KEY_LEFTBRACE)
472 0x0B010019 /* KEY_P */ 473 MATRIX_KEY(0x0B, 0x01, KEY_P)
473 0x0B020028 /* KEY_APOSTROPHE */ 474 MATRIX_KEY(0x0B, 0x02, KEY_APOSTROPHE)
474 0x0B030027 /* KEY_SEMICOLON */ 475 MATRIX_KEY(0x0B, 0x03, KEY_SEMICOLON)
475 0x0B040035 /* KEY_SLASH */ 476 MATRIX_KEY(0x0B, 0x04, KEY_SLASH)
476 0x0B050034 /* KEY_DOT */ 477 MATRIX_KEY(0x0B, 0x05, KEY_DOT)
477 0x0C000044 /* KEY_F10 */ 478 MATRIX_KEY(0x0C, 0x00, KEY_F10)
478 0x0C010043 /* KEY_F9 */ 479 MATRIX_KEY(0x0C, 0x01, KEY_F9)
479 0x0C02000E /* KEY_BACKSPACE */ 480 MATRIX_KEY(0x0C, 0x02, KEY_BACKSPACE)
480 0x0C030004 /* KEY_3 */ 481 MATRIX_KEY(0x0C, 0x03, KEY_3)
481 0x0C040003 /* KEY_2 */ 482 MATRIX_KEY(0x0C, 0x04, KEY_2)
482 0x0C050067 /* KEY_UP */ 483 MATRIX_KEY(0x0C, 0x05, KEY_UP)
483 0x0C0600D2 /* KEY_PRINT */ 484 MATRIX_KEY(0x0C, 0x06, KEY_PRINT)
484 0x0C070077 /* KEY_PAUSE */ 485 MATRIX_KEY(0x0C, 0x07, KEY_PAUSE)
485 0x0D00006E /* KEY_INSERT */ 486 MATRIX_KEY(0x0D, 0x00, KEY_INSERT)
486 0x0D01006F /* KEY_DELETE */ 487 MATRIX_KEY(0x0D, 0x01, KEY_DELETE)
487 0x0D030068 /* KEY_PAGEUP */ 488 MATRIX_KEY(0x0D, 0x03, KEY_PAGEUP )
488 0x0D04006D /* KEY_PAGEDOWN */ 489 MATRIX_KEY(0x0D, 0x04, KEY_PAGEDOWN)
489 0x0D05006A /* KEY_RIGHT */ 490 MATRIX_KEY(0x0D, 0x05, KEY_RIGHT)
490 0x0D06006C /* KEY_DOWN */ 491 MATRIX_KEY(0x0D, 0x06, KEY_DOWN)
491 0x0D070069 /* KEY_LEFT */ 492 MATRIX_KEY(0x0D, 0x07, KEY_LEFT)
492 0x0E000057 /* KEY_F11 */ 493 MATRIX_KEY(0x0E, 0x00, KEY_F11)
493 0x0E010058 /* KEY_F12 */ 494 MATRIX_KEY(0x0E, 0x01, KEY_F12)
494 0x0E020042 /* KEY_F8 */ 495 MATRIX_KEY(0x0E, 0x02, KEY_F8)
495 0x0E030010 /* KEY_Q */ 496 MATRIX_KEY(0x0E, 0x03, KEY_Q)
496 0x0E04003E /* KEY_F4 */ 497 MATRIX_KEY(0x0E, 0x04, KEY_F4)
497 0x0E05003D /* KEY_F3 */ 498 MATRIX_KEY(0x0E, 0x05, KEY_F3)
498 0x0E060002 /* KEY_1 */ 499 MATRIX_KEY(0x0E, 0x06, KEY_1)
499 0x0E070041 /* KEY_F7 */ 500 MATRIX_KEY(0x0E, 0x07, KEY_F7)
500 0x0F000001 /* KEY_ESC */ 501 MATRIX_KEY(0x0F, 0x00, KEY_ESC)
501 0x0F010029 /* KEY_GRAVE */ 502 MATRIX_KEY(0x0F, 0x01, KEY_GRAVE)
502 0x0F02003F /* KEY_F5 */ 503 MATRIX_KEY(0x0F, 0x02, KEY_F5)
503 0x0F03000F /* KEY_TAB */ 504 MATRIX_KEY(0x0F, 0x03, KEY_TAB)
504 0x0F04003B /* KEY_F1 */ 505 MATRIX_KEY(0x0F, 0x04, KEY_F1)
505 0x0F05003C /* KEY_F2 */ 506 MATRIX_KEY(0x0F, 0x05, KEY_F2)
506 0x0F06003A /* KEY_CAPSLOCK */ 507 MATRIX_KEY(0x0F, 0x06, KEY_CAPSLOCK)
507 0x0F070040 /* KEY_F6 */ 508 MATRIX_KEY(0x0F, 0x07, KEY_F6)
508 0x14000047 /* KEY_KP7 */ 509 MATRIX_KEY(0x14, 0x00, KEY_KP7)
509 0x15000049 /* KEY_KP9 */ 510 MATRIX_KEY(0x15, 0x00, KEY_KP9)
510 0x15010048 /* KEY_KP8 */ 511 MATRIX_KEY(0x15, 0x01, KEY_KP8)
511 0x1502004B /* KEY_KP4 */ 512 MATRIX_KEY(0x15, 0x02, KEY_KP4)
512 0x1504004F /* KEY_KP1 */ 513 MATRIX_KEY(0x15, 0x04, KEY_KP1)
513 0x1601004E /* KEY_KPSLASH */ 514 MATRIX_KEY(0x16, 0x01, KEY_KPSLASH)
514 0x1602004D /* KEY_KP6 */ 515 MATRIX_KEY(0x16, 0x02, KEY_KP6)
515 0x1603004C /* KEY_KP5 */ 516 MATRIX_KEY(0x16, 0x03, KEY_KP5)
516 0x16040051 /* KEY_KP3 */ 517 MATRIX_KEY(0x16, 0x04, KEY_KP3)
517 0x16050050 /* KEY_KP2 */ 518 MATRIX_KEY(0x16, 0x05, KEY_KP2)
518 0x16070052 /* KEY_KP0 */ 519 MATRIX_KEY(0x16, 0x07, KEY_KP0)
519 0x1B010037 /* KEY_KPASTERISK */ 520 MATRIX_KEY(0x1B, 0x01, KEY_KPASTERISK)
520 0x1B03004A /* KEY_KPMINUS */ 521 MATRIX_KEY(0x1B, 0x03, KEY_KPMINUS)
521 0x1B04004E /* KEY_KPPLUS */ 522 MATRIX_KEY(0x1B, 0x04, KEY_KPPLUS)
522 0x1B050053 /* KEY_KPDOT */ 523 MATRIX_KEY(0x1B, 0x05, KEY_KPDOT)
523 0x1C050073 /* KEY_VOLUMEUP */ 524 MATRIX_KEY(0x1C, 0x05, KEY_VOLUMEUP)
524 0x1D030066 /* KEY_HOME */ 525 MATRIX_KEY(0x1D, 0x03, KEY_HOME)
525 0x1D04006B /* KEY_END */ 526 MATRIX_KEY(0x1D, 0x04, KEY_END)
526 0x1D0500E1 /* KEY_BRIGHTNESSUP */ 527 MATRIX_KEY(0x1D, 0x05, KEY_BRIGHTNESSUP)
527 0x1D060072 /* KEY_VOLUMEDOWN */ 528 MATRIX_KEY(0x1D, 0x06, KEY_VOLUMEDOWN)
528 0x1D0700E0 /* KEY_BRIGHTNESSDOWN */ 529 MATRIX_KEY(0x1D, 0x07, KEY_BRIGHTNESSDOWN)
529 0x1E000045 /* KEY_NUMLOCK */ 530 MATRIX_KEY(0x1E, 0x00, KEY_NUMLOCK)
530 0x1E010046 /* KEY_SCROLLLOCK */ 531 MATRIX_KEY(0x1E, 0x01, KEY_SCROLLLOCK)
531 0x1E020071 /* KEY_MUTE */ 532 MATRIX_KEY(0x1E, 0x02, KEY_MUTE)
532 0x1F0400D6>; /* KEY_QUESTION */ 533 MATRIX_KEY(0x1F, 0x04, KEY_QUESTION)>;
533 }; 534 };
534 535
535 pmc@7000e400 { 536 pmc@7000e400 {
@@ -619,7 +620,7 @@
619 power { 620 power {
620 label = "Power"; 621 label = "Power";
621 gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>; 622 gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
622 linux,code = <116>; /* KEY_POWER */ 623 linux,code = <KEY_POWER>;
623 gpio-key,wakeup; 624 gpio-key,wakeup;
624 }; 625 };
625 }; 626 };
diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts
index 4b961b1b4252..31c14d09b5af 100644
--- a/arch/arm/boot/dts/tegra20-paz00.dts
+++ b/arch/arm/boot/dts/tegra20-paz00.dts
@@ -1,5 +1,6 @@
1/dts-v1/; 1/dts-v1/;
2 2
3#include <dt-bindings/input/input.h>
3#include "tegra20.dtsi" 4#include "tegra20.dtsi"
4 5
5/ { 6/ {
@@ -488,7 +489,7 @@
488 power { 489 power {
489 label = "Power"; 490 label = "Power";
490 gpios = <&gpio TEGRA_GPIO(J, 7) GPIO_ACTIVE_LOW>; 491 gpios = <&gpio TEGRA_GPIO(J, 7) GPIO_ACTIVE_LOW>;
491 linux,code = <116>; /* KEY_POWER */ 492 linux,code = <KEY_POWER>;
492 gpio-key,wakeup; 493 gpio-key,wakeup;
493 }; 494 };
494 }; 495 };
diff --git a/arch/arm/boot/dts/tegra20-seaboard.dts b/arch/arm/boot/dts/tegra20-seaboard.dts
index 07ff55a0d631..476e4e8bf7cb 100644
--- a/arch/arm/boot/dts/tegra20-seaboard.dts
+++ b/arch/arm/boot/dts/tegra20-seaboard.dts
@@ -1,5 +1,6 @@
1/dts-v1/; 1/dts-v1/;
2 2
3#include <dt-bindings/input/input.h>
3#include "tegra20.dtsi" 4#include "tegra20.dtsi"
4 5
5/ { 6/ {
@@ -523,137 +524,137 @@
523 nvidia,ghost-filter; 524 nvidia,ghost-filter;
524 nvidia,kbc-row-pins = <0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15>; 525 nvidia,kbc-row-pins = <0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15>;
525 nvidia,kbc-col-pins = <16 17 18 19 20 21 22 23>; 526 nvidia,kbc-col-pins = <16 17 18 19 20 21 22 23>;
526 linux,keymap = <0x00020011 /* KEY_W */ 527 linux,keymap = <MATRIX_KEY(0x00, 0x02, KEY_W)
527 0x0003001F /* KEY_S */ 528 MATRIX_KEY(0x00, 0x03, KEY_S)
528 0x0004001E /* KEY_A */ 529 MATRIX_KEY(0x00, 0x04, KEY_A)
529 0x0005002C /* KEY_Z */ 530 MATRIX_KEY(0x00, 0x05, KEY_Z)
530 0x000701d0 /* KEY_FN */ 531 MATRIX_KEY(0x00, 0x07, KEY_FN)
531 532
532 0x0107007D /* KEY_LEFTMETA */ 533 MATRIX_KEY(0x01, 0x07, KEY_LEFTMETA)
533 0x02060064 /* KEY_RIGHTALT */ 534 MATRIX_KEY(0x02, 0x06, KEY_RIGHTALT)
534 0x02070038 /* KEY_LEFTALT */ 535 MATRIX_KEY(0x02, 0x07, KEY_LEFTALT)
535 536
536 0x03000006 /* KEY_5 */ 537 MATRIX_KEY(0x03, 0x00, KEY_5)
537 0x03010005 /* KEY_4 */ 538 MATRIX_KEY(0x03, 0x01, KEY_4)
538 0x03020013 /* KEY_R */ 539 MATRIX_KEY(0x03, 0x02, KEY_R)
539 0x03030012 /* KEY_E */ 540 MATRIX_KEY(0x03, 0x03, KEY_E)
540 0x03040021 /* KEY_F */ 541 MATRIX_KEY(0x03, 0x04, KEY_F)
541 0x03050020 /* KEY_D */ 542 MATRIX_KEY(0x03, 0x05, KEY_D)
542 0x0306002D /* KEY_X */ 543 MATRIX_KEY(0x03, 0x06, KEY_X)
543 544
544 0x04000008 /* KEY_7 */ 545 MATRIX_KEY(0x04, 0x00, KEY_7)
545 0x04010007 /* KEY_6 */ 546 MATRIX_KEY(0x04, 0x01, KEY_6)
546 0x04020014 /* KEY_T */ 547 MATRIX_KEY(0x04, 0x02, KEY_T)
547 0x04030023 /* KEY_H */ 548 MATRIX_KEY(0x04, 0x03, KEY_H)
548 0x04040022 /* KEY_G */ 549 MATRIX_KEY(0x04, 0x04, KEY_G)
549 0x0405002F /* KEY_V */ 550 MATRIX_KEY(0x04, 0x05, KEY_V)
550 0x0406002E /* KEY_C */ 551 MATRIX_KEY(0x04, 0x06, KEY_C)
551 0x04070039 /* KEY_SPACE */ 552 MATRIX_KEY(0x04, 0x07, KEY_SPACE)
552 553
553 0x0500000A /* KEY_9 */ 554 MATRIX_KEY(0x05, 0x00, KEY_9)
554 0x05010009 /* KEY_8 */ 555 MATRIX_KEY(0x05, 0x01, KEY_8)
555 0x05020016 /* KEY_U */ 556 MATRIX_KEY(0x05, 0x02, KEY_U)
556 0x05030015 /* KEY_Y */ 557 MATRIX_KEY(0x05, 0x03, KEY_Y)
557 0x05040024 /* KEY_J */ 558 MATRIX_KEY(0x05, 0x04, KEY_J)
558 0x05050031 /* KEY_N */ 559 MATRIX_KEY(0x05, 0x05, KEY_N)
559 0x05060030 /* KEY_B */ 560 MATRIX_KEY(0x05, 0x06, KEY_B)
560 0x0507002B /* KEY_BACKSLASH */ 561 MATRIX_KEY(0x05, 0x07, KEY_BACKSLASH)
561 562
562 0x0600000C /* KEY_MINUS */ 563 MATRIX_KEY(0x06, 0x00, KEY_MINUS)
563 0x0601000B /* KEY_0 */ 564 MATRIX_KEY(0x06, 0x01, KEY_0)
564 0x06020018 /* KEY_O */ 565 MATRIX_KEY(0x06, 0x02, KEY_O)
565 0x06030017 /* KEY_I */ 566 MATRIX_KEY(0x06, 0x03, KEY_I)
566 0x06040026 /* KEY_L */ 567 MATRIX_KEY(0x06, 0x04, KEY_L)
567 0x06050025 /* KEY_K */ 568 MATRIX_KEY(0x06, 0x05, KEY_K)
568 0x06060033 /* KEY_COMMA */ 569 MATRIX_KEY(0x06, 0x06, KEY_COMMA)
569 0x06070032 /* KEY_M */ 570 MATRIX_KEY(0x06, 0x07, KEY_M)
570 571
571 0x0701000D /* KEY_EQUAL */ 572 MATRIX_KEY(0x07, 0x01, KEY_EQUAL)
572 0x0702001B /* KEY_RIGHTBRACE */ 573 MATRIX_KEY(0x07, 0x02, KEY_RIGHTBRACE)
573 0x0703001C /* KEY_ENTER */ 574 MATRIX_KEY(0x07, 0x03, KEY_ENTER)
574 0x0707008B /* KEY_MENU */ 575 MATRIX_KEY(0x07, 0x07, KEY_MENU)
575 576
576 0x08040036 /* KEY_RIGHTSHIFT */ 577 MATRIX_KEY(0x08, 0x04, KEY_RIGHTSHIFT)
577 0x0805002A /* KEY_LEFTSHIFT */ 578 MATRIX_KEY(0x08, 0x05, KEY_LEFTSHIFT)
578 579
579 0x09050061 /* KEY_RIGHTCTRL */ 580 MATRIX_KEY(0x09, 0x05, KEY_RIGHTCTRL)
580 0x0907001D /* KEY_LEFTCTRL */ 581 MATRIX_KEY(0x09, 0x07, KEY_LEFTCTRL)
581 582
582 0x0B00001A /* KEY_LEFTBRACE */ 583 MATRIX_KEY(0x0B, 0x00, KEY_LEFTBRACE)
583 0x0B010019 /* KEY_P */ 584 MATRIX_KEY(0x0B, 0x01, KEY_P)
584 0x0B020028 /* KEY_APOSTROPHE */ 585 MATRIX_KEY(0x0B, 0x02, KEY_APOSTROPHE)
585 0x0B030027 /* KEY_SEMICOLON */ 586 MATRIX_KEY(0x0B, 0x03, KEY_SEMICOLON)
586 0x0B040035 /* KEY_SLASH */ 587 MATRIX_KEY(0x0B, 0x04, KEY_SLASH)
587 0x0B050034 /* KEY_DOT */ 588 MATRIX_KEY(0x0B, 0x05, KEY_DOT)
588 589
589 0x0C000044 /* KEY_F10 */ 590 MATRIX_KEY(0x0C, 0x00, KEY_F10)
590 0x0C010043 /* KEY_F9 */ 591 MATRIX_KEY(0x0C, 0x01, KEY_F9)
591 0x0C02000E /* KEY_BACKSPACE */ 592 MATRIX_KEY(0x0C, 0x02, KEY_BACKSPACE)
592 0x0C030004 /* KEY_3 */ 593 MATRIX_KEY(0x0C, 0x03, KEY_3)
593 0x0C040003 /* KEY_2 */ 594 MATRIX_KEY(0x0C, 0x04, KEY_2)
594 0x0C050067 /* KEY_UP */ 595 MATRIX_KEY(0x0C, 0x05, KEY_UP)
595 0x0C0600D2 /* KEY_PRINT */ 596 MATRIX_KEY(0x0C, 0x06, KEY_PRINT)
596 0x0C070077 /* KEY_PAUSE */ 597 MATRIX_KEY(0x0C, 0x07, KEY_PAUSE)
597 598
598 0x0D00006E /* KEY_INSERT */ 599 MATRIX_KEY(0x0D, 0x00, KEY_INSERT)
599 0x0D01006F /* KEY_DELETE */ 600 MATRIX_KEY(0x0D, 0x01, KEY_DELETE)
600 0x0D030068 /* KEY_PAGEUP */ 601 MATRIX_KEY(0x0D, 0x03, KEY_PAGEUP )
601 0x0D04006D /* KEY_PAGEDOWN */ 602 MATRIX_KEY(0x0D, 0x04, KEY_PAGEDOWN)
602 0x0D05006A /* KEY_RIGHT */ 603 MATRIX_KEY(0x0D, 0x05, KEY_RIGHT)
603 0x0D06006C /* KEY_DOWN */ 604 MATRIX_KEY(0x0D, 0x06, KEY_DOWN)
604 0x0D070069 /* KEY_LEFT */ 605 MATRIX_KEY(0x0D, 0x07, KEY_LEFT)
605 606
606 0x0E000057 /* KEY_F11 */ 607 MATRIX_KEY(0x0E, 0x00, KEY_F11)
607 0x0E010058 /* KEY_F12 */ 608 MATRIX_KEY(0x0E, 0x01, KEY_F12)
608 0x0E020042 /* KEY_F8 */ 609 MATRIX_KEY(0x0E, 0x02, KEY_F8)
609 0x0E030010 /* KEY_Q */ 610 MATRIX_KEY(0x0E, 0x03, KEY_Q)
610 0x0E04003E /* KEY_F4 */ 611 MATRIX_KEY(0x0E, 0x04, KEY_F4)
611 0x0E05003D /* KEY_F3 */ 612 MATRIX_KEY(0x0E, 0x05, KEY_F3)
612 0x0E060002 /* KEY_1 */ 613 MATRIX_KEY(0x0E, 0x06, KEY_1)
613 0x0E070041 /* KEY_F7 */ 614 MATRIX_KEY(0x0E, 0x07, KEY_F7)
614 615
615 0x0F000001 /* KEY_ESC */ 616 MATRIX_KEY(0x0F, 0x00, KEY_ESC)
616 0x0F010029 /* KEY_GRAVE */ 617 MATRIX_KEY(0x0F, 0x01, KEY_GRAVE)
617 0x0F02003F /* KEY_F5 */ 618 MATRIX_KEY(0x0F, 0x02, KEY_F5)
618 0x0F03000F /* KEY_TAB */ 619 MATRIX_KEY(0x0F, 0x03, KEY_TAB)
619 0x0F04003B /* KEY_F1 */ 620 MATRIX_KEY(0x0F, 0x04, KEY_F1)
620 0x0F05003C /* KEY_F2 */ 621 MATRIX_KEY(0x0F, 0x05, KEY_F2)
621 0x0F06003A /* KEY_CAPSLOCK */ 622 MATRIX_KEY(0x0F, 0x06, KEY_CAPSLOCK)
622 0x0F070040 /* KEY_F6 */ 623 MATRIX_KEY(0x0F, 0x07, KEY_F6)
623 624
624 /* Software Handled Function Keys */ 625 /* Software Handled Function Keys */
625 0x14000047 /* KEY_KP7 */ 626 MATRIX_KEY(0x14, 0x00, KEY_KP7)
626 627
627 0x15000049 /* KEY_KP9 */ 628 MATRIX_KEY(0x15, 0x00, KEY_KP9)
628 0x15010048 /* KEY_KP8 */ 629 MATRIX_KEY(0x15, 0x01, KEY_KP8)
629 0x1502004B /* KEY_KP4 */ 630 MATRIX_KEY(0x15, 0x02, KEY_KP4)
630 0x1504004F /* KEY_KP1 */ 631 MATRIX_KEY(0x15, 0x04, KEY_KP1)
631 632
632 0x1601004E /* KEY_KPSLASH */ 633 MATRIX_KEY(0x16, 0x01, KEY_KPSLASH)
633 0x1602004D /* KEY_KP6 */ 634 MATRIX_KEY(0x16, 0x02, KEY_KP6)
634 0x1603004C /* KEY_KP5 */ 635 MATRIX_KEY(0x16, 0x03, KEY_KP5)
635 0x16040051 /* KEY_KP3 */ 636 MATRIX_KEY(0x16, 0x04, KEY_KP3)
636 0x16050050 /* KEY_KP2 */ 637 MATRIX_KEY(0x16, 0x05, KEY_KP2)
637 0x16070052 /* KEY_KP0 */ 638 MATRIX_KEY(0x16, 0x07, KEY_KP0)
638 639
639 0x1B010037 /* KEY_KPASTERISK */ 640 MATRIX_KEY(0x1B, 0x01, KEY_KPASTERISK)
640 0x1B03004A /* KEY_KPMINUS */ 641 MATRIX_KEY(0x1B, 0x03, KEY_KPMINUS)
641 0x1B04004E /* KEY_KPPLUS */ 642 MATRIX_KEY(0x1B, 0x04, KEY_KPPLUS)
642 0x1B050053 /* KEY_KPDOT */ 643 MATRIX_KEY(0x1B, 0x05, KEY_KPDOT)
643 644
644 0x1C050073 /* KEY_VOLUMEUP */ 645 MATRIX_KEY(0x1C, 0x05, KEY_VOLUMEUP)
645 646
646 0x1D030066 /* KEY_HOME */ 647 MATRIX_KEY(0x1D, 0x03, KEY_HOME)
647 0x1D04006B /* KEY_END */ 648 MATRIX_KEY(0x1D, 0x04, KEY_END)
648 0x1D0500E0 /* KEY_BRIGHTNESSDOWN */ 649 MATRIX_KEY(0x1D, 0x05, KEY_BRIGHTNESSDOWN)
649 0x1D060072 /* KEY_VOLUMEDOWN */ 650 MATRIX_KEY(0x1D, 0x06, KEY_VOLUMEDOWN)
650 0x1D0700E1 /* KEY_BRIGHTNESSUP */ 651 MATRIX_KEY(0x1D, 0x07, KEY_BRIGHTNESSUP)
651 652
652 0x1E000045 /* KEY_NUMLOCK */ 653 MATRIX_KEY(0x1E, 0x00, KEY_NUMLOCK)
653 0x1E010046 /* KEY_SCROLLLOCK */ 654 MATRIX_KEY(0x1E, 0x01, KEY_SCROLLLOCK)
654 0x1E020071 /* KEY_MUTE */ 655 MATRIX_KEY(0x1E, 0x02, KEY_MUTE)
655 656
656 0x1F04008A>; /* KEY_HELP */ 657 MATRIX_KEY(0x1F, 0x04, KEY_HELP)>;
657 }; 658 };
658 659
659 pmc@7000e400 { 660 pmc@7000e400 {
@@ -775,7 +776,7 @@
775 power { 776 power {
776 label = "Power"; 777 label = "Power";
777 gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>; 778 gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
778 linux,code = <116>; /* KEY_POWER */ 779 linux,code = <KEY_POWER>;
779 gpio-key,wakeup; 780 gpio-key,wakeup;
780 }; 781 };
781 782
diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts
index eab7cd25dd55..babc8fbf1663 100644
--- a/arch/arm/boot/dts/tegra20-trimslice.dts
+++ b/arch/arm/boot/dts/tegra20-trimslice.dts
@@ -1,5 +1,6 @@
1/dts-v1/; 1/dts-v1/;
2 2
3#include <dt-bindings/input/input.h>
3#include "tegra20.dtsi" 4#include "tegra20.dtsi"
4 5
5/ { 6/ {
@@ -380,7 +381,7 @@
380 power { 381 power {
381 label = "Power"; 382 label = "Power";
382 gpios = <&gpio TEGRA_GPIO(X, 6) GPIO_ACTIVE_LOW>; 383 gpios = <&gpio TEGRA_GPIO(X, 6) GPIO_ACTIVE_LOW>;
383 linux,code = <116>; /* KEY_POWER */ 384 linux,code = <KEY_POWER>;
384 gpio-key,wakeup; 385 gpio-key,wakeup;
385 }; 386 };
386 }; 387 };
diff --git a/arch/arm/boot/dts/tegra20-ventana.dts b/arch/arm/boot/dts/tegra20-ventana.dts
index bce764099853..323ad642036e 100644
--- a/arch/arm/boot/dts/tegra20-ventana.dts
+++ b/arch/arm/boot/dts/tegra20-ventana.dts
@@ -1,5 +1,6 @@
1/dts-v1/; 1/dts-v1/;
2 2
3#include <dt-bindings/input/input.h>
3#include "tegra20.dtsi" 4#include "tegra20.dtsi"
4 5
5/ { 6/ {
@@ -570,7 +571,7 @@
570 power { 571 power {
571 label = "Power"; 572 label = "Power";
572 gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>; 573 gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
573 linux,code = <116>; /* KEY_POWER */ 574 linux,code = <KEY_POWER>;
574 gpio-key,wakeup; 575 gpio-key,wakeup;
575 }; 576 };
576 }; 577 };
diff --git a/arch/arm/boot/dts/tegra20-whistler.dts b/arch/arm/boot/dts/tegra20-whistler.dts
index 82037fe814ce..00ba97a916f8 100644
--- a/arch/arm/boot/dts/tegra20-whistler.dts
+++ b/arch/arm/boot/dts/tegra20-whistler.dts
@@ -1,5 +1,6 @@
1/dts-v1/; 1/dts-v1/;
2 2
3#include <dt-bindings/input/input.h>
3#include "tegra20.dtsi" 4#include "tegra20.dtsi"
4 5
5/ { 6/ {
@@ -502,10 +503,10 @@
502 nvidia,kbc-row-pins = <0 1 2>; 503 nvidia,kbc-row-pins = <0 1 2>;
503 nvidia,kbc-col-pins = <16 17>; 504 nvidia,kbc-col-pins = <16 17>;
504 nvidia,wakeup-source; 505 nvidia,wakeup-source;
505 linux,keymap = <0x00000074 /* KEY_POWER */ 506 linux,keymap = <MATRIX_KEY(0x00, 0x00, KEY_POWER)
506 0x01000066 /* KEY_HOME */ 507 MATRIX_KEY(0x01, 0x00, KEY_HOME)
507 0x0101009E /* KEY_BACK */ 508 MATRIX_KEY(0x01, 0x01, KEY_BACK)
508 0x0201008B>; /* KEY_MENU */ 509 MATRIX_KEY(0x02, 0x01, KEY_MENU)>;
509 }; 510 };
510 511
511 pmc@7000e400 { 512 pmc@7000e400 {
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-22 18:54:51 -0500