github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-25 07:33:19 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

staging: hi6421-spmi-pmic: rename GPIO IRQ OF node

Browse Source 
Instead of using the standard name ("gpios"), use "interrupts".

Suggested-by: Rob Herring <robh@kernel.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Link: https://lore.kernel.org/r/8b2cad1e9b9904c6a2aaea8786d5e5a39f09ac19.1626515862.git.mchehab+huawei@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mauro Carvalho Chehab 2021-07-17 11:58:13 +02:00 committed by Greg Kroah-Hartman
parent b82d45a9a6
commit f81d992182
3 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/staging/hikey9xx/hi6421-spmi-pmic.c
View File

@ -218,6 +218,7 @@ static int hi6421_spmi_pmic_probe(struct spmi_device *sdev)
struct device *dev = &sdev->dev;
struct device_node *np = dev->of_node;
struct hi6421_spmi_pmic *ddata;
struct platform_device *pdev;
unsigned int virq;
int ret, i;
@ -233,21 +234,14 @@ static int hi6421_spmi_pmic_probe(struct spmi_device *sdev)
ddata->dev = dev;
ddata->gpio = of_get_gpio(np, 0);
if (ddata->gpio < 0)
return ddata->gpio;
pdev = container_of(dev, struct platform_device, dev);
if (!gpio_is_valid(ddata->gpio))
return -EINVAL;
ret = devm_gpio_request_one(dev, ddata->gpio, GPIOF_IN, "pmic");
if (ret < 0) {
dev_err(dev, "Failed to request gpio%d\n", ddata->gpio);
return ret;
ddata->irq = platform_get_irq(pdev, 0);
if (ddata->irq < 0) {
dev_err(dev, "Error %d when getting IRQs\n", ddata->irq);
return ddata->irq;
}
ddata->irq = gpio_to_irq(ddata->gpio);
hi6421_spmi_pmic_irq_init(ddata);
ddata->irqs = devm_kzalloc(dev, PMIC_IRQ_LIST_MAX * sizeof(int), GFP_KERNEL);

8
drivers/staging/hikey9xx/hisilicon,hi6421-spmi-pmic.yaml
View File

@ -34,9 +34,7 @@ properties:
interrupt-controller: true
gpios:
maxItems: 1
description: GPIO used for IRQs
interrupts: true
regulators:
type: object
@ -63,7 +61,6 @@ additionalProperties: false
examples:
- |
/* pmic properties */
pmic: pmic@0 {
compatible = "hisilicon,hi6421-spmi";
@ -71,7 +68,8 @@ examples:
#interrupt-cells = <2>;
interrupt-controller;
gpios = <&gpio28 0 0>;
interrupt-parent = <&gpio28>;
interrupts = <0 0>;
regulators {
#address-cells = <1>;

1
include/linux/mfd/hi6421-spmi-pmic.h
View File

@ -22,7 +22,6 @@ struct hi6421_spmi_pmic {
spinlock_t lock;
struct irq_domain *domain;
int irq;
int gpio;
unsigned int *irqs;
struct regmap *regmap;
};