openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Input: pm8xxx-vib - add support for pm8916's vibrator 

Add pm8xxx_regs for this PMIC and the device tree match table entry.

Signed-off-by: Damien Riegel <damien.riegel@savoirfairelinux.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Damien Riegel 2017-04-04 16:29:59 -07:00 committed by Dmitry Torokhov
parent d4c7c5c96c
commit 792ad66839
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.txt
View File

@ -7,6 +7,7 @@ PROPERTIES
Value type: <string> Value type: <string>
Definition: must be one of: Definition: must be one of:
"qcom,pm8058-vib" "qcom,pm8058-vib"
"qcom,pm8916-vib"
"qcom,pm8921-vib" "qcom,pm8921-vib"
- reg: - reg:

2
drivers/input/misc/Kconfig
View File

@ -143,7 +143,7 @@ config INPUT_PM8941_PWRKEY
config INPUT_PM8XXX_VIBRATOR config INPUT_PM8XXX_VIBRATOR
tristate "Qualcomm PM8XXX vibrator support" tristate "Qualcomm PM8XXX vibrator support"
depends on MFD_PM8XXX depends on MFD_PM8XXX || MFD_SPMI_PMIC
select INPUT_FF_MEMLESS select INPUT_FF_MEMLESS
help help
This option enables device driver support for the vibrator This option enables device driver support for the vibrator

10
drivers/input/misc/pm8xxx-vibrator.c
View File

@ -43,6 +43,15 @@ static const struct pm8xxx_regs pm8058_regs = {
.drv_en_manual_mask = 0xfc, .drv_en_manual_mask = 0xfc,
}; };
static struct pm8xxx_regs pm8916_regs = {
.enable_addr = 0xc046,
.enable_mask = BIT(7),
.drv_addr = 0xc041,
.drv_mask = 0x1F,
.drv_shift = 0,
.drv_en_manual_mask = 0,
};
/** /**
* struct pm8xxx_vib - structure to hold vibrator data * struct pm8xxx_vib - structure to hold vibrator data
* @vib_input_dev: input device supporting force feedback * @vib_input_dev: input device supporting force feedback
@ -240,6 +249,7 @@ static SIMPLE_DEV_PM_OPS(pm8xxx_vib_pm_ops, pm8xxx_vib_suspend, NULL);
static const struct of_device_id pm8xxx_vib_id_table[] = { static const struct of_device_id pm8xxx_vib_id_table[] = {
{ .compatible = "qcom,pm8058-vib", .data = &pm8058_regs }, { .compatible = "qcom,pm8058-vib", .data = &pm8058_regs },
{ .compatible = "qcom,pm8921-vib", .data = &pm8058_regs }, { .compatible = "qcom,pm8921-vib", .data = &pm8058_regs },
{ .compatible = "qcom,pm8916-vib", .data = &pm8916_regs },
{ } { }
}; };
MODULE_DEVICE_TABLE(of, pm8xxx_vib_id_table); MODULE_DEVICE_TABLE(of, pm8xxx_vib_id_table);