Re: [PATCH v5 7/9] gpio: qcom_pmic: drop gpio-count property

On 30/11/2023 21:22, Caleb Connolly wrote:

This property is not part of the dt bindings and all boards use the new gpio-ranges property instead. Drop support for this.

Signed-off-by: Caleb Connolly caleb.connolly@linaro.org

doc/device-tree-bindings/gpio/pm8916_gpio.txt | 48 --------------------------- drivers/gpio/qcom_pmic_gpio.c | 13 +++----- 2 files changed, 5 insertions(+), 56 deletions(-)

diff --git a/doc/device-tree-bindings/gpio/pm8916_gpio.txt b/doc/device-tree-bindings/gpio/pm8916_gpio.txt deleted file mode 100644 index 58185b833524..000000000000 --- a/doc/device-tree-bindings/gpio/pm8916_gpio.txt +++ /dev/null @@ -1,48 +0,0 @@ -Driver for part of pm8916 PMIC - gpio and power/reset keys

-This device should be child of SPMI pmic.

-1) GPIO driver

-Required properties: -- compatible: "qcom,pm8916-gpio" -- reg: peripheral ID, size of register block -- gpio-controller -- gpio-count: number of GPIOs -- #gpio-cells: 2

-Optional properties: -- gpio-bank-name: name of bank (as default "pm8916" is used)

-Example:

-pmic_gpios: gpios@c000 {

• compatible = "qcom,pm8916-gpio";
• reg = <0xc000 0x400>;
• gpio-controller;
• gpio-count = <4>;
• #gpio-cells = <2>;
• gpio-bank-name="pmic";

-};

-2) Power/Reset key driver

-Required properties: -- compatible: "qcom,pm8916-pwrkey" -- reg: peripheral ID, size of register block -- gpio-controller -- #gpio-cells: 2

-Optional properties: -- gpio-bank-name: name of bank (as default "pm8916_key" is used)

-Example:

-pmic_pon: pon@800 {

• compatible = "qcom,pm8916-pwrkey";
• reg = <0x800 0x96>;
• #gpio-cells = <2>;
• gpio-controller;

-}; diff --git a/drivers/gpio/qcom_pmic_gpio.c b/drivers/gpio/qcom_pmic_gpio.c index 54f4dbd2b84e..1adc6566a36d 100644 --- a/drivers/gpio/qcom_pmic_gpio.c +++ b/drivers/gpio/qcom_pmic_gpio.c @@ -268,14 +268,11 @@ static int qcom_gpio_of_to_plat(struct udevice *dev) struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); int ret;

• uc_priv->gpio_count = dev_read_u32_default(dev, "gpio-count", 0);
• if (!uc_priv->gpio_count) {

• ret = qcom_gpio_of_parse_ranges(dev);
  

• if (ret > 0)
  

• 	uc_priv->gpio_count = ret;
  

• else
  

• 	return ret;
  

• }

• ret = qcom_gpio_of_parse_ranges(dev);

• if (ret > 0)

• uc_priv->gpio_count = ret;
  

• else

• return ret;
  
  

  uc_priv->bank_name = "pmic";

Reviewed-by: Neil Armstrong neil.armstrong@linaro.org