diff options
| -rw-r--r-- | arch/arm/boot/dts/omap3-minnow.dtsi | 22 | ||||
| -rw-r--r-- | arch/arm/configs/eng_minnow_defconfig | 25 | ||||
| -rw-r--r-- | arch/arm/configs/minnow_defconfig | 25 |
3 files changed, 3 insertions, 69 deletions
diff --git a/arch/arm/boot/dts/omap3-minnow.dtsi b/arch/arm/boot/dts/omap3-minnow.dtsi index 7bef029ccdd..a387d98b01d 100644 --- a/arch/arm/boot/dts/omap3-minnow.dtsi +++ b/arch/arm/boot/dts/omap3-minnow.dtsi @@ -85,22 +85,6 @@ mot,bt_fm = <1>; /* 0x1 - BT, 0x2 - FM, 0x3 - Both */ mot,bt_en-gpio = <&gpio3 19 0>; /* BT_EN gpio-083 */ }; - - matrix-keypad { - compatible = "gpio-matrix-keypad"; - debounce-delay-ms = <5>; - col-scan-delay-us = <2>; - gpio-activelow; /* Using pull-ups on rows */ - linux,wakeup; /* Any event will wake the host */ - - row-gpios = <&gpio2 5 1 /* gpio_37, input */ - &gpio2 7 1>; /* gpio_39, input */ - - col-gpios = <&gpio2 11 2>; /* gpio_43, output high */ - - linux,keymap = <0x00000072 /* Row0, Col0, code 114 (VOLDWN) */ - 0x01000073>; /* Row1, Col0, code 115 (VOLUP) */ - }; }; @@ -112,7 +96,7 @@ compatible = "atmel,atmxt-ts"; reg = <0x4a>; interrupt-parent = <&intc>; - gpios = <&gpio4 3 1>, /* IRQ gpio-099 */ + gpios = <&gpio4 3 0>, /* IRQ gpio-099 */ <&gpio6 4 0>; /* RESET gpio-164*/ atmel,atmxt-tdat-filename = "atmxt-r2.tdat"; }; @@ -170,9 +154,6 @@ board_pins: pinmux_board_pins { pinctrl-single,pins = < - 0x050 0x11C /* GPMC_A4, MODE4 | INPUT_PULLUP */ - 0x054 0x11C /* GPMC_A6, MODE4 | INPUT_PULLUP */ - 0x05C 0x004 /* GPMC_A10, MODE4 | OUTPUT */ 0x08e 0x104 /* GPMC_CLK, MODE4 | INPUT */ 0x0a0 0x002 /* GPMC_WAIT2, MODE2 | OUTPUT */ 0x0a2 0x102 /* GPMC_WAIT3, MODE2 | INPUT */ @@ -278,4 +259,3 @@ vmmc-supply = <&vmmc>; wl_host_wake_gpio = <10>; }; - diff --git a/arch/arm/configs/eng_minnow_defconfig b/arch/arm/configs/eng_minnow_defconfig index b49453a3944..7da75df4e09 100644 --- a/arch/arm/configs/eng_minnow_defconfig +++ b/arch/arm/configs/eng_minnow_defconfig @@ -288,7 +288,6 @@ CONFIG_ARCH_MULTI_V6_V7=y # CONFIG_ARCH_MVEBU is not set # CONFIG_ARCH_BCM is not set # CONFIG_GPIO_PCA953X is not set -# CONFIG_KEYBOARD_GPIO_POLLED is not set # CONFIG_ARCH_HIGHBANK is not set # CONFIG_ARCH_MXC is not set @@ -1124,29 +1123,7 @@ CONFIG_INPUT_EVDEV=y # # Input Device Drivers # -CONFIG_INPUT_KEYBOARD=y -# CONFIG_KEYBOARD_ADP5588 is not set -# CONFIG_KEYBOARD_ADP5589 is not set -# CONFIG_KEYBOARD_ATKBD is not set -# CONFIG_KEYBOARD_QT1070 is not set -# CONFIG_KEYBOARD_QT2160 is not set -# CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_GPIO is not set -# CONFIG_KEYBOARD_TCA6416 is not set -# CONFIG_KEYBOARD_TCA8418 is not set -CONFIG_KEYBOARD_MATRIX=y -# CONFIG_KEYBOARD_LM8323 is not set -# CONFIG_KEYBOARD_LM8333 is not set -# CONFIG_KEYBOARD_MAX7359 is not set -# CONFIG_KEYBOARD_MCS is not set -# CONFIG_KEYBOARD_MPR121 is not set -# CONFIG_KEYBOARD_NEWTON is not set -# CONFIG_KEYBOARD_OPENCORES is not set -# CONFIG_KEYBOARD_SAMSUNG is not set -# CONFIG_KEYBOARD_STOWAWAY is not set -# CONFIG_KEYBOARD_SUNKBD is not set -# CONFIG_KEYBOARD_OMAP4 is not set -# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TABLET is not set diff --git a/arch/arm/configs/minnow_defconfig b/arch/arm/configs/minnow_defconfig index d6aeb27f912..39d1e001216 100644 --- a/arch/arm/configs/minnow_defconfig +++ b/arch/arm/configs/minnow_defconfig @@ -285,7 +285,6 @@ CONFIG_ARCH_MULTI_V6_V7=y # CONFIG_ARCH_MVEBU is not set # CONFIG_ARCH_BCM is not set # CONFIG_GPIO_PCA953X is not set -# CONFIG_KEYBOARD_GPIO_POLLED is not set # CONFIG_ARCH_HIGHBANK is not set # CONFIG_ARCH_MXC is not set @@ -1118,29 +1117,7 @@ CONFIG_INPUT_EVDEV=y # # Input Device Drivers # -CONFIG_INPUT_KEYBOARD=y -# CONFIG_KEYBOARD_ADP5588 is not set -# CONFIG_KEYBOARD_ADP5589 is not set -# CONFIG_KEYBOARD_ATKBD is not set -# CONFIG_KEYBOARD_QT1070 is not set -# CONFIG_KEYBOARD_QT2160 is not set -# CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_GPIO is not set -# CONFIG_KEYBOARD_TCA6416 is not set -# CONFIG_KEYBOARD_TCA8418 is not set -CONFIG_KEYBOARD_MATRIX=y -# CONFIG_KEYBOARD_LM8323 is not set -# CONFIG_KEYBOARD_LM8333 is not set -# CONFIG_KEYBOARD_MAX7359 is not set -# CONFIG_KEYBOARD_MCS is not set -# CONFIG_KEYBOARD_MPR121 is not set -# CONFIG_KEYBOARD_NEWTON is not set -# CONFIG_KEYBOARD_OPENCORES is not set -# CONFIG_KEYBOARD_SAMSUNG is not set -# CONFIG_KEYBOARD_STOWAWAY is not set -# CONFIG_KEYBOARD_SUNKBD is not set -# CONFIG_KEYBOARD_OMAP4 is not set -# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TABLET is not set |