pinctrl: qcom: ssbi-gpio: hardcode IRQ counts

The probing of this driver calls platform_irq_count, which will
setup all of the IRQs that are configured in device tree. In
preparation for converting this driver to be a hierarchical IRQ
chip, hardcode the IRQ count based on the hardware type so that all
the IRQs are not configured immediately and are configured on an
as-needed basis later in the boot process. This change will also
allow for the removal of the interrupts property later in this
patch series once the hierarchical IRQ chip support is in.

This patch also removes the generic qcom,ssbi-gpio OF match since we
don't know the number of pins. All of the existing upstream bindings
already include the more-specific binding.

This change was tested on an APQ8060 DragonBoard.

Signed-off-by: Brian Masney <masneyb@onstation.org>
Tested-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c b/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c
index ded7d765af2e1fe8aefc72670917f115455bd6c1..23641e4d452114ec4260e4acf2f05c37914b8cbc 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c
+++ b/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c
@@ -665,12 +665,11 @@ static int pm8xxx_pin_populate(struct pm8xxx_gpio *pctrl,
 }
 
 static const struct of_device_id pm8xxx_gpio_of_match[] = {
-       { .compatible = "qcom,pm8018-gpio" },
-       { .compatible = "qcom,pm8038-gpio" },
-       { .compatible = "qcom,pm8058-gpio" },
-       { .compatible = "qcom,pm8917-gpio" },
-       { .compatible = "qcom,pm8921-gpio" },
-       { .compatible = "qcom,ssbi-gpio" },
+       { .compatible = "qcom,pm8018-gpio", .data = (void *) 6 },
+       { .compatible = "qcom,pm8038-gpio", .data = (void *) 12 },
+       { .compatible = "qcom,pm8058-gpio", .data = (void *) 44 },
+       { .compatible = "qcom,pm8917-gpio", .data = (void *) 38 },
+       { .compatible = "qcom,pm8921-gpio", .data = (void *) 44 },
        { },
 };
 MODULE_DEVICE_TABLE(of, pm8xxx_gpio_of_match);
@@ -680,20 +679,14 @@ static int pm8xxx_gpio_probe(struct platform_device *pdev)
        struct pm8xxx_pin_data *pin_data;
        struct pinctrl_pin_desc *pins;
        struct pm8xxx_gpio *pctrl;
-       int ret;
-       int i, npins;
+       int ret, i;
 
        pctrl = devm_kzalloc(&pdev->dev, sizeof(*pctrl), GFP_KERNEL);
        if (!pctrl)
                return -ENOMEM;
 
        pctrl->dev = &pdev->dev;
-       npins = platform_irq_count(pdev);
-       if (!npins)
-               return -EINVAL;
-       if (npins < 0)
-               return npins;
-       pctrl->npins = npins;
+       pctrl->npins = (uintptr_t) device_get_match_data(&pdev->dev);
 
        pctrl->regmap = dev_get_regmap(pdev->dev.parent, NULL);
        if (!pctrl->regmap) {