Input updates for v6.0-rc7
- small fixes for iqs62x-keys and melfas_mip4 drivers - corrected register address in snvs_pwrkey driver - Synaptic driver will stop trying to use intertouch (native) mode on some Lenovo AMD devices -----BEGIN PGP SIGNATURE----- iJAEABYKADgWIQST2eWILY88ieB2DOtAj56VGEWXnAUCYzUgfBocZG1pdHJ5LnRv cm9raG92QGdtYWlsLmNvbQAKCRBAj56VGEWXnEkhAP4/cOTiILkNKTzbu3nPAFn5 qVBp+wDpFrjN5zQKEIyOVgEAr5k7STjixjnneZnR7+ppald6Ti7LXaTESoXnqrY9 XwY= =zsDx -----END PGP SIGNATURE----- Merge tag 'input-for-v6.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input Pull input fixes from Dmitry Torokhov: - small fixes for iqs62x-keys and melfas_mip4 drivers - corrected register address in snvs_pwrkey driver - Synaptic driver will stop trying to use intertouch (native) mode on some Lenovo AMD devices * tag 'input-for-v6.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: snvs_pwrkey - fix SNVS_HPVIDR1 register address Input: synaptics - disable Intertouch for Lenovo T14 and P14s AMD G1 Input: iqs62x-keys - drop unused device node references Input: melfas_mip4 - fix return value check in mip4_probe()
This commit is contained in:
Коммит
da9eede6b2
|
@ -77,6 +77,7 @@ static int iqs62x_keys_parse_prop(struct platform_device *pdev,
|
|||
if (ret) {
|
||||
dev_err(&pdev->dev, "Failed to read switch code: %d\n",
|
||||
ret);
|
||||
fwnode_handle_put(child);
|
||||
return ret;
|
||||
}
|
||||
iqs62x_keys->switches[i].code = val;
|
||||
|
@ -90,6 +91,8 @@ static int iqs62x_keys_parse_prop(struct platform_device *pdev,
|
|||
iqs62x_keys->switches[i].flag = (i == IQS62X_SW_HALL_N ?
|
||||
IQS62X_EVENT_HALL_N_T :
|
||||
IQS62X_EVENT_HALL_S_T);
|
||||
|
||||
fwnode_handle_put(child);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
#include <linux/mfd/syscon.h>
|
||||
#include <linux/regmap.h>
|
||||
|
||||
#define SNVS_HPVIDR1_REG 0xF8
|
||||
#define SNVS_HPVIDR1_REG 0xBF8
|
||||
#define SNVS_LPSR_REG 0x4C /* LP Status Register */
|
||||
#define SNVS_LPCR_REG 0x38 /* LP Control Register */
|
||||
#define SNVS_HPSR_REG 0x14
|
||||
|
|
|
@ -186,7 +186,6 @@ static const char * const smbus_pnp_ids[] = {
|
|||
"LEN2044", /* L470 */
|
||||
"LEN2054", /* E480 */
|
||||
"LEN2055", /* E580 */
|
||||
"LEN2064", /* T14 Gen 1 AMD / P14s Gen 1 AMD */
|
||||
"LEN2068", /* T14 Gen 1 */
|
||||
"SYN3052", /* HP EliteBook 840 G4 */
|
||||
"SYN3221", /* HP 15-ay000 */
|
||||
|
|
|
@ -1453,7 +1453,7 @@ static int mip4_probe(struct i2c_client *client, const struct i2c_device_id *id)
|
|||
"ce", GPIOD_OUT_LOW);
|
||||
if (IS_ERR(ts->gpio_ce)) {
|
||||
error = PTR_ERR(ts->gpio_ce);
|
||||
if (error != EPROBE_DEFER)
|
||||
if (error != -EPROBE_DEFER)
|
||||
dev_err(&client->dev,
|
||||
"Failed to get gpio: %d\n", error);
|
||||
return error;
|
||||
|
|
Загрузка…
Ссылка в новой задаче