diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2024-01-13 21:54:39 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2024-01-13 21:54:39 -0800 |
| commit | e2a2501af13cfeb1f21bb628db54c49d61949a53 (patch) | |
| tree | 96dcc179e49f02dc7845d17282898f2f5629ef8a /include | |
| parent | Input: soc_button_array - add mapping for airplane mode button (diff) | |
| parent | Input: driver for Adafruit Seesaw Gamepad (diff) | |
| download | linux-e2a2501af13cfeb1f21bb628db54c49d61949a53.tar.gz linux-e2a2501af13cfeb1f21bb628db54c49d61949a53.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 6.8 merge window.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/gpio_keys.h | 2 | ||||
| -rw-r--r-- | include/linux/input/as5011.h | 1 | ||||
| -rw-r--r-- | include/linux/input/navpoint.h | 1 | ||||
| -rw-r--r-- | include/linux/platform_data/keypad-omap.h | 3 |
4 files changed, 2 insertions, 5 deletions
diff --git a/include/linux/gpio_keys.h b/include/linux/gpio_keys.h index 3f84aeb81e48..80fa930b04c6 100644 --- a/include/linux/gpio_keys.h +++ b/include/linux/gpio_keys.h @@ -21,6 +21,7 @@ struct device; * disable button via sysfs * @value: axis value for %EV_ABS * @irq: Irq number in case of interrupt keys + * @wakeirq: Optional dedicated wake-up interrupt */ struct gpio_keys_button { unsigned int code; @@ -34,6 +35,7 @@ struct gpio_keys_button { bool can_disable; int value; unsigned int irq; + unsigned int wakeirq; }; /** diff --git a/include/linux/input/as5011.h b/include/linux/input/as5011.h index 5fba52a56cd6..5705d5de3aea 100644 --- a/include/linux/input/as5011.h +++ b/include/linux/input/as5011.h @@ -7,7 +7,6 @@ */ struct as5011_platform_data { - unsigned int button_gpio; unsigned int axis_irq; /* irq number */ unsigned long axis_irqflags; char xp, xn; /* threshold for x axis */ diff --git a/include/linux/input/navpoint.h b/include/linux/input/navpoint.h index d464ffb4db52..5192ae3f5ec1 100644 --- a/include/linux/input/navpoint.h +++ b/include/linux/input/navpoint.h @@ -5,5 +5,4 @@ struct navpoint_platform_data { int port; /* PXA SSP port for pxa_ssp_request() */ - int gpio; /* GPIO for power on/off */ }; diff --git a/include/linux/platform_data/keypad-omap.h b/include/linux/platform_data/keypad-omap.h index 3e7c64c854f4..f3f1311cdf3a 100644 --- a/include/linux/platform_data/keypad-omap.h +++ b/include/linux/platform_data/keypad-omap.h @@ -19,9 +19,6 @@ struct omap_kp_platform_data { bool rep; unsigned long delay; bool dbounce; - /* specific to OMAP242x*/ - unsigned int *row_gpios; - unsigned int *col_gpios; }; /* Group (0..3) -- when multiple keys are pressed, only the |