diff options
Diffstat (limited to 'drivers/gpio/gpio-orion.c')
| -rw-r--r-- | drivers/gpio/gpio-orion.c | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/drivers/gpio/gpio-orion.c b/drivers/gpio/gpio-orion.c index 63ef966edf..0a1b50069b 100644 --- a/drivers/gpio/gpio-orion.c +++ b/drivers/gpio/gpio-orion.c @@ -1,18 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + /* * Marvell Orion/MVEBU SoC GPIO driver * * Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * */ #include <common.h> @@ -87,14 +78,11 @@ static struct gpio_ops orion_gpio_ops = { .set = orion_gpio_set_value, }; -static int orion_gpio_probe(struct device_d *dev) +static int orion_gpio_probe(struct device *dev) { struct resource *iores; struct orion_gpio_chip *gpio; - - dev->id = of_alias_get_id(dev->device_node, "gpio"); - if (dev->id < 0) - return dev->id; + int id; gpio = xzalloc(sizeof(*gpio)); iores = dev_request_mem_resource(dev, 0); @@ -105,9 +93,14 @@ static int orion_gpio_probe(struct device_d *dev) gpio->regs = IOMEM(iores->start); gpio->chip.dev = dev; gpio->chip.ops = &orion_gpio_ops; - gpio->chip.base = dev->id * 32; + + id = of_alias_get_id(dev->of_node, "gpio"); + if (id < 0) + return id; + + gpio->chip.base = id * 32; gpio->chip.ngpio = 32; - of_property_read_u32(dev->device_node, "ngpios", &gpio->chip.ngpio); + of_property_read_u32(dev->of_node, "ngpios", &gpio->chip.ngpio); gpiochip_add(&gpio->chip); @@ -120,8 +113,9 @@ static struct of_device_id orion_gpio_dt_ids[] = { { .compatible = "marvell,orion-gpio", }, { } }; +MODULE_DEVICE_TABLE(of, orion_gpio_dt_ids); -static struct driver_d orion_gpio_driver = { +static struct driver orion_gpio_driver = { .name = "orion-gpio", .probe = orion_gpio_probe, .of_compatible = DRV_OF_COMPAT(orion_gpio_dt_ids), |