diff options
author | Laxman Dewangan <ldewangan@nvidia.com> | 2013-12-02 08:09:57 -0500 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2013-12-16 16:09:20 -0500 |
commit | 6bccbd5e18f65ca57b509ad25c9a8b0ad208627e (patch) | |
tree | a28f76d51f62232ac6c8305b9a2773bf2427b7b9 /arch/arm/boot/dts/tegra20-seaboard.dts | |
parent | e013485d12456e83838687cb779aebf366fd4fa1 (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 (limited to 'arch/arm/boot/dts/tegra20-seaboard.dts')
-rw-r--r-- | arch/arm/boot/dts/tegra20-seaboard.dts | 261 |
1 files changed, 131 insertions, 130 deletions
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 | ||