Dear Caleb,
On 11/14/23 22:48, Caleb Connolly wrote:
> The power and resin keys were implemented as GPIOs here, but their only
> use would be as buttons. Avoid the additional layer of introspection and
> rework this driver into a button driver.
>
> While we're here, replace the "qcom,pm8998-pwrkey" compatible with
> "qcom,pm8941-pwrkey" to match upstream (Linux).
>
> The dragonboard410c and 820c boards are adjusted to benefit from this
> change too, simplify their custom board init code.
I think that this patch can be splited.
How about?
Best Regards,
Jaehoon Chung
>
> Signed-off-by: Caleb Connolly <caleb.conno...@linaro.org>
> ---
> MAINTAINERS | 1 +
> arch/arm/dts/dragonboard410c-uboot.dtsi | 11 --
> arch/arm/dts/dragonboard410c.dts | 22 ++-
> arch/arm/dts/dragonboard820c-uboot.dtsi | 12 --
> arch/arm/dts/dragonboard820c.dts | 23 +++-
> arch/arm/dts/dragonboard845c-uboot.dtsi | 11 --
> arch/arm/dts/dragonboard845c.dts | 4 +
> arch/arm/dts/sdm845.dtsi | 23 +++-
> arch/arm/dts/starqltechn-uboot.dtsi | 10 --
> arch/arm/dts/starqltechn.dts | 20 +--
> arch/arm/mach-snapdragon/Kconfig | 3 +
> arch/arm/mach-snapdragon/init_sdm845.c | 45 ++-----
> board/qualcomm/dragonboard410c/dragonboard410c.c | 31 ++---
> board/qualcomm/dragonboard820c/dragonboard820c.c | 29 ++--
> drivers/button/Kconfig | 9 ++
> drivers/button/Makefile | 1 +
> drivers/button/button-qcom-pmic.c | 165
> +++++++++++++++++++++++
> drivers/gpio/Kconfig | 3 +-
> drivers/gpio/qcom_pmic_gpio.c | 104 --------------
> 19 files changed, 269 insertions(+), 258 deletions(-)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index f6d63c8ab563..8cd102eaa070 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -572,6 +572,7 @@ M: Neil Armstrong <neil.armstr...@linaro.org>
> R: Sumit Garg <sumit.g...@linaro.org>
> S: Maintained
> F: arch/arm/mach-snapdragon/
> +F: drivers/button/button-qcom-pmic.c
> F: drivers/clk/qcom/
> F: drivers/gpio/msm_gpio.c
> F: drivers/mmc/msm_sdhci.c
> diff --git a/arch/arm/dts/dragonboard410c-uboot.dtsi
> b/arch/arm/dts/dragonboard410c-uboot.dtsi
> index 3b0bd0ed0a1b..cec64bf80f99 100644
> --- a/arch/arm/dts/dragonboard410c-uboot.dtsi
> +++ b/arch/arm/dts/dragonboard410c-uboot.dtsi
> @@ -42,14 +42,3 @@
> gpios = <&pm8916_gpios 3 0>;
> };
> };
> -
> -
> -&pm8916_pon {
> - key_vol_down {
> - gpios = <&pm8916_pon 1 0>;
> - };
> -
> - key_power {
> - gpios = <&pm8916_pon 0 0>;
> - };
> -};
> diff --git a/arch/arm/dts/dragonboard410c.dts
> b/arch/arm/dts/dragonboard410c.dts
> index 9230dd3fd96c..c41fee977813 100644
> --- a/arch/arm/dts/dragonboard410c.dts
> +++ b/arch/arm/dts/dragonboard410c.dts
> @@ -147,11 +147,23 @@
> #address-cells = <0x1>;
> #size-cells = <0x1>;
>
> - pm8916_pon: pm8916_pon@800 {
> - compatible = "qcom,pm8916-pwrkey";
> - reg = <0x800 0x96>;
> - #gpio-cells = <2>;
> - gpio-controller;
> + pon@800 {
> + compatible = "qcom,pm8916-pon";
> + reg = <0x800 0x100>;
> + mode-bootloader = <0x2>;
> + mode-recovery = <0x1>;
> +
> + pwrkey {
> + compatible =
> "qcom,pm8941-pwrkey";
> + debounce = <15625>;
> + bias-pull-up;
> + };
> +
> + pm8916_resin: resin {
> + compatible =
> "qcom,pm8941-resin";
> + debounce = <15625>;
> + bias-pull-up;
> + };
> };
>
> pm8916_gpios: pm8916_gpios@c000 {
> diff --git a/arch/arm/dts/dragonboard820c-uboot.dtsi
> b/arch/arm/dts/dragonboard820c-uboot.dtsi
> index 457728a43ecb..d93c7c1fbdee 100644
> --- a/arch/arm/dts/dragonboard820c-uboot.dtsi
> +++ b/arch/arm/dts/dragonboard820c-uboot.dtsi
> @@ -30,15 +30,3 @@
> };
> };
> };
> -
> -&pm8994_pon {
> - key_vol_down {
> - gpios = <&pm8994_pon 1 0>;
> - label = "key_vol_down";
> - };
> -
> - key_power {
> - gpios = <&pm8994_pon 0 0>;
> - label = "key_power";
> - };
> -};
> diff --git a/arch/arm/dts/dragonboard820c.dts
> b/arch/arm/dts/dragonboard820c.dts
> index ad201d48749c..0d9c9f7a4922 100644
> --- a/arch/arm/dts/dragonboard820c.dts
> +++ b/arch/arm/dts/dragonboard820c.dts
> @@ -109,12 +109,23 @@
> #address-cells = <0x1>;
> #size-cells = <0x1>;
>
> - pm8994_pon: pm8994_pon@800 {
> - compatible = "qcom,pm8994-pwrkey";
> - reg = <0x800 0x96>;
> - #gpio-cells = <2>;
> - gpio-controller;
> - gpio-bank-name="pm8994_key.";
> + pm8994_pon: pon@800 {
> + compatible = "qcom,pm8916-pon";
> + reg = <0x800 0x100>;
> + mode-bootloader = <0x2>;
> + mode-recovery = <0x1>;
> +
> + pwrkey {
> + compatible =
> "qcom,pm8941-pwrkey";
> + debounce = <15625>;
> + bias-pull-up;
> + };
> +
> + pm8994_resin: resin {
> + compatible =
> "qcom,pm8941-resin";
> + debounce = <15625>;
> + bias-pull-up;
> + };
> };
>
> pm8994_gpios: pm8994_gpios@c000 {
> diff --git a/arch/arm/dts/dragonboard845c-uboot.dtsi
> b/arch/arm/dts/dragonboard845c-uboot.dtsi
> index 7728f4f4a3e5..775f45c0149f 100644
> --- a/arch/arm/dts/dragonboard845c-uboot.dtsi
> +++ b/arch/arm/dts/dragonboard845c-uboot.dtsi
> @@ -24,14 +24,3 @@
> };
> };
> };
> -
> -&pm8998_pon {
> - key_vol_down {
> - gpios = <&pm8998_pon 1 0>;
> - label = "key_vol_down";
> - };
> - key_power {
> - gpios = <&pm8998_pon 0 0>;
> - label = "key_power";
> - };
> -};
> diff --git a/arch/arm/dts/dragonboard845c.dts
> b/arch/arm/dts/dragonboard845c.dts
> index b4f057ac6537..054f253eb32a 100644
> --- a/arch/arm/dts/dragonboard845c.dts
> +++ b/arch/arm/dts/dragonboard845c.dts
> @@ -41,4 +41,8 @@
> };
> };
>
> +&pm8998_resin {
> + status = "okay";
> +};
> +
> #include "dragonboard845c-uboot.dtsi"
> diff --git a/arch/arm/dts/sdm845.dtsi b/arch/arm/dts/sdm845.dtsi
> index 4798ace0ff8b..cd5d890e9a45 100644
> --- a/arch/arm/dts/sdm845.dtsi
> +++ b/arch/arm/dts/sdm845.dtsi
> @@ -78,12 +78,25 @@
> #address-cells = <0x1>;
> #size-cells = <0x1>;
>
> - pm8998_pon: pm8998_pon@800 {
> - compatible = "qcom,pm8998-pwrkey";
> + pm8998_pon: pon@800 {
> + compatible = "qcom,pm8998-pon";
> +
> reg = <0x800 0x100>;
> - #gpio-cells = <2>;
> - gpio-controller;
> - gpio-bank-name = "pm8998_key.";
> + mode-bootloader = <0x2>;
> + mode-recovery = <0x1>;
> +
> + pm8998_pwrkey: pwrkey {
> + compatible =
> "qcom,pm8941-pwrkey";
> + debounce = <15625>;
> + bias-pull-up;
> + };
> +
> + pm8998_resin: resin {
> + compatible =
> "qcom,pm8941-resin";
> + debounce = <15625>;
> + bias-pull-up;
> + status = "disabled";
> + };
> };
>
> pm8998_gpios: pm8998_gpios@c000 {
> diff --git a/arch/arm/dts/starqltechn-uboot.dtsi
> b/arch/arm/dts/starqltechn-uboot.dtsi
> index 034d5c1c07ed..55c6d18412ba 100644
> --- a/arch/arm/dts/starqltechn-uboot.dtsi
> +++ b/arch/arm/dts/starqltechn-uboot.dtsi
> @@ -25,13 +25,3 @@
> };
> };
>
> -&pm8998_pon {
> - key_vol_down {
> - gpios = <&pm8998_pon 1 0>;
> - label = "key_vol_down";
> - };
> - key_power {
> - gpios = <&pm8998_pon 0 0>;
> - label = "key_power";
> - };
> -};
> diff --git a/arch/arm/dts/starqltechn.dts b/arch/arm/dts/starqltechn.dts
> index 5b6372bee79a..0842e19adb60 100644
> --- a/arch/arm/dts/starqltechn.dts
> +++ b/arch/arm/dts/starqltechn.dts
> @@ -45,22 +45,6 @@
> format = "a8r8g8b8";
> };
>
> - gpio-keys {
> - compatible = "gpio-keys";
> -
> - key-pwr {
> - label = "Power";
> - linux,code = <KEY_ENTER>;
> - gpios = <&pm8998_pon 0 GPIO_ACTIVE_LOW>;
> - };
> -
> - key-vol-down {
> - label = "Volume Down";
> - linux,code = <KEY_DOWN>;
> - gpios = <&pm8998_pon 1 GPIO_ACTIVE_LOW>;
> - };
> - };
> -
> soc: soc {
> serial@a84000 {
> status = "okay";
> @@ -68,6 +52,10 @@
> };
> };
>
> +&pm8998_resin {
> + status = "okay";
> +};
> +
> &tlmm {
> muic_i2c: muic-i2c-n {
> pins = "GPIO_33", "GPIO_34";
> diff --git a/arch/arm/mach-snapdragon/Kconfig
> b/arch/arm/mach-snapdragon/Kconfig
> index 3c9f3bee3f18..ad6671081910 100644
> --- a/arch/arm/mach-snapdragon/Kconfig
> +++ b/arch/arm/mach-snapdragon/Kconfig
> @@ -17,6 +17,7 @@ config SDM845
> select LINUX_KERNEL_IMAGE_HEADER
> imply CLK_QCOM_SDM845
> imply PINCTRL_QCOM_SDM845
> + imply BUTTON_QCOM_PMIC
>
> config LNX_KRNL_IMG_TEXT_OFFSET_BASE
> default 0x80000000
> @@ -30,6 +31,7 @@ config TARGET_DRAGONBOARD410C
> select ENABLE_ARM_SOC_BOOT0_HOOK
> imply CLK_QCOM_APQ8016
> imply PINCTRL_QCOM_APQ8016
> + imply BUTTON_QCOM_PMIC
> help
> Support for 96Boards Dragonboard 410C. This board complies with
> 96Board Open Platform Specifications. Features:
> @@ -45,6 +47,7 @@ config TARGET_DRAGONBOARD820C
> bool "96Boards Dragonboard 820C"
> imply CLK_QCOM_APQ8096
> imply PINCTRL_QCOM_APQ8096
> + imply BUTTON_QCOM_PMIC
> help
> Support for 96Boards Dragonboard 820C. This board complies with
> 96Board Open Platform Specifications. Features:
> diff --git a/arch/arm/mach-snapdragon/init_sdm845.c
> b/arch/arm/mach-snapdragon/init_sdm845.c
> index 1f8850239437..067acc9a6f44 100644
> --- a/arch/arm/mach-snapdragon/init_sdm845.c
> +++ b/arch/arm/mach-snapdragon/init_sdm845.c
> @@ -5,6 +5,7 @@
> * (C) Copyright 2021 Dzmitry Sankouski <dsankou...@gmail.com>
> */
>
> +#include <button.h>
> #include <init.h>
> #include <env.h>
> #include <common.h>
> @@ -32,46 +33,18 @@ __weak int board_init(void)
> /* Check for vol- and power buttons */
> __weak int misc_init_r(void)
> {
> - struct udevice *pon;
> - struct gpio_desc resin;
> - int node, ret;
> + struct udevice *btn;
> + int ret;
> + enum button_state_t state;
>
> - ret = uclass_get_device_by_name(UCLASS_GPIO, "pm8998_pon@800", &pon);
> + ret = button_get_by_label("pwrkey", &btn);
> if (ret < 0) {
> - printf("Failed to find PMIC pon node. Check device tree\n");
> - return 0;
> + printf("Couldn't find power button!\n");
> + return ret;
> }
>
> - node = fdt_subnode_offset(gd->fdt_blob, dev_of_offset(pon),
> - "key_vol_down");
> - if (node < 0) {
> - printf("Failed to find key_vol_down node. Check device tree\n");
> - return 0;
> - }
> - if (gpio_request_by_name_nodev(offset_to_ofnode(node), "gpios", 0,
> - &resin, 0)) {
> - printf("Failed to request key_vol_down button.\n");
> - return 0;
> - }
> - if (dm_gpio_get_value(&resin)) {
> - env_set("key_vol_down", "1");
> - printf("Volume down button pressed\n");
> - } else {
> - env_set("key_vol_down", "0");
> - }
> -
> - node = fdt_subnode_offset(gd->fdt_blob, dev_of_offset(pon),
> - "key_power");
> - if (node < 0) {
> - printf("Failed to find key_power node. Check device tree\n");
> - return 0;
> - }
> - if (gpio_request_by_name_nodev(offset_to_ofnode(node), "gpios", 0,
> - &resin, 0)) {
> - printf("Failed to request key_power button.\n");
> - return 0;
> - }
> - if (dm_gpio_get_value(&resin)) {
> + state = button_get_state(btn);
> + if (state == BUTTON_ON) {
> env_set("key_power", "1");
> printf("Power button pressed\n");
> } else {
> diff --git a/board/qualcomm/dragonboard410c/dragonboard410c.c
> b/board/qualcomm/dragonboard410c/dragonboard410c.c
> index 371b3262f8c5..350e0e9e20aa 100644
> --- a/board/qualcomm/dragonboard410c/dragonboard410c.c
> +++ b/board/qualcomm/dragonboard410c/dragonboard410c.c
> @@ -5,6 +5,7 @@
> * (C) Copyright 2015 Mateusz Kulikowski <mateusz.kulikow...@gmail.com>
> */
>
> +#include <button.h>
> #include <common.h>
> #include <cpu_func.h>
> #include <dm.h>
> @@ -108,32 +109,20 @@ int board_usb_init(int index, enum usb_init_type init)
> /* Check for vol- button - if pressed - stop autoboot */
> int misc_init_r(void)
> {
> - struct udevice *pon;
> - struct gpio_desc resin;
> - int node, ret;
> + struct udevice *btn;
> + int ret;
> + enum button_state_t state;
>
> - ret = uclass_get_device_by_name(UCLASS_GPIO, "pm8916_pon@800", &pon);
> + ret = button_get_by_label("vol_down", &btn);
> if (ret < 0) {
> - printf("Failed to find PMIC pon node. Check device tree\n");
> - return 0;
> + printf("Couldn't find power button!\n");
> + return ret;
> }
>
> - node = fdt_subnode_offset(gd->fdt_blob, dev_of_offset(pon),
> - "key_vol_down");
> - if (node < 0) {
> - printf("Failed to find key_vol_down node. Check device tree\n");
> - return 0;
> - }
> -
> - if (gpio_request_by_name_nodev(offset_to_ofnode(node), "gpios", 0,
> - &resin, 0)) {
> - printf("Failed to request key_vol_down button.\n");
> - return 0;
> - }
> -
> - if (dm_gpio_get_value(&resin)) {
> + state = button_get_state(btn);
> + if (state == BUTTON_ON) {
> env_set("preboot", "setenv preboot; fastboot 0");
> - printf("key_vol_down pressed - Starting fastboot.\n");
> + printf("vol_down pressed - Starting fastboot.\n");
> }
>
> return 0;
> diff --git a/board/qualcomm/dragonboard820c/dragonboard820c.c
> b/board/qualcomm/dragonboard820c/dragonboard820c.c
> index 6785bf58e949..2f0db628368b 100644
> --- a/board/qualcomm/dragonboard820c/dragonboard820c.c
> +++ b/board/qualcomm/dragonboard820c/dragonboard820c.c
> @@ -5,6 +5,7 @@
> * (C) Copyright 2017 Jorge Ramirez-Ortiz <jorge.ramirez-or...@linaro.org>
> */
>
> +#include <button.h>
> #include <cpu_func.h>
> #include <init.h>
> #include <env.h>
> @@ -139,30 +140,18 @@ void reset_cpu(void)
> /* Check for vol- button - if pressed - stop autoboot */
> int misc_init_r(void)
> {
> - struct udevice *pon;
> - struct gpio_desc resin;
> - int node, ret;
> + struct udevice *btn;
> + int ret;
> + enum button_state_t state;
>
> - ret = uclass_get_device_by_name(UCLASS_GPIO, "pm8994_pon@800", &pon);
> + ret = button_get_by_label("pwrkey", &btn);
> if (ret < 0) {
> - printf("Failed to find PMIC pon node. Check device tree\n");
> - return 0;
> + printf("Couldn't find power button!\n");
> + return ret;
> }
>
> - node = fdt_subnode_offset(gd->fdt_blob, dev_of_offset(pon),
> - "key_vol_down");
> - if (node < 0) {
> - printf("Failed to find key_vol_down node. Check device tree\n");
> - return 0;
> - }
> -
> - if (gpio_request_by_name_nodev(offset_to_ofnode(node), "gpios", 0,
> - &resin, 0)) {
> - printf("Failed to request key_vol_down button.\n");
> - return 0;
> - }
> -
> - if (dm_gpio_get_value(&resin)) {
> + state = button_get_state(btn);
> + if (state == BUTTON_ON) {
> env_set("bootdelay", "-1");
> printf("Power button pressed - dropping to console.\n");
> }
> diff --git a/drivers/button/Kconfig b/drivers/button/Kconfig
> index 8ce2de37d62a..097b05f822e7 100644
> --- a/drivers/button/Kconfig
> +++ b/drivers/button/Kconfig
> @@ -27,4 +27,13 @@ config BUTTON_GPIO
> The GPIO driver must used driver model. Buttons are configured using
> the device tree.
>
> +config BUTTON_QCOM_PMIC
> + bool "Qualcomm power button"
> + depends on BUTTON
> + depends on PMIC_QCOM
> + help
> + Enable support for the power and "resin" (usually volume down) buttons
> + on Qualcomm SoCs. These will be configured as the Enter and Down keys
> + respectively, allowing navigation of bootmenu with buttons on device.
> +
> endmenu
> diff --git a/drivers/button/Makefile b/drivers/button/Makefile
> index bbd18af14940..68555081a47a 100644
> --- a/drivers/button/Makefile
> +++ b/drivers/button/Makefile
> @@ -5,3 +5,4 @@
> obj-$(CONFIG_BUTTON) += button-uclass.o
> obj-$(CONFIG_BUTTON_ADC) += button-adc.o
> obj-$(CONFIG_BUTTON_GPIO) += button-gpio.o
> +obj-$(CONFIG_BUTTON_QCOM_PMIC) += button-qcom-pmic.o
> \ No newline at end of file
> diff --git a/drivers/button/button-qcom-pmic.c
> b/drivers/button/button-qcom-pmic.c
> new file mode 100644
> index 000000000000..34a976d1e6c6
> --- /dev/null
> +++ b/drivers/button/button-qcom-pmic.c
> @@ -0,0 +1,165 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Qualcomm generic pmic gpio driver
> + *
> + * (C) Copyright 2015 Mateusz Kulikowski <mateusz.kulikow...@gmail.com>
> + * (C) Copyright 2023 Linaro Ltd.
> + */
> +
> +#include <button.h>
> +#include <dt-bindings/input/linux-event-codes.h>
> +#include <dm.h>
> +#include <dm/device-internal.h>
> +#include <dm/lists.h>
> +#include <log.h>
> +#include <power/pmic.h>
> +#include <spmi/spmi.h>
> +#include <linux/bitops.h>
> +
> +#define REG_TYPE 0x4
> +#define REG_SUBTYPE 0x5
> +
> +struct qcom_pmic_btn_priv {
> + u32 base;
> + u32 status_bit;
> + int code;
> + struct udevice *pmic;
> +};
> +
> +#define PON_INT_RT_STS 0x10
> +#define KPDPWR_ON_INT_BIT 0
> +#define RESIN_ON_INT_BIT 1
> +
> +#define NODE_IS_PWRKEY(node) (!strncmp(ofnode_get_name(node), "pwrkey",
> strlen("pwrkey")))
> +#define NODE_IS_RESIN(node) (!strncmp(ofnode_get_name(node), "resin",
> strlen("resin")))
> +
> +static enum button_state_t qcom_pwrkey_get_state(struct udevice *dev)
> +{
> + struct qcom_pmic_btn_priv *priv = dev_get_priv(dev);
> +
> + int reg = pmic_reg_read(priv->pmic, priv->base + PON_INT_RT_STS);
> +
> + if (reg < 0)
> + return 0;
> +
> + return (reg & BIT(priv->status_bit)) != 0;
> +}
> +
> +static int qcom_pwrkey_get_code(struct udevice *dev)
> +{
> + struct qcom_pmic_btn_priv *priv = dev_get_priv(dev);
> +
> + return priv->code;
> +}
> +
> +static int qcom_pwrkey_probe(struct udevice *dev)
> +{
> + struct button_uc_plat *uc_plat = dev_get_uclass_plat(dev);
> + struct qcom_pmic_btn_priv *priv = dev_get_priv(dev);
> + ofnode node = dev_ofnode(dev);
> + int ret;
> + u64 base;
> +
> + /* Ignore the top-level pon node */
> + if (!uc_plat->label)
> + return 0;
> +
> + /* the pwrkey and resin nodes are children of the "pon" node, get the
> + * PMIC device to use in pmic_reg_* calls.
> + */
> + priv->pmic = dev->parent->parent;
> +
> + /* Get the address of the parent pon node */
> + base = dev_read_addr(dev->parent);
> + if (base == FDT_ADDR_T_NONE) {
> + printf("%s: Can't find address\n", dev->name);
> + return -EINVAL;
> + }
> +
> + priv->base = base;
> +
> + /* Do a sanity check */
> + ret = pmic_reg_read(priv->pmic, priv->base + REG_TYPE);
> + if (ret != 0x1 && ret != 0xb) {
> + printf("%s: unexpected PMIC function type %d\n", dev->name,
> ret);
> + return -ENXIO;
> + }
> +
> + ret = pmic_reg_read(priv->pmic, priv->base + REG_SUBTYPE);
> + if ((ret & 0x7) == 0) {
> + printf("%s: unexpected PMCI function subtype %d\n", dev->name,
> ret);
> + return -ENXIO;
> + }
> +
> + if (NODE_IS_PWRKEY(node)) {
> + priv->status_bit = 0;
> + priv->code = KEY_ENTER;
> + } else if (NODE_IS_RESIN(node)) {
> + priv->status_bit = 1;
> + priv->code = KEY_DOWN;
> + } else {
> + /* Should not get here! */
> + printf("Invalid pon node '%s' should be 'pwrkey' or 'resin'\n",
> + ofnode_get_name(node));
> + return -EINVAL;
> + }
> +
> + return 0;
> +}
> +
> +static int button_qcom_pmic_bind(struct udevice *parent)
> +{
> + struct udevice *dev;
> + ofnode node;
> + int ret;
> +
> + dev_for_each_subnode(node, parent) {
> + struct button_uc_plat *uc_plat;
> + const char *label;
> +
> + if (!ofnode_is_enabled(node))
> + continue;
> +
> + ret = device_bind_driver_to_node(parent, "qcom_pwrkey",
> + ofnode_get_name(node),
> + node, &dev);
> + if (ret) {
> + printf("Failed to bind %s! %d\n", label, ret);
> + return ret;
> + }
> + uc_plat = dev_get_uclass_plat(dev);
> + if (NODE_IS_PWRKEY(node)) {
> + uc_plat->label = "pwrkey";
> + } else if (NODE_IS_RESIN(node)) {
> + uc_plat->label = "vol_down";
> + } else {
> + printf("Unknown button node '%s' should be 'pwrkey' or
> 'resin'\n",
> + ofnode_get_name(node));
> + device_unbind(dev);
> + }
> + }
> +
> + return 0;
> +}
> +
> +static const struct button_ops button_qcom_pmic_ops = {
> + .get_state = qcom_pwrkey_get_state,
> + .get_code = qcom_pwrkey_get_code,
> +};
> +
> +static const struct udevice_id qcom_pwrkey_ids[] = {
> + { .compatible = "qcom,pm8916-pon" },
> + { .compatible = "qcom,pm8941-pon" },
> + { .compatible = "qcom,pm8998-pon" },
> + { }
> +};
> +
> +U_BOOT_DRIVER(qcom_pwrkey) = {
> + .name = "qcom_pwrkey",
> + .id = UCLASS_BUTTON,
> + .of_match = qcom_pwrkey_ids,
> + .bind = button_qcom_pmic_bind,
> + .probe = qcom_pwrkey_probe,
> + .ops = &button_qcom_pmic_ops,
> + .priv_auto = sizeof(struct qcom_pmic_btn_priv),
> +};
> diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
> index ba42b0768e12..fbf77673c5e0 100644
> --- a/drivers/gpio/Kconfig
> +++ b/drivers/gpio/Kconfig
> @@ -309,12 +309,13 @@ config CMD_PCA953X
> config QCOM_PMIC_GPIO
> bool "Qualcomm generic PMIC GPIO/keypad driver"
> depends on DM_GPIO && PMIC_QCOM
> + select BUTTON
> help
> Support for GPIO pins and power/reset buttons found on
> Qualcomm SoCs PMIC.
> Default name for GPIO bank is "pm8916".
> Power and reset buttons are placed in "pwkey_qcom" bank and
> - have gpio numbers 0 and 1 respectively.
> + have gpio numbers 0 and 1 respectively.
>
> config PCF8575_GPIO
> bool "PCF8575 I2C GPIO Expander driver"
> diff --git a/drivers/gpio/qcom_pmic_gpio.c b/drivers/gpio/qcom_pmic_gpio.c
> index e5841f502953..7b83c67fa464 100644
> --- a/drivers/gpio/qcom_pmic_gpio.c
> +++ b/drivers/gpio/qcom_pmic_gpio.c
> @@ -275,107 +275,3 @@ U_BOOT_DRIVER(qcom_pmic_gpio) = {
> .priv_auto = sizeof(struct qcom_gpio_bank),
> };
>
> -
> -/* Add pmic buttons as GPIO as well - there is no generic way for now */
> -#define PON_INT_RT_STS 0x10
> -#define KPDPWR_ON_INT_BIT 0
> -#define RESIN_ON_INT_BIT 1
> -
> -static int qcom_pwrkey_get_function(struct udevice *dev, unsigned offset)
> -{
> - return GPIOF_INPUT;
> -}
> -
> -static int qcom_pwrkey_get_value(struct udevice *dev, unsigned offset)
> -{
> - struct qcom_gpio_bank *priv = dev_get_priv(dev);
> -
> - int reg = pmic_reg_read(dev->parent, priv->pid + PON_INT_RT_STS);
> -
> - if (reg < 0)
> - return 0;
> -
> - switch (offset) {
> - case 0: /* Power button */
> - return (reg & BIT(KPDPWR_ON_INT_BIT)) != 0;
> - break;
> - case 1: /* Reset button */
> - default:
> - return (reg & BIT(RESIN_ON_INT_BIT)) != 0;
> - break;
> - }
> -}
> -
> -/*
> - * Since pmic buttons modelled as GPIO, we need empty direction functions
> - * to trick u-boot button driver
> - */
> -static int qcom_pwrkey_direction_input(struct udevice *dev, unsigned int
> offset)
> -{
> - return 0;
> -}
> -
> -static int qcom_pwrkey_direction_output(struct udevice *dev, unsigned int
> offset, int value)
> -{
> - return -EOPNOTSUPP;
> -}
> -
> -static const struct dm_gpio_ops qcom_pwrkey_ops = {
> - .get_value = qcom_pwrkey_get_value,
> - .get_function = qcom_pwrkey_get_function,
> - .direction_input = qcom_pwrkey_direction_input,
> - .direction_output = qcom_pwrkey_direction_output,
> -};
> -
> -static int qcom_pwrkey_probe(struct udevice *dev)
> -{
> - struct qcom_gpio_bank *priv = dev_get_priv(dev);
> - int reg;
> - u64 pid;
> -
> - pid = dev_read_addr(dev);
> - if (pid == FDT_ADDR_T_NONE)
> - return log_msg_ret("bad address", -EINVAL);
> -
> - priv->pid = pid;
> -
> - /* Do a sanity check */
> - reg = pmic_reg_read(dev->parent, priv->pid + REG_TYPE);
> - if (reg != 0x1)
> - return log_msg_ret("bad type", -ENXIO);
> -
> - reg = pmic_reg_read(dev->parent, priv->pid + REG_SUBTYPE);
> - if ((reg & 0x5) == 0)
> - return log_msg_ret("bad subtype", -ENXIO);
> -
> - return 0;
> -}
> -
> -static int qcom_pwrkey_of_to_plat(struct udevice *dev)
> -{
> - struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);
> -
> - uc_priv->gpio_count = 2;
> - uc_priv->bank_name = dev_read_string(dev, "gpio-bank-name");
> - if (uc_priv->bank_name == NULL)
> - uc_priv->bank_name = "pwkey_qcom";
> -
> - return 0;
> -}
> -
> -static const struct udevice_id qcom_pwrkey_ids[] = {
> - { .compatible = "qcom,pm8916-pwrkey" },
> - { .compatible = "qcom,pm8994-pwrkey" },
> - { .compatible = "qcom,pm8998-pwrkey" },
> - { }
> -};
> -
> -U_BOOT_DRIVER(pwrkey_qcom) = {
> - .name = "pwrkey_qcom",
> - .id = UCLASS_GPIO,
> - .of_match = qcom_pwrkey_ids,
> - .of_to_plat = qcom_pwrkey_of_to_plat,
> - .probe = qcom_pwrkey_probe,
> - .ops = &qcom_pwrkey_ops,
> - .priv_auto = sizeof(struct qcom_gpio_bank),
> -};
>
