| Message ID | 1617881469-31965-2-git-send-email-skakit@codeaurora.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add support for PMK8350 PON_HLOS PMIC peripheral | expand |
On Thu 08 Apr 06:31 CDT 2021, satya priya wrote: > From: David Collins <collinsd@codeaurora.org> > > On Qualcomm Technologies, Inc. PMIC PMK8350, the PON peripheral > is split into two peripherals: PON_HLOS and PON_PBS. The > application processor only has write access to PON_HLOS which > limits it to only receiving PON interrupts. > > Add support for the PMK8350 PON_HLOS peripheral so that its > KPDPWR_N and RESIN_N interrupts can be used to detect key > presses. > Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> Regards, Bjorn > Signed-off-by: David Collins <collinsd@codeaurora.org> > Signed-off-by: satya priya <skakit@codeaurora.org> > --- > Changes in V2: > - No change. > > drivers/input/misc/pm8941-pwrkey.c | 103 ++++++++++++++++++++++++++----------- > 1 file changed, 72 insertions(+), 31 deletions(-) > > diff --git a/drivers/input/misc/pm8941-pwrkey.c b/drivers/input/misc/pm8941-pwrkey.c > index cf81044..10e3fc0 100644 > --- a/drivers/input/misc/pm8941-pwrkey.c > +++ b/drivers/input/misc/pm8941-pwrkey.c > @@ -1,6 +1,6 @@ > // SPDX-License-Identifier: GPL-2.0-only > /* > - * Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved. > + * Copyright (c) 2010-2011, 2020-2021, The Linux Foundation. All rights reserved. > * Copyright (c) 2014, Sony Mobile Communications Inc. > */ > > @@ -22,6 +22,8 @@ > #define PON_RT_STS 0x10 > #define PON_KPDPWR_N_SET BIT(0) > #define PON_RESIN_N_SET BIT(1) > +#define PON_GEN3_RESIN_N_SET BIT(6) > +#define PON_GEN3_KPDPWR_N_SET BIT(7) > > #define PON_PS_HOLD_RST_CTL 0x5a > #define PON_PS_HOLD_RST_CTL2 0x5b > @@ -38,8 +40,12 @@ > #define PON_DBC_DELAY_MASK 0x7 > > struct pm8941_data { > - unsigned int pull_up_bit; > - unsigned int status_bit; > + unsigned int pull_up_bit; > + unsigned int status_bit; > + bool supports_ps_hold_poff_config; > + bool supports_debounce_config; > + const char *name; > + const char *phys; > }; > > struct pm8941_pwrkey { > @@ -231,34 +237,40 @@ static int pm8941_pwrkey_probe(struct platform_device *pdev) > > input_set_capability(pwrkey->input, EV_KEY, pwrkey->code); > > - pwrkey->input->name = "pm8941_pwrkey"; > - pwrkey->input->phys = "pm8941_pwrkey/input0"; > - > - req_delay = (req_delay << 6) / USEC_PER_SEC; > - req_delay = ilog2(req_delay); > - > - error = regmap_update_bits(pwrkey->regmap, > - pwrkey->baseaddr + PON_DBC_CTL, > - PON_DBC_DELAY_MASK, > - req_delay); > - if (error) { > - dev_err(&pdev->dev, "failed to set debounce: %d\n", error); > - return error; > + pwrkey->input->name = pwrkey->data->name; > + pwrkey->input->phys = pwrkey->data->phys; > + > + if (pwrkey->data->supports_debounce_config) { > + req_delay = (req_delay << 6) / USEC_PER_SEC; > + req_delay = ilog2(req_delay); > + > + error = regmap_update_bits(pwrkey->regmap, > + pwrkey->baseaddr + PON_DBC_CTL, > + PON_DBC_DELAY_MASK, > + req_delay); > + if (error) { > + dev_err(&pdev->dev, "failed to set debounce: %d\n", > + error); > + return error; > + } > } > > - error = regmap_update_bits(pwrkey->regmap, > - pwrkey->baseaddr + PON_PULL_CTL, > - pwrkey->data->pull_up_bit, > - pull_up ? pwrkey->data->pull_up_bit : 0); > - if (error) { > - dev_err(&pdev->dev, "failed to set pull: %d\n", error); > - return error; > + if (pwrkey->data->pull_up_bit) { > + error = regmap_update_bits(pwrkey->regmap, > + pwrkey->baseaddr + PON_PULL_CTL, > + pwrkey->data->pull_up_bit, > + pull_up ? pwrkey->data->pull_up_bit : > + 0); > + if (error) { > + dev_err(&pdev->dev, "failed to set pull: %d\n", error); > + return error; > + } > } > > error = devm_request_threaded_irq(&pdev->dev, pwrkey->irq, > NULL, pm8941_pwrkey_irq, > IRQF_ONESHOT, > - "pm8941_pwrkey", pwrkey); > + pwrkey->data->name, pwrkey); > if (error) { > dev_err(&pdev->dev, "failed requesting IRQ: %d\n", error); > return error; > @@ -271,12 +283,14 @@ static int pm8941_pwrkey_probe(struct platform_device *pdev) > return error; > } > > - pwrkey->reboot_notifier.notifier_call = pm8941_reboot_notify, > - error = register_reboot_notifier(&pwrkey->reboot_notifier); > - if (error) { > - dev_err(&pdev->dev, "failed to register reboot notifier: %d\n", > - error); > - return error; > + if (pwrkey->data->supports_ps_hold_poff_config) { > + pwrkey->reboot_notifier.notifier_call = pm8941_reboot_notify, > + error = register_reboot_notifier(&pwrkey->reboot_notifier); > + if (error) { > + dev_err(&pdev->dev, "failed to register reboot notifier: %d\n", > + error); > + return error; > + } > } > > platform_set_drvdata(pdev, pwrkey); > @@ -289,7 +303,8 @@ static int pm8941_pwrkey_remove(struct platform_device *pdev) > { > struct pm8941_pwrkey *pwrkey = platform_get_drvdata(pdev); > > - unregister_reboot_notifier(&pwrkey->reboot_notifier); > + if (pwrkey->data->supports_ps_hold_poff_config) > + unregister_reboot_notifier(&pwrkey->reboot_notifier); > > return 0; > } > @@ -297,16 +312,42 @@ static int pm8941_pwrkey_remove(struct platform_device *pdev) > static const struct pm8941_data pwrkey_data = { > .pull_up_bit = PON_KPDPWR_PULL_UP, > .status_bit = PON_KPDPWR_N_SET, > + .name = "pm8941_pwrkey", > + .phys = "pm8941_pwrkey/input0", > + .supports_ps_hold_poff_config = true, > + .supports_debounce_config = true, > }; > > static const struct pm8941_data resin_data = { > .pull_up_bit = PON_RESIN_PULL_UP, > .status_bit = PON_RESIN_N_SET, > + .name = "pm8941_resin", > + .phys = "pm8941_resin/input0", > + .supports_ps_hold_poff_config = true, > + .supports_debounce_config = true, > +}; > + > +static const struct pm8941_data pon_gen3_pwrkey_data = { > + .status_bit = PON_GEN3_KPDPWR_N_SET, > + .name = "pmic_pwrkey", > + .phys = "pmic_pwrkey/input0", > + .supports_ps_hold_poff_config = false, > + .supports_debounce_config = false, > +}; > + > +static const struct pm8941_data pon_gen3_resin_data = { > + .status_bit = PON_GEN3_RESIN_N_SET, > + .name = "pmic_resin", > + .phys = "pmic_resin/input0", > + .supports_ps_hold_poff_config = false, > + .supports_debounce_config = false, > }; > > static const struct of_device_id pm8941_pwr_key_id_table[] = { > { .compatible = "qcom,pm8941-pwrkey", .data = &pwrkey_data }, > { .compatible = "qcom,pm8941-resin", .data = &resin_data }, > + { .compatible = "qcom,pmk8350-pwrkey", .data = &pon_gen3_pwrkey_data }, > + { .compatible = "qcom,pmk8350-resin", .data = &pon_gen3_resin_data }, > { } > }; > MODULE_DEVICE_TABLE(of, pm8941_pwr_key_id_table); > -- > QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member > of Code Aurora Forum, hosted by The Linux Foundation >
diff --git a/drivers/input/misc/pm8941-pwrkey.c b/drivers/input/misc/pm8941-pwrkey.c index cf81044..10e3fc0 100644 --- a/drivers/input/misc/pm8941-pwrkey.c +++ b/drivers/input/misc/pm8941-pwrkey.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved. + * Copyright (c) 2010-2011, 2020-2021, The Linux Foundation. All rights reserved. * Copyright (c) 2014, Sony Mobile Communications Inc. */ @@ -22,6 +22,8 @@ #define PON_RT_STS 0x10 #define PON_KPDPWR_N_SET BIT(0) #define PON_RESIN_N_SET BIT(1) +#define PON_GEN3_RESIN_N_SET BIT(6) +#define PON_GEN3_KPDPWR_N_SET BIT(7) #define PON_PS_HOLD_RST_CTL 0x5a #define PON_PS_HOLD_RST_CTL2 0x5b @@ -38,8 +40,12 @@ #define PON_DBC_DELAY_MASK 0x7 struct pm8941_data { - unsigned int pull_up_bit; - unsigned int status_bit; + unsigned int pull_up_bit; + unsigned int status_bit; + bool supports_ps_hold_poff_config; + bool supports_debounce_config; + const char *name; + const char *phys; }; struct pm8941_pwrkey { @@ -231,34 +237,40 @@ static int pm8941_pwrkey_probe(struct platform_device *pdev) input_set_capability(pwrkey->input, EV_KEY, pwrkey->code); - pwrkey->input->name = "pm8941_pwrkey"; - pwrkey->input->phys = "pm8941_pwrkey/input0"; - - req_delay = (req_delay << 6) / USEC_PER_SEC; - req_delay = ilog2(req_delay); - - error = regmap_update_bits(pwrkey->regmap, - pwrkey->baseaddr + PON_DBC_CTL, - PON_DBC_DELAY_MASK, - req_delay); - if (error) { - dev_err(&pdev->dev, "failed to set debounce: %d\n", error); - return error; + pwrkey->input->name = pwrkey->data->name; + pwrkey->input->phys = pwrkey->data->phys; + + if (pwrkey->data->supports_debounce_config) { + req_delay = (req_delay << 6) / USEC_PER_SEC; + req_delay = ilog2(req_delay); + + error = regmap_update_bits(pwrkey->regmap, + pwrkey->baseaddr + PON_DBC_CTL, + PON_DBC_DELAY_MASK, + req_delay); + if (error) { + dev_err(&pdev->dev, "failed to set debounce: %d\n", + error); + return error; + } } - error = regmap_update_bits(pwrkey->regmap, - pwrkey->baseaddr + PON_PULL_CTL, - pwrkey->data->pull_up_bit, - pull_up ? pwrkey->data->pull_up_bit : 0); - if (error) { - dev_err(&pdev->dev, "failed to set pull: %d\n", error); - return error; + if (pwrkey->data->pull_up_bit) { + error = regmap_update_bits(pwrkey->regmap, + pwrkey->baseaddr + PON_PULL_CTL, + pwrkey->data->pull_up_bit, + pull_up ? pwrkey->data->pull_up_bit : + 0); + if (error) { + dev_err(&pdev->dev, "failed to set pull: %d\n", error); + return error; + } } error = devm_request_threaded_irq(&pdev->dev, pwrkey->irq, NULL, pm8941_pwrkey_irq, IRQF_ONESHOT, - "pm8941_pwrkey", pwrkey); + pwrkey->data->name, pwrkey); if (error) { dev_err(&pdev->dev, "failed requesting IRQ: %d\n", error); return error; @@ -271,12 +283,14 @@ static int pm8941_pwrkey_probe(struct platform_device *pdev) return error; } - pwrkey->reboot_notifier.notifier_call = pm8941_reboot_notify, - error = register_reboot_notifier(&pwrkey->reboot_notifier); - if (error) { - dev_err(&pdev->dev, "failed to register reboot notifier: %d\n", - error); - return error; + if (pwrkey->data->supports_ps_hold_poff_config) { + pwrkey->reboot_notifier.notifier_call = pm8941_reboot_notify, + error = register_reboot_notifier(&pwrkey->reboot_notifier); + if (error) { + dev_err(&pdev->dev, "failed to register reboot notifier: %d\n", + error); + return error; + } } platform_set_drvdata(pdev, pwrkey); @@ -289,7 +303,8 @@ static int pm8941_pwrkey_remove(struct platform_device *pdev) { struct pm8941_pwrkey *pwrkey = platform_get_drvdata(pdev); - unregister_reboot_notifier(&pwrkey->reboot_notifier); + if (pwrkey->data->supports_ps_hold_poff_config) + unregister_reboot_notifier(&pwrkey->reboot_notifier); return 0; } @@ -297,16 +312,42 @@ static int pm8941_pwrkey_remove(struct platform_device *pdev) static const struct pm8941_data pwrkey_data = { .pull_up_bit = PON_KPDPWR_PULL_UP, .status_bit = PON_KPDPWR_N_SET, + .name = "pm8941_pwrkey", + .phys = "pm8941_pwrkey/input0", + .supports_ps_hold_poff_config = true, + .supports_debounce_config = true, }; static const struct pm8941_data resin_data = { .pull_up_bit = PON_RESIN_PULL_UP, .status_bit = PON_RESIN_N_SET, + .name = "pm8941_resin", + .phys = "pm8941_resin/input0", + .supports_ps_hold_poff_config = true, + .supports_debounce_config = true, +}; + +static const struct pm8941_data pon_gen3_pwrkey_data = { + .status_bit = PON_GEN3_KPDPWR_N_SET, + .name = "pmic_pwrkey", + .phys = "pmic_pwrkey/input0", + .supports_ps_hold_poff_config = false, + .supports_debounce_config = false, +}; + +static const struct pm8941_data pon_gen3_resin_data = { + .status_bit = PON_GEN3_RESIN_N_SET, + .name = "pmic_resin", + .phys = "pmic_resin/input0", + .supports_ps_hold_poff_config = false, + .supports_debounce_config = false, }; static const struct of_device_id pm8941_pwr_key_id_table[] = { { .compatible = "qcom,pm8941-pwrkey", .data = &pwrkey_data }, { .compatible = "qcom,pm8941-resin", .data = &resin_data }, + { .compatible = "qcom,pmk8350-pwrkey", .data = &pon_gen3_pwrkey_data }, + { .compatible = "qcom,pmk8350-resin", .data = &pon_gen3_resin_data }, { } }; MODULE_DEVICE_TABLE(of, pm8941_pwr_key_id_table);