Skip to content

Commit 4dea2fd

Browse files
lumagsre
authored andcommitted
power: reset: qcom-pon: add support for pm8941-pon
For PM8941 we don't have a defined field to store the reset reason. Support wrapping pwrkey and resin, but without writing the reset reason. Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
1 parent 7a54cf0 commit 4dea2fd

1 file changed

Lines changed: 15 additions & 7 deletions

File tree

drivers/power/reset/qcom-pon.c

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
#define GEN1_REASON_SHIFT 2
1818
#define GEN2_REASON_SHIFT 1
1919

20+
#define NO_REASON_SHIFT 0
21+
2022
struct pm8916_pon {
2123
struct device *dev;
2224
struct regmap *regmap;
@@ -45,6 +47,7 @@ static int pm8916_reboot_mode_write(struct reboot_mode_driver *reboot,
4547
static int pm8916_pon_probe(struct platform_device *pdev)
4648
{
4749
struct pm8916_pon *pon;
50+
long reason_shift;
4851
int error;
4952

5053
pon = devm_kzalloc(&pdev->dev, sizeof(*pon), GFP_KERNEL);
@@ -64,13 +67,17 @@ static int pm8916_pon_probe(struct platform_device *pdev)
6467
if (error)
6568
return error;
6669

67-
pon->reboot_mode.dev = &pdev->dev;
68-
pon->reason_shift = (long)of_device_get_match_data(&pdev->dev);
69-
pon->reboot_mode.write = pm8916_reboot_mode_write;
70-
error = devm_reboot_mode_register(&pdev->dev, &pon->reboot_mode);
71-
if (error) {
72-
dev_err(&pdev->dev, "can't register reboot mode\n");
73-
return error;
70+
reason_shift = (long)of_device_get_match_data(&pdev->dev);
71+
72+
if (reason_shift != NO_REASON_SHIFT) {
73+
pon->reboot_mode.dev = &pdev->dev;
74+
pon->reason_shift = reason_shift;
75+
pon->reboot_mode.write = pm8916_reboot_mode_write;
76+
error = devm_reboot_mode_register(&pdev->dev, &pon->reboot_mode);
77+
if (error) {
78+
dev_err(&pdev->dev, "can't register reboot mode\n");
79+
return error;
80+
}
7481
}
7582

7683
platform_set_drvdata(pdev, pon);
@@ -80,6 +87,7 @@ static int pm8916_pon_probe(struct platform_device *pdev)
8087

8188
static const struct of_device_id pm8916_pon_id_table[] = {
8289
{ .compatible = "qcom,pm8916-pon", .data = (void *)GEN1_REASON_SHIFT },
90+
{ .compatible = "qcom,pm8941-pon", .data = (void *)NO_REASON_SHIFT },
8391
{ .compatible = "qcom,pms405-pon", .data = (void *)GEN1_REASON_SHIFT },
8492
{ .compatible = "qcom,pm8998-pon", .data = (void *)GEN2_REASON_SHIFT },
8593
{ .compatible = "qcom,pmk8350-pon", .data = (void *)GEN2_REASON_SHIFT },

0 commit comments

Comments
 (0)