Revert "Stylus: merge kernel code of detecting pen"
Laxman Dewangan [Thu, 16 Jan 2014 12:29:35 +0000 (17:29 +0530)]
This reverts commit 69bbd97f4fd9d1b9fcf35de692ebefa33e918054.

Conflicts:

arch/arm/boot/dts/tegra124-tn8-p1761-battery-2gb.dts
arch/arm/boot/dts/tegra124-tn8-p1761-battery.dts

Change-Id: I63055451cdffc02e2bdc4eda793597e60d0151e9
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/356539
Reviewed-by: Mitch Luban <mluban@nvidia.com>
Tested-by: Mitch Luban <mluban@nvidia.com>

13 files changed:
arch/arm/boot/dts/tegra124-platforms/tegra124-tn8-keys.dtsi [deleted file]
arch/arm/boot/dts/tegra124-tn8-a03-00-battery.dts
arch/arm/boot/dts/tegra124-tn8-a03-00.dts
arch/arm/boot/dts/tegra124-tn8-a03-01-battery.dts
arch/arm/boot/dts/tegra124-tn8-a03-01.dts
arch/arm/boot/dts/tegra124-tn8-aio.dts
arch/arm/boot/dts/tegra124-tn8-battery.dts
arch/arm/boot/dts/tegra124-tn8-p1761-2gb.dts
arch/arm/boot/dts/tegra124-tn8-p1761-battery-2gb.dts
arch/arm/boot/dts/tegra124-tn8-p1761-battery.dts
arch/arm/boot/dts/tegra124-tn8-p1761.dts
arch/arm/boot/dts/tegra124-tn8.dts
include/dt-bindings/input/input.h

diff --git a/arch/arm/boot/dts/tegra124-platforms/tegra124-tn8-keys.dtsi b/arch/arm/boot/dts/tegra124-platforms/tegra124-tn8-keys.dtsi
deleted file mode 100644 (file)
index 9d2266c..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-#include <dt-bindings/gpio/tegra-gpio.h>
-#include <dt-bindings/input/input.h>
-
-/ {
-       gpio-keys {
-               compatible = "gpio-keys";
-
-               camera_focus {
-                       label = "Camera Focus";
-                       gpios = <&gpio TEGRA_GPIO(Q, 2) GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_CAMERA_FOCUS>;
-               };
-
-               home {
-                       label = "Home";
-                       gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_HOME>;
-               };
-
-               power {
-                       label = "Power";
-                       gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_POWER>;
-                       gpio-key,wakeup;
-               };
-
-               volume_down {
-                       label = "Volume Down";
-                       gpios = <&gpio TEGRA_GPIO(Q, 7) GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_VOLUMEDOWN>;
-               };
-
-               volume_up {
-                       label = "Volume Up";
-                       gpios = <&gpio TEGRA_GPIO(Q, 6) GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_VOLUMEUP>;
-               };
-
-               lid {
-                       label = "LID";
-                       gpios = <&gpio TEGRA_GPIO(R, 4) GPIO_ACTIVE_LOW>;
-                       linux,code = <SW_LID>;
-                       linux,input-type = <EV_SW>;
-                       gpio-key,wakeup;
-               };
-
-               tablet_mode {
-                       label = "Tablet Mode";
-                       gpios = <&gpio TEGRA_GPIO(W, 3) GPIO_ACTIVE_HIGH>;
-                       linux,code = <SW_TABLET_MODE>;
-                       linux,input-type = <EV_SW>;
-                       gpio-key,wakeup;
-               };
-       };
-};
index 8b08c50..3ef931a 100644 (file)
@@ -8,7 +8,7 @@
 #include "tegra124-platforms/tegra124-tn8-e1736-fixed.dtsi"
 #include "tegra124-platforms/tegra124-e1780-gpio-default.dtsi"
 #include "tegra124-platforms/tegra124-e1780-pinmux.dtsi"
-#include "tegra124-platforms/tegra124-tn8-keys.dtsi"
+#include "tegra124-platforms/tegra124-e1780-keys.dtsi"
 #include "tegra124-platforms/tegra124-e1845-senosr.dtsi"
 #include "tegra124-platforms/tegra124-tn8-sysedp.dtsi"
 
index 1d877e5..ce9cfc4 100644 (file)
@@ -27,7 +27,7 @@
 #include "tegra124-platforms/tegra124-tn8-e1736-fixed.dtsi"
 #include "tegra124-platforms/tegra124-e1780-gpio-default.dtsi"
 #include "tegra124-platforms/tegra124-e1780-pinmux.dtsi"
-#include "tegra124-platforms/tegra124-tn8-keys.dtsi"
+#include "tegra124-platforms/tegra124-e1780-keys.dtsi"
 #include "tegra124-platforms/tegra124-e1845-senosr.dtsi"
 #include "panel-l-wxga-7.dtsi"
 #include "tegra124-platforms/tegra124-tn8-hdmi.dtsi"
index fbc4749..efb82c9 100644 (file)
@@ -8,7 +8,7 @@
 #include "tegra124-platforms/tegra124-tn8-e1769-fixed.dtsi"
 #include "tegra124-platforms/tegra124-e1780-gpio-default.dtsi"
 #include "tegra124-platforms/tegra124-e1780-pinmux.dtsi"
-#include "tegra124-platforms/tegra124-tn8-keys.dtsi"
+#include "tegra124-platforms/tegra124-e1780-keys.dtsi"
 #include "tegra124-platforms/tegra124-tn8-sysedp.dtsi"
 
 / {
index d7f5bd1..a3fc391 100644 (file)
@@ -27,7 +27,7 @@
 #include "tegra124-platforms/tegra124-tn8-e1769-fixed.dtsi"
 #include "tegra124-platforms/tegra124-e1780-gpio-default.dtsi"
 #include "tegra124-platforms/tegra124-e1780-pinmux.dtsi"
-#include "tegra124-platforms/tegra124-tn8-keys.dtsi"
+#include "tegra124-platforms/tegra124-e1780-keys.dtsi"
 #include "tegra124-platforms/tegra124-e1845-senosr.dtsi"
 #include "panel-l-wxga-7.dtsi"
 #include "tegra124-platforms/tegra124-tn8-hdmi.dtsi"
index 84c9230..7699aa7 100644 (file)
@@ -8,7 +8,7 @@
 #include "tegra124-platforms/tegra124-tn8-e1736-fixed.dtsi"
 #include "tegra124-platforms/tegra124-e1780-gpio-default.dtsi"
 #include "tegra124-platforms/tegra124-e1780-pinmux.dtsi"
-#include "tegra124-platforms/tegra124-tn8-keys.dtsi"
+#include "tegra124-platforms/tegra124-e1780-keys.dtsi"
 #include "tegra124-platforms/tegra124-e1794-sensor.dtsi"
 
 / {
index 9229d0e..efdc762 100644 (file)
@@ -8,7 +8,7 @@
 #include "tegra124-platforms/tegra124-tn8-e1736-fixed.dtsi"
 #include "tegra124-platforms/tegra124-e1780-gpio-default.dtsi"
 #include "tegra124-platforms/tegra124-e1780-pinmux.dtsi"
-#include "tegra124-platforms/tegra124-tn8-keys.dtsi"
+#include "tegra124-platforms/tegra124-e1780-keys.dtsi"
 #include "tegra124-platforms/tegra124-e1794-sensor.dtsi"
 #include "tegra124-platforms/tegra124-tn8-sysedp.dtsi"
 
index 60259df..de1e1cd 100644 (file)
@@ -8,7 +8,7 @@
 #include "tegra124-platforms/tegra124-tn8-sensors.dtsi"
 #include "tegra124-platforms/tegra124-p1761-pinmux.dtsi"
 #include "tegra124-platforms/tegra124-p1761-gpio-default.dtsi"
-#include "tegra124-platforms/tegra124-tn8-keys.dtsi"
+#include "tegra124-platforms/tegra124-e1780-keys.dtsi"
 
 / {
        model = "NVIDIA Tegra124 TN8 FFD";
index cc432fd..4667500 100644 (file)
@@ -8,8 +8,7 @@
 #include "tegra124-platforms/tegra124-tn8-sensors.dtsi"
 #include "tegra124-platforms/tegra124-p1761-pinmux.dtsi"
 #include "tegra124-platforms/tegra124-p1761-gpio-default.dtsi"
-#include "tegra124-platforms/tegra124-p1761-battery.dtsi"
-#include "tegra124-platforms/tegra124-tn8-keys.dtsi"
+#include "tegra124-platforms/tegra124-e1780-keys.dtsi"
 
 / {
        model = "NVIDIA Tegra124 TN8 FFD";
index 0cf5b1c..bf2802a 100644 (file)
@@ -9,7 +9,7 @@
 #include "tegra124-platforms/tegra124-p1761-pinmux.dtsi"
 #include "tegra124-platforms/tegra124-p1761-gpio-default.dtsi"
 #include "tegra124-platforms/tegra124-p1761-battery.dtsi"
-#include "tegra124-platforms/tegra124-tn8-keys.dtsi"
+#include "tegra124-platforms/tegra124-e1780-keys.dtsi"
 #include "tegra124-platforms/tegra124-tn8-sysedp.dtsi"
 
 / {
index 81be87f..de1a08d 100644 (file)
@@ -8,7 +8,7 @@
 #include "tegra124-platforms/tegra124-tn8-sensors.dtsi"
 #include "tegra124-platforms/tegra124-p1761-pinmux.dtsi"
 #include "tegra124-platforms/tegra124-p1761-gpio-default.dtsi"
-#include "tegra124-platforms/tegra124-tn8-keys.dtsi"
+#include "tegra124-platforms/tegra124-e1780-keys.dtsi"
 
 / {
        model = "NVIDIA Tegra124 TN8 FFD";
index dc48856..c5230ce 100644 (file)
@@ -8,7 +8,7 @@
 #include "tegra124-platforms/tegra124-tn8-e1736-fixed.dtsi"
 #include "tegra124-platforms/tegra124-e1780-gpio-default.dtsi"
 #include "tegra124-platforms/tegra124-e1780-pinmux.dtsi"
-#include "tegra124-platforms/tegra124-tn8-keys.dtsi"
+#include "tegra124-platforms/tegra124-e1780-keys.dtsi"
 #include "tegra124-platforms/tegra124-e1794-sensor.dtsi"
 
 / {
index b5a94e1..042e7b3 100644 (file)
 #define BTN_DPAD_LEFT          0x222
 #define BTN_DPAD_RIGHT         0x223
 
-/*
- * Event types
- */
-
-#define EV_SYN                 0x00
-#define EV_KEY                 0x01
-#define EV_REL                 0x02
-#define EV_ABS                 0x03
-#define EV_MSC                 0x04
-#define EV_SW                  0x05
-#define EV_LED                 0x11
-#define EV_SND                 0x12
-#define EV_REP                 0x14
-#define EV_FF                  0x15
-#define EV_PWR                 0x16
-#define EV_FF_STATUS           0x17
-#define EV_MAX                 0x1f
-#define EV_CNT                 (EV_MAX+1)
-
-/*
- * Switch events
- */
-
-#define SW_LID                 0x00  /* set = lid shut */
-#define SW_TABLET_MODE         0x01  /* set = tablet mode */
-#define SW_HEADPHONE_INSERT    0x02  /* set = inserted */
-#define SW_RFKILL_ALL          0x03  /* rfkill master switch, type "any"
-                                        set = radio enabled */
-#define SW_RADIO               SW_RFKILL_ALL   /* deprecated */
-#define SW_MICROPHONE_INSERT   0x04  /* set = inserted */
-#define SW_DOCK                        0x05  /* set = plugged into dock */
-#define SW_LINEOUT_INSERT      0x06  /* set = inserted */
-#define SW_JACK_PHYSICAL_INSERT 0x07  /* set = mechanical switch set */
-#define SW_VIDEOOUT_INSERT     0x08  /* set = inserted */
-#define SW_CAMERA_LENS_COVER   0x09  /* set = lens covered */
-#define SW_KEYPAD_SLIDE                0x0a  /* set = keypad slide out */
-#define SW_FRONT_PROXIMITY     0x0b  /* set = front proximity sensor active */
-#define SW_ROTATE_LOCK         0x0c  /* set = rotate locked/disabled */
-#define SW_LINEIN_INSERT       0x0d  /* set = inserted */
-#define SW_MAX                 0x0f
-#define SW_CNT                 (SW_MAX+1)
-
 #define MATRIX_KEY(row, col, code)     \
        ((((row) & 0xFF) << 24) | (((col) & 0xFF) << 16) | ((code) & 0xFFFF))