button: qcom-pmic: prettify and standardise button labels

Boards using gpio-keys for volume buttons label them "Volume Down",
let's match that here, and make the power button nicer too.

This simplifies configuring button_cmds in a board-agnostic way.

Tested-by: Danila Tikhonov <danila@jiaxyga.com> # google-sunfish
Tested-by: Jens Reidel <adrian@mainlining.org> # xiaomi-davinci
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20250331-qcom-phones-v4-5-f52e57d3b8c6@linaro.org
Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>

diff --git a/board/qualcomm/dragonboard410c/dragonboard410c.c b/board/qualcomm/dragonboard410c/dragonboard410c.c
index fcbf2c3..d0d8248 100644 (file)
--- a/board/qualcomm/dragonboard410c/dragonboard410c.c
+++ b/board/qualcomm/dragonboard410c/dragonboard410c.c
@@ -72,7 +72,7 @@ int misc_init_r(void)
        int ret;
        enum button_state_t state;
 
-       ret = button_get_by_label("vol_down", &btn);
+       ret = button_get_by_label("Volume Down", &btn);
        if (ret < 0) {
                printf("Couldn't find power button!\n");
                return ret;

diff --git a/board/qualcomm/dragonboard820c/dragonboard820c.c b/board/qualcomm/dragonboard820c/dragonboard820c.c
index d3333a5..12a9273 100644 (file)
--- a/board/qualcomm/dragonboard820c/dragonboard820c.c
+++ b/board/qualcomm/dragonboard820c/dragonboard820c.c
@@ -106,7 +106,7 @@ int misc_init_r(void)
        int ret;
        enum button_state_t state;
 
-       ret = button_get_by_label("pwrkey", &btn);
+       ret = button_get_by_label("Power Button", &btn);
        if (ret < 0) {
                printf("Couldn't find power button!\n");
                return ret;

diff --git a/drivers/button/button-qcom-pmic.c b/drivers/button/button-qcom-pmic.c
index f9f0948..e3bb9bd 100644 (file)
--- a/drivers/button/button-qcom-pmic.c
+++ b/drivers/button/button-qcom-pmic.c
@@ -73,25 +73,25 @@ static const struct qcom_pmic_btn_data qcom_pmic_btn_data_table[] = {
                .compatible = "qcom,pm8941-pwrkey",
                .status_bit = PON_KPDPWR_N_SET,
                .code = KEY_ENTER,
-               .label = "pwrkey",
+               .label = "Power Button",
        },
        {
                .compatible = "qcom,pm8941-resin",
                .status_bit = PON_RESIN_N_SET,
                .code = KEY_DOWN,
-               .label = "vol_down",
+               .label = "Volume Down",
        },
        {
                .compatible = "qcom,pmk8350-pwrkey",
                .status_bit = PON_GEN3_KPDPWR_N_SET,
                .code = KEY_ENTER,
-               .label = "pwrkey",
+               .label = "Power Button",
        },
        {
                .compatible = "qcom,pmk8350-resin",
                .status_bit = PON_GEN3_RESIN_N_SET,
                .code = KEY_DOWN,
-               .label = "vol_down",
+               .label = "Volume Down",
        },
 };