Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull more input updates from Dmitry Torokhov:
 "The second round of updates for the input subsystem.

  Updates to ALPS an bfin_roraty drivers and a couple oother fixups"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: psmouse - use IS_ENABLED instead of homegrown code
  Input: bfin_rotary - introduce open and close methods
  Input: bfin_rotary - convert to use managed resources
  Input: bfin_rotary - use generic IO functions
  Input: bfin_rotary - move pin lists into into platform data
  Input: bfin_rotary - move platform header to linux/platform_data
  Input: bfin_rotary - mark suspend and resume code as __maybe_unused
  Input: bfin_rotary - fix potential oops in interrupt handler
  Input: ALPS - move v7 packet info to Documentation and v6 packet info
  Input: ALPS - fix confusing comment in protocol data
  Input: ALPS - do not mix trackstick and external PS/2 mouse data
  Input: ALPS - fix trackstick detection on some Dell Latitudes
  Input: ALPS - consolidate setting protocol parameters
  Input: ALPS - split protocol data from model info
  Input: ALPS - make Rushmore a separate protocol
  Input: ALPS - renumber protocol numbers
  Input: adi - remove an unnecessary check
  Input: pxa27x_keypad - remove an unneeded NULL check
  Input: soc_button_array - use "Windows" key for "Home"

5 files changed, 40 insertions, 120 deletions

diff --git a/arch/blackfin/include/asm/bfin_rotary.h b/arch/blackfin/include/asm/bfin_rotary.h
deleted file mode 100644
index 8895a750c70c..000000000000
--- a/arch/blackfin/include/asm/bfin_rotary.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * board initialization should put one of these structures into platform_data
- * and place the bfin-rotary onto platform_bus named "bfin-rotary".
- *
- * Copyright 2008-2010 Analog Devices Inc.
- *
- * Licensed under the GPL-2 or later.
- */
-
-#ifndef _BFIN_ROTARY_H
-#define _BFIN_ROTARY_H
-
-/* mode bitmasks */
-#define ROT_QUAD_ENC    CNTMODE_QUADENC /* quadrature/grey code encoder mode */
-#define ROT_BIN_ENC     CNTMODE_BINENC  /* binary encoder mode */
-#define ROT_UD_CNT      CNTMODE_UDCNT   /* rotary counter mode */
-#define ROT_DIR_CNT     CNTMODE_DIRCNT  /* direction counter mode */
-
-#define ROT_DEBE        DEBE            /* Debounce Enable */
-
-#define ROT_CDGINV      CDGINV          /* CDG Pin Polarity Invert */
-#define ROT_CUDINV      CUDINV          /* CUD Pin Polarity Invert */
-#define ROT_CZMINV      CZMINV          /* CZM Pin Polarity Invert */
-
-struct bfin_rotary_platform_data {
-        /* set rotary UP KEY_### or BTN_### in case you prefer
-         * bfin-rotary to send EV_KEY otherwise set 0
-         */
-        unsigned int rotary_up_key;
-        /* set rotary DOWN KEY_### or BTN_### in case you prefer
-         * bfin-rotary to send EV_KEY otherwise set 0
-         */
-        unsigned int rotary_down_key;
-        /* set rotary BUTTON KEY_### or BTN_### */
-        unsigned int rotary_button_key;
-        /* set rotary Relative Axis REL_### in case you prefer
-         * bfin-rotary to send EV_REL otherwise set 0
-         */
-        unsigned int rotary_rel_code;
-        unsigned short debounce;        /* 0..17 */
-        unsigned short mode;
-        unsigned short pm_wakeup;
-};
-
-/* CNT_CONFIG bitmasks */
-#define CNTE            (1 << 0)        /* Counter Enable */
-#define DEBE            (1 << 1)        /* Debounce Enable */
-#define CDGINV          (1 << 4)        /* CDG Pin Polarity Invert */
-#define CUDINV          (1 << 5)        /* CUD Pin Polarity Invert */
-#define CZMINV          (1 << 6)        /* CZM Pin Polarity Invert */
-#define CNTMODE_SHIFT   8
-#define CNTMODE         (0x7 << CNTMODE_SHIFT)  /* Counter Operating Mode */
-#define ZMZC            (1 << 1)        /* CZM Zeroes Counter Enable */
-#define BNDMODE_SHIFT   12
-#define BNDMODE         (0x3 << BNDMODE_SHIFT)  /* Boundary register Mode */
-#define INPDIS          (1 << 15)       /* CUG and CDG Input Disable */
-
-#define CNTMODE_QUADENC (0 << CNTMODE_SHIFT)    /* quadrature encoder mode */
-#define CNTMODE_BINENC  (1 << CNTMODE_SHIFT)    /* binary encoder mode */
-#define CNTMODE_UDCNT   (2 << CNTMODE_SHIFT)    /* up/down counter mode */
-#define CNTMODE_DIRCNT  (4 << CNTMODE_SHIFT)    /* direction counter mode */
-#define CNTMODE_DIRTMR  (5 << CNTMODE_SHIFT)    /* direction timer mode */
-
-#define BNDMODE_COMP    (0 << BNDMODE_SHIFT)    /* boundary compare mode */
-#define BNDMODE_ZERO    (1 << BNDMODE_SHIFT)    /* boundary compare and zero mode */
-#define BNDMODE_CAPT    (2 << BNDMODE_SHIFT)    /* boundary capture mode */
-#define BNDMODE_AEXT    (3 << BNDMODE_SHIFT)    /* boundary auto-extend mode */
-
-/* CNT_IMASK bitmasks */
-#define ICIE            (1 << 0)        /* Illegal Gray/Binary Code Interrupt Enable */
-#define UCIE            (1 << 1)        /* Up count Interrupt Enable */
-#define DCIE            (1 << 2)        /* Down count Interrupt Enable */
-#define MINCIE          (1 << 3)        /* Min Count Interrupt Enable */
-#define MAXCIE          (1 << 4)        /* Max Count Interrupt Enable */
-#define COV31IE         (1 << 5)        /* Bit 31 Overflow Interrupt Enable */
-#define COV15IE         (1 << 6)        /* Bit 15 Overflow Interrupt Enable */
-#define CZEROIE         (1 << 7)        /* Count to Zero Interrupt Enable */
-#define CZMIE           (1 << 8)        /* CZM Pin Interrupt Enable */
-#define CZMEIE          (1 << 9)        /* CZM Error Interrupt Enable */
-#define CZMZIE          (1 << 10)       /* CZM Zeroes Counter Interrupt Enable */
-
-/* CNT_STATUS bitmasks */
-#define ICII            (1 << 0)        /* Illegal Gray/Binary Code Interrupt Identifier */
-#define UCII            (1 << 1)        /* Up count Interrupt Identifier */
-#define DCII            (1 << 2)        /* Down count Interrupt Identifier */
-#define MINCII          (1 << 3)        /* Min Count Interrupt Identifier */
-#define MAXCII          (1 << 4)        /* Max Count Interrupt Identifier */
-#define COV31II         (1 << 5)        /* Bit 31 Overflow Interrupt Identifier */
-#define COV15II         (1 << 6)        /* Bit 15 Overflow Interrupt Identifier */
-#define CZEROII         (1 << 7)        /* Count to Zero Interrupt Identifier */
-#define CZMII           (1 << 8)        /* CZM Pin Interrupt Identifier */
-#define CZMEII          (1 << 9)        /* CZM Error Interrupt Identifier */
-#define CZMZII          (1 << 10)       /* CZM Zeroes Counter Interrupt Identifier */
-
-/* CNT_COMMAND bitmasks */
-#define W1LCNT          0xf             /* Load Counter Register */
-#define W1LMIN          0xf0            /* Load Min Register */
-#define W1LMAX          0xf00           /* Load Max Register */
-#define W1ZMONCE        (1 << 12)       /* Enable CZM Clear Counter Once */
-
-#define W1LCNT_ZERO     (1 << 0)        /* write 1 to load CNT_COUNTER with zero */
-#define W1LCNT_MIN      (1 << 2)        /* write 1 to load CNT_COUNTER from CNT_MIN */
-#define W1LCNT_MAX      (1 << 3)        /* write 1 to load CNT_COUNTER from CNT_MAX */
-
-#define W1LMIN_ZERO     (1 << 4)        /* write 1 to load CNT_MIN with zero */
-#define W1LMIN_CNT      (1 << 5)        /* write 1 to load CNT_MIN from CNT_COUNTER */
-#define W1LMIN_MAX      (1 << 7)        /* write 1 to load CNT_MIN from CNT_MAX */
-
-#define W1LMAX_ZERO     (1 << 8)        /* write 1 to load CNT_MAX with zero */
-#define W1LMAX_CNT      (1 << 9)        /* write 1 to load CNT_MAX from CNT_COUNTER */
-#define W1LMAX_MIN      (1 << 10)       /* write 1 to load CNT_MAX from CNT_MIN */
-
-/* CNT_DEBOUNCE bitmasks */
-#define DPRESCALE       0xf             /* Load Counter Register */
-
-#endif
diff --git a/arch/blackfin/mach-bf527/boards/ad7160eval.c b/arch/blackfin/mach-bf527/boards/ad7160eval.c
index 9501bd8d9cd1..68f2a8a806ea 100644
--- a/arch/blackfin/mach-bf527/boards/ad7160eval.c
+++ b/arch/blackfin/mach-bf527/boards/ad7160eval.c
@@ -666,7 +666,14 @@ static struct platform_device bfin_sport1_uart_device = {
 #endif
 
 #if IS_ENABLED(CONFIG_INPUT_BFIN_ROTARY)
-#include <asm/bfin_rotary.h>
+#include <linux/platform_data/bfin_rotary.h>
+
+static const u16 per_cnt[] = {
+        P_CNT_CUD,
+        P_CNT_CDG,
+        P_CNT_CZM,
+        0
+};
 
 static struct bfin_rotary_platform_data bfin_rotary_data = {
         /*.rotary_up_key     = KEY_UP,*/
@@ -676,10 +683,16 @@ static struct bfin_rotary_platform_data bfin_rotary_data = {
         .debounce          = 10,        /* 0..17 */
         .mode              = ROT_QUAD_ENC | ROT_DEBE,
         .pm_wakeup         = 1,
+        .pin_list          = per_cnt,
 };
 
 static struct resource bfin_rotary_resources[] = {
         {
+                .start = CNT_CONFIG,
+                .end   = CNT_CONFIG + 0xff,
+                .flags = IORESOURCE_MEM,
+        },
+        {
                 .start = IRQ_CNT,
                 .end = IRQ_CNT,
                 .flags = IORESOURCE_IRQ,
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c
index d64f565dc2a0..d4219e8e5ab8 100644
--- a/arch/blackfin/mach-bf527/boards/ezkit.c
+++ b/arch/blackfin/mach-bf527/boards/ezkit.c
@@ -1092,7 +1092,14 @@ static struct platform_device bfin_device_gpiokeys = {
 #endif
 
 #if IS_ENABLED(CONFIG_INPUT_BFIN_ROTARY)
-#include <asm/bfin_rotary.h>
+#include <linux/platform_data/bfin_rotary.h>
+
+static const u16 per_cnt[] = {
+        P_CNT_CUD,
+        P_CNT_CDG,
+        P_CNT_CZM,
+        0
+};
 
 static struct bfin_rotary_platform_data bfin_rotary_data = {
         /*.rotary_up_key     = KEY_UP,*/
@@ -1102,10 +1109,16 @@ static struct bfin_rotary_platform_data bfin_rotary_data = {
         .debounce          = 10,        /* 0..17 */
         .mode              = ROT_QUAD_ENC | ROT_DEBE,
         .pm_wakeup         = 1,
+        .pin_list          = per_cnt,
 };
 
 static struct resource bfin_rotary_resources[] = {
         {
+                .start = CNT_CONFIG,
+                .end   = CNT_CONFIG + 0xff,
+                .flags = IORESOURCE_MEM,
+        },
+        {
                 .start = IRQ_CNT,
                 .end = IRQ_CNT,
                 .flags = IORESOURCE_IRQ,
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c
index 1fe7ff286619..4204b9842532 100644
--- a/arch/blackfin/mach-bf548/boards/ezkit.c
+++ b/arch/blackfin/mach-bf548/boards/ezkit.c
@@ -159,7 +159,7 @@ static struct platform_device bf54x_kpad_device = {
 #endif
 
 #if IS_ENABLED(CONFIG_INPUT_BFIN_ROTARY)
-#include <asm/bfin_rotary.h>
+#include <linux/platform_data/bfin_rotary.h>
 
 static struct bfin_rotary_platform_data bfin_rotary_data = {
         /*.rotary_up_key     = KEY_UP,*/
@@ -173,6 +173,11 @@ static struct bfin_rotary_platform_data bfin_rotary_data = {
 
 static struct resource bfin_rotary_resources[] = {
         {
+                .start = CNT_CONFIG,
+                .end   = CNT_CONFIG + 0xff,
+                .flags = IORESOURCE_MEM,
+        },
+        {
                 .start = IRQ_CNT,
                 .end = IRQ_CNT,
                 .flags = IORESOURCE_IRQ,
diff --git a/arch/blackfin/mach-bf609/boards/ezkit.c b/arch/blackfin/mach-bf609/boards/ezkit.c
index e2c0b024ce88..7f9fc272ec30 100644
--- a/arch/blackfin/mach-bf609/boards/ezkit.c
+++ b/arch/blackfin/mach-bf609/boards/ezkit.c
@@ -75,7 +75,7 @@ static struct platform_device bfin_isp1760_device = {
 #endif
 
 #if IS_ENABLED(CONFIG_INPUT_BFIN_ROTARY)
-#include <asm/bfin_rotary.h>
+#include <linux/platform_data/bfin_rotary.h>
 
 static struct bfin_rotary_platform_data bfin_rotary_data = {
         /*.rotary_up_key     = KEY_UP,*/
@@ -88,6 +88,11 @@ static struct bfin_rotary_platform_data bfin_rotary_data = {
 
 static struct resource bfin_rotary_resources[] = {
         {
+                .start = CNT_CONFIG,
+                .end   = CNT_CONFIG + 0xff,
+                .flags = IORESOURCE_MEM,
+        },
+        {
                 .start = IRQ_CNT,
                 .end = IRQ_CNT,
                 .flags = IORESOURCE_IRQ,