]> Git Repo - linux.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
authorLinus Torvalds <[email protected]>
Fri, 27 Mar 2020 03:49:44 +0000 (20:49 -0700)
committerLinus Torvalds <[email protected]>
Fri, 27 Mar 2020 03:49:44 +0000 (20:49 -0700)
Pull input fixes from Dmitry Torokhov:

 - a fix to generate proper timestamps on key autorepeat events that
   were broken recently

 - a fix for Synaptics driver to only activate reduced reporting mode
   when explicitly requested

 - a new keycode for "selective screenshot" function

 - other assorted fixes

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: fix stale timestamp on key autorepeat events
  Input: move the new KEY_SELECTIVE_SCREENSHOT keycode
  Input: avoid BIT() macro usage in the serio.h UAPI header
  Input: synaptics-rmi4 - set reduced reporting mode only when requested
  Input: synaptics - enable RMI on HP Envy 13-ad105ng
  Input: allocate keycode for "Selective Screenshot" key
  Input: tm2-touchkey - add support for Coreriver TC360 variant
  dt-bindings: input: add Coreriver TC360 binding
  dt-bindings: vendor-prefixes: Add Coreriver vendor prefix
  Input: raydium_i2c_ts - fix error codes in raydium_i2c_boot_trigger()

1  2 
Documentation/devicetree/bindings/vendor-prefixes.yaml
drivers/input/input.c

index 9e67944bec9c673a698876647a7ef607d19705fb,77fb3c45301455711c8e2abdfb74ed3fca29220c..b3c8c623744a2eecb3b2acea38994c52a262e0f2
@@@ -109,8 -109,6 +109,8 @@@ patternProperties
      description: Artesyn Embedded Technologies Inc.
    "^asahi-kasei,.*":
      description: Asahi Kasei Corp.
 +  "^asc,.*":
 +    description: All Sensors Corporation
    "^aspeed,.*":
      description: ASPEED Technology Inc.
    "^asus,.*":
      description: Bosch Sensortec GmbH
    "^boundary,.*":
      description: Boundary Devices Inc.
 +  "^broadmobi,.*":
 +    description: Shanghai Broadmobi Communication Technology Co.,Ltd.
    "^brcm,.*":
      description: Broadcom Corporation
    "^buffalo,.*":
      description: B&R Industrial Automation GmbH
    "^bticino,.*":
      description: Bticino International
 +  "^calaosystems,.*":
 +    description: CALAO Systems SAS
    "^calxeda,.*":
      description: Calxeda
    "^capella,.*":
      description: Colorful GRP, Shenzhen Xueyushi Technology Ltd.
    "^compulab,.*":
      description: CompuLab Ltd.
+   "^coreriver,.*":
+     description: CORERIVER Semiconductor Co.,Ltd.
    "^corpro,.*":
      description: Chengdu Corpro Technology Co., Ltd.
    "^cortina,.*":
      description: Shenzhen Jesurun Electronics Business Dept.
    "^jianda,.*":
      description: Jiandangjing Technology Co., Ltd.
 +  "^kam,.*":
 +    description: Kamstrup A/S
    "^karo,.*":
      description: Ka-Ro electronics GmbH
    "^keithkoep,.*":
      description: Lantiq Semiconductor
    "^lattice,.*":
      description: Lattice Semiconductor
 +  "^leadtek,.*":
 +    description: Shenzhen Leadtek Technology Co., Ltd.
    "^leez,.*":
      description: Leez
    "^lego,.*":
      description: Logic PD, Inc.
    "^longcheer,.*":
      description: Longcheer Technology (Shanghai) Co., Ltd.
 +  "^loongson,.*":
 +    description: Loongson Technology Corporation Limited
    "^lsi,.*":
      description: LSI Corp. (LSI Logic)
    "^lwn,.*":
      description: Moxa Inc.
    "^mpl,.*":
      description: MPL AG
 +  "^mps,.*":
 +    description: Monolithic Power Systems Inc.
    "^mqmaker,.*":
      description: mqmaker Inc.
    "^mscc,.*":
      description: Panasonic Corporation
    "^parade,.*":
      description: Parade Technologies Inc.
 +  "^parallax,.*":
 +    description: Parallax Inc.
    "^pda,.*":
      description: Precision Design Associates, Inc.
    "^pericom,.*":
      description: Sancloud Ltd
    "^sandisk,.*":
      description: Sandisk Corporation
 +  "^satoz,.*":
 +    description: Satoz International Co., Ltd
    "^sbs,.*":
      description: Smart Battery System
    "^schindler,.*":
      description: Startek
    "^ste,.*":
      description: ST-Ericsson
 +    deprecated: true
    "^stericsson,.*":
      description: ST-Ericsson
 +  "^st-ericsson,.*":
 +    description: ST-Ericsson
 +    deprecated: true
    "^summit,.*":
      description: Summit microelectronics
    "^sunchip,.*":
      description: Variscite Ltd.
    "^via,.*":
      description: VIA Technologies, Inc.
 +  "^videostrong,.*":
 +    description: Videostrong Technology Co., Ltd.
    "^virtio,.*":
      description: Virtual I/O Device Specification, developed by the OASIS consortium
    "^vishay,.*":
      description: Extreme Engineering Solutions (X-ES)
    "^xillybus,.*":
      description: Xillybus Ltd.
 +  "^xinpeng,.*":
 +    description: Shenzhen Xinpeng Technology Co., Ltd
    "^xlnx,.*":
      description: Xilinx
    "^xunlong,.*":
      description: Shenzhen Xunlong Software CO.,Limited
 +  "^xylon,.*":
 +    description: Xylon
 +  "^yna,.*":
 +    description: YSH & ATIL
    "^yones-toptech,.*":
      description: Yones Toptech Co., Ltd.
    "^ysoft,.*":
diff --combined drivers/input/input.c
index fce43e62dd4539281f77ec574871422514a8ef14,e2eb9b9b8363dbaefb3a10a4504d59b57889b24f..3cfd2c18eebd9d6a546c0d259204dc559c8460a1
@@@ -190,6 -190,7 +190,7 @@@ static void input_repeat_key(struct tim
                        input_value_sync
                };
  
+               input_set_timestamp(dev, ktime_get());
                input_pass_values(dev, vals, ARRAY_SIZE(vals));
  
                if (dev->rep[REP_PERIOD])
@@@ -1216,12 -1217,13 +1217,12 @@@ static int input_proc_devices_open(stru
        return seq_open(file, &input_devices_seq_ops);
  }
  
 -static const struct file_operations input_devices_fileops = {
 -      .owner          = THIS_MODULE,
 -      .open           = input_proc_devices_open,
 -      .poll           = input_proc_devices_poll,
 -      .read           = seq_read,
 -      .llseek         = seq_lseek,
 -      .release        = seq_release,
 +static const struct proc_ops input_devices_proc_ops = {
 +      .proc_open      = input_proc_devices_open,
 +      .proc_poll      = input_proc_devices_poll,
 +      .proc_read      = seq_read,
 +      .proc_lseek     = seq_lseek,
 +      .proc_release   = seq_release,
  };
  
  static void *input_handlers_seq_start(struct seq_file *seq, loff_t *pos)
@@@ -1279,11 -1281,12 +1280,11 @@@ static int input_proc_handlers_open(str
        return seq_open(file, &input_handlers_seq_ops);
  }
  
 -static const struct file_operations input_handlers_fileops = {
 -      .owner          = THIS_MODULE,
 -      .open           = input_proc_handlers_open,
 -      .read           = seq_read,
 -      .llseek         = seq_lseek,
 -      .release        = seq_release,
 +static const struct proc_ops input_handlers_proc_ops = {
 +      .proc_open      = input_proc_handlers_open,
 +      .proc_read      = seq_read,
 +      .proc_lseek     = seq_lseek,
 +      .proc_release   = seq_release,
  };
  
  static int __init input_proc_init(void)
                return -ENOMEM;
  
        entry = proc_create("devices", 0, proc_bus_input_dir,
 -                          &input_devices_fileops);
 +                          &input_devices_proc_ops);
        if (!entry)
                goto fail1;
  
        entry = proc_create("handlers", 0, proc_bus_input_dir,
 -                          &input_handlers_fileops);
 +                          &input_handlers_proc_ops);
        if (!entry)
                goto fail2;
  
This page took 0.085308 seconds and 4 git commands to generate.