Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

linux
- Activity
- Members
- Labels
- Environments

Snippets Groups Projects

27b730e0

Commit 27b730e0 authored 4 years ago by Jiri Kosina

Downloads
- Plain Diff

Merge branch 'for-5.12/i2c-hid' into for-linus

- ACPI and OF support made more generic / decoupled. From Douglas Anderson
- support for Goodix devices from Douglas Anderson

parents d6310078 c1ed18c1

No related branches found

No related tags found

Loading

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

Documentation/devicetree/bindings/input/goodix,gt7375p.yaml 65 additions, 0 deletions

Documentation/devicetree/bindings/input/goodix,gt7375p.yaml
arch/arm64/configs/defconfig 2 additions, 1 deletion

arch/arm64/configs/defconfig
drivers/hid/Makefile 1 addition, 1 deletion

drivers/hid/Makefile
drivers/hid/i2c-hid/Kconfig 42 additions, 5 deletions

drivers/hid/i2c-hid/Kconfig
drivers/hid/i2c-hid/Makefile 5 additions, 1 deletion

drivers/hid/i2c-hid/Makefile
drivers/hid/i2c-hid/i2c-hid-acpi.c 143 additions, 0 deletions

drivers/hid/i2c-hid/i2c-hid-acpi.c
drivers/hid/i2c-hid/i2c-hid-core.c 39 additions, 213 deletions

drivers/hid/i2c-hid/i2c-hid-core.c
drivers/hid/i2c-hid/i2c-hid-of-goodix.c 116 additions, 0 deletions

drivers/hid/i2c-hid/i2c-hid-of-goodix.c
drivers/hid/i2c-hid/i2c-hid-of.c 143 additions, 0 deletions

drivers/hid/i2c-hid/i2c-hid-of.c
drivers/hid/i2c-hid/i2c-hid.h 22 additions, 0 deletions

drivers/hid/i2c-hid/i2c-hid.h
include/linux/platform_data/i2c-hid.h 0 additions, 41 deletions

include/linux/platform_data/i2c-hid.h

with 578 additions and 262 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment