sugar/linux
1
0
Fork 0
Code Activity

Merge tag 'ib-mfd-gpio-v6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into gpio/for-next

Browse Source 
Immutable branch between MFD and GPIO due for the v6.18 merge window

Convert GPIO drivers under drivers/mfd/ to using the modernized generic
GPIO chip API.
This commit is contained in:
Bartosz Golaszewski
2025-09-03 15:02:48 +02:00
parent 3be2d43534 9b33bbc084
commit d3441febbb
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/mfd/vexpress-sysreg.c
View File

@@ -5,6 +5,7 @@
*/
#include <linux/gpio/driver.h>
#include <linux/gpio/generic.h>
#include <linux/err.h>
#include <linux/io.h>
#include <linux/mfd/core.h>
@@ -96,9 +97,11 @@ static struct mfd_cell vexpress_sysreg_cells[] = {
static int vexpress_sysreg_probe(struct platform_device *pdev)
{
struct gpio_generic_chip *mmc_gpio_chip;
struct gpio_generic_chip_config config;
struct resource *mem;
void __iomem *base;
struct gpio_chip *mmc_gpio_chip;
int ret;
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!mem)
@@ -116,10 +119,22 @@ static int vexpress_sysreg_probe(struct platform_device *pdev)
GFP_KERNEL);
if (!mmc_gpio_chip)
return -ENOMEM;
bgpio_init(mmc_gpio_chip, &pdev->dev, 0x4, base + SYS_MCI,
NULL, NULL, NULL, NULL, 0);
mmc_gpio_chip->ngpio = 2;
devm_gpiochip_add_data(&pdev->dev, mmc_gpio_chip, NULL);
config = (typeof(config)){
.dev = &pdev->dev,
.sz = 4,
.dat = base + SYS_MCI,
};
ret = gpio_generic_chip_init(mmc_gpio_chip, &config);
if (ret)
return ret;
mmc_gpio_chip->gc.ngpio = 2;
ret = devm_gpiochip_add_data(&pdev->dev, &mmc_gpio_chip->gc, NULL);
if (ret)
return ret;
return devm_mfd_add_devices(&pdev->dev, PLATFORM_DEVID_AUTO,
vexpress_sysreg_cells,