gpio: generic: rename BGPIOF_ flags to GPIO_GENERIC_

Make the flags passed to gpio_generic_chip_init() use the same prefix as
the rest of the modernized generic GPIO chip API.

Link: https://lore.kernel.org/r/20250917-gpio-generic-flags-v1-1-69f51fee8c89@linaro.org
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

diff --git a/drivers/gpio/gpio-amdpt.c b/drivers/gpio/gpio-amdpt.c
index bbaf42307bc3d7df0a19b34cdb0a5aaa96c9ad3f..8458a6949c65d3e19ff9cefd0c69b2fcbc842938 100644 (file)
--- a/drivers/gpio/gpio-amdpt.c
+++ b/drivers/gpio/gpio-amdpt.c
@@ -94,7 +94,7 @@ static int pt_gpio_probe(struct platform_device *pdev)
                .dat = pt_gpio->reg_base + PT_INPUTDATA_REG,
                .set = pt_gpio->reg_base + PT_OUTPUTDATA_REG,
                .dirout = pt_gpio->reg_base + PT_DIRECTION_REG,
-               .flags = BGPIOF_READ_OUTPUT_REG_SET,
+               .flags = GPIO_GENERIC_READ_OUTPUT_REG_SET,
        };
 
        ret = gpio_generic_chip_init(&pt_gpio->chip, &config);

diff --git a/drivers/gpio/gpio-brcmstb.c b/drivers/gpio/gpio-brcmstb.c
index be3ff916e134a674d3e1d334a7d431b7ad767a33..f40c9472588bc70e734e15a3a5c8dd8efcd3c5a7 100644 (file)
--- a/drivers/gpio/gpio-brcmstb.c
+++ b/drivers/gpio/gpio-brcmstb.c
@@ -630,7 +630,7 @@ static int brcmstb_gpio_probe(struct platform_device *pdev)
         * else leave I/O in little endian mode.
         */
 #if defined(CONFIG_MIPS) && defined(__BIG_ENDIAN)
-       flags = BGPIOF_BIG_ENDIAN_BYTE_ORDER;
+       flags = GPIO_GENERIC_BIG_ENDIAN_BYTE_ORDER;
 #endif
 
        of_property_for_each_u32(np, "brcm,gpio-bank-widths", bank_width) {

diff --git a/drivers/gpio/gpio-cadence.c b/drivers/gpio/gpio-cadence.c
index c647953521c7164879551f41e1bad954fd7d8221..b75734ca22dd7381e2007efd3e7f5d7aa593de0c 100644 (file)
--- a/drivers/gpio/gpio-cadence.c
+++ b/drivers/gpio/gpio-cadence.c
@@ -181,7 +181,7 @@ static int cdns_gpio_probe(struct platform_device *pdev)
        config.dat = cgpio->regs + CDNS_GPIO_INPUT_VALUE;
        config.set = cgpio->regs + CDNS_GPIO_OUTPUT_VALUE;
        config.dirin = cgpio->regs + CDNS_GPIO_DIRECTION_MODE;
-       config.flags = BGPIOF_READ_OUTPUT_REG_SET;
+       config.flags = GPIO_GENERIC_READ_OUTPUT_REG_SET;
 
        ret = gpio_generic_chip_init(&cgpio->gen_gc, &config);
        if (ret) {

diff --git a/drivers/gpio/gpio-ge.c b/drivers/gpio/gpio-ge.c
index b5cbf27b8f44225341e23e88b985e26458d11a7b..66bdff36eb615ee005e1dd0be4ed9377f9d06763 100644 (file)
--- a/drivers/gpio/gpio-ge.c
+++ b/drivers/gpio/gpio-ge.c
@@ -73,7 +73,7 @@ static int __init gef_gpio_probe(struct platform_device *pdev)
                .dat = regs + GEF_GPIO_IN,
                .set = regs + GEF_GPIO_OUT,
                .dirin = regs + GEF_GPIO_DIRECT,
-               .flags = BGPIOF_BIG_ENDIAN_BYTE_ORDER,
+               .flags = GPIO_GENERIC_BIG_ENDIAN_BYTE_ORDER,
        };
 
        ret = gpio_generic_chip_init(chip, &config);

diff --git a/drivers/gpio/gpio-grgpio.c b/drivers/gpio/gpio-grgpio.c
index 5930f4c6f2b578ea55c8143078042d5e0aaf3cfd..0c0f97fa14fc9df05274deeda8f8e17fa68fa9dd 100644 (file)
--- a/drivers/gpio/gpio-grgpio.c
+++ b/drivers/gpio/gpio-grgpio.c
@@ -359,7 +359,7 @@ static int grgpio_probe(struct platform_device *ofdev)
                .dat = regs + GRGPIO_DATA,
                .set = regs + GRGPIO_OUTPUT,
                .dirout = regs + GRGPIO_DIR,
-               .flags = BGPIOF_BIG_ENDIAN_BYTE_ORDER,
+               .flags = GPIO_GENERIC_BIG_ENDIAN_BYTE_ORDER,
        };
 
        gc = &priv->chip.gc;

diff --git a/drivers/gpio/gpio-hisi.c b/drivers/gpio/gpio-hisi.c
index d8c4ab02ceaef7941e97f4788957b1f2c268de98..d26298c8351b711d1922cfcef196a2c6a63b0ef9 100644 (file)
--- a/drivers/gpio/gpio-hisi.c
+++ b/drivers/gpio/gpio-hisi.c
@@ -300,7 +300,8 @@ static int hisi_gpio_probe(struct platform_device *pdev)
                .clr = hisi_gpio->reg_base + HISI_GPIO_SWPORT_DR_CLR_WX,
                .dirout = hisi_gpio->reg_base + HISI_GPIO_SWPORT_DDR_SET_WX,
                .dirin = hisi_gpio->reg_base + HISI_GPIO_SWPORT_DDR_CLR_WX,
-               .flags = BGPIOF_NO_SET_ON_INPUT | BGPIOF_UNREADABLE_REG_DIR,
+               .flags = GPIO_GENERIC_NO_SET_ON_INPUT |
+                        GPIO_GENERIC_UNREADABLE_REG_DIR,
        };
 
        ret = gpio_generic_chip_init(&hisi_gpio->chip, &config);

diff --git a/drivers/gpio/gpio-hlwd.c b/drivers/gpio/gpio-hlwd.c
index a395f87436ac4df386ce2ee345fc0a7cc34c843d..043ce5ef3b07e98532919bc21c15a2fdd002f929 100644 (file)
--- a/drivers/gpio/gpio-hlwd.c
+++ b/drivers/gpio/gpio-hlwd.c
@@ -253,7 +253,7 @@ static int hlwd_gpio_probe(struct platform_device *pdev)
                .dat = hlwd->regs + HW_GPIOB_IN,
                .set = hlwd->regs + HW_GPIOB_OUT,
                .dirout = hlwd->regs + HW_GPIOB_DIR,
-               .flags = BGPIOF_BIG_ENDIAN_BYTE_ORDER,
+               .flags = GPIO_GENERIC_BIG_ENDIAN_BYTE_ORDER,
        };
 
        res = gpio_generic_chip_init(&hlwd->gpioc, &config);

diff --git a/drivers/gpio/gpio-ixp4xx.c b/drivers/gpio/gpio-ixp4xx.c
index 8a3b6b192288c8093abfe6644dbb680e9e25e830..f34d87869c8b046966ad9118c535add379a15416 100644 (file)
--- a/drivers/gpio/gpio-ixp4xx.c
+++ b/drivers/gpio/gpio-ixp4xx.c
@@ -289,7 +289,7 @@ static int ixp4xx_gpio_probe(struct platform_device *pdev)
         * for big endian.
         */
 #if defined(CONFIG_CPU_BIG_ENDIAN)
-       flags = BGPIOF_BIG_ENDIAN_BYTE_ORDER;
+       flags = GPIO_GENERIC_BIG_ENDIAN_BYTE_ORDER;
 #else
        flags = 0;
 #endif

diff --git a/drivers/gpio/gpio-mmio.c b/drivers/gpio/gpio-mmio.c
index a3df14d672a92ac771014315458cb50933b6c539..7d6dd36cf1aeffeab96704821e0b280727346f6f 100644 (file)
--- a/drivers/gpio/gpio-mmio.c
+++ b/drivers/gpio/gpio-mmio.c
@@ -554,7 +554,7 @@ static int bgpio_setup_io(struct gpio_generic_chip *chip,
                chip->reg_set = cfg->set;
                gc->set = bgpio_set_set;
                gc->set_multiple = bgpio_set_multiple_set;
-       } else if (cfg->flags & BGPIOF_NO_OUTPUT) {
+       } else if (cfg->flags & GPIO_GENERIC_NO_OUTPUT) {
                gc->set = bgpio_set_none;
                gc->set_multiple = NULL;
        } else {
@@ -562,8 +562,8 @@ static int bgpio_setup_io(struct gpio_generic_chip *chip,
                gc->set_multiple = bgpio_set_multiple;
        }
 
-       if (!(cfg->flags & BGPIOF_UNREADABLE_REG_SET) &&
-           (cfg->flags & BGPIOF_READ_OUTPUT_REG_SET)) {
+       if (!(cfg->flags & GPIO_GENERIC_UNREADABLE_REG_SET) &&
+           (cfg->flags & GPIO_GENERIC_READ_OUTPUT_REG_SET)) {
                gc->get = bgpio_get_set;
                if (!chip->be_bits)
                        gc->get_multiple = bgpio_get_set_multiple;
@@ -593,19 +593,19 @@ static int bgpio_setup_direction(struct gpio_generic_chip *chip,
        if (cfg->dirout || cfg->dirin) {
                chip->reg_dir_out = cfg->dirout;
                chip->reg_dir_in = cfg->dirin;
-               if (cfg->flags & BGPIOF_NO_SET_ON_INPUT)
+               if (cfg->flags & GPIO_GENERIC_NO_SET_ON_INPUT)
                        gc->direction_output = bgpio_dir_out_dir_first;
                else
                        gc->direction_output = bgpio_dir_out_val_first;
                gc->direction_input = bgpio_dir_in;
                gc->get_direction = bgpio_get_dir;
        } else {
-               if (cfg->flags & BGPIOF_NO_OUTPUT)
+               if (cfg->flags & GPIO_GENERIC_NO_OUTPUT)
                        gc->direction_output = bgpio_dir_out_err;
                else
                        gc->direction_output = bgpio_simple_dir_out;
 
-               if (cfg->flags & BGPIOF_NO_INPUT)
+               if (cfg->flags & GPIO_GENERIC_NO_INPUT)
                        gc->direction_input = bgpio_dir_in_err;
                else
                        gc->direction_input = bgpio_simple_dir_in;
@@ -654,7 +654,7 @@ int gpio_generic_chip_init(struct gpio_generic_chip *chip,
        gc->label = dev_name(dev);
        gc->base = -1;
        gc->request = bgpio_request;
-       chip->be_bits = !!(flags & BGPIOF_BIG_ENDIAN);
+       chip->be_bits = !!(flags & GPIO_GENERIC_BIG_ENDIAN);
 
        ret = gpiochip_get_ngpios(gc, dev);
        if (ret)
@@ -665,7 +665,7 @@ int gpio_generic_chip_init(struct gpio_generic_chip *chip,
                return ret;
 
        ret = bgpio_setup_accessors(dev, chip,
-                                   flags & BGPIOF_BIG_ENDIAN_BYTE_ORDER);
+                                   flags & GPIO_GENERIC_BIG_ENDIAN_BYTE_ORDER);
        if (ret)
                return ret;
 
@@ -673,7 +673,7 @@ int gpio_generic_chip_init(struct gpio_generic_chip *chip,
        if (ret)
                return ret;
 
-       if (flags & BGPIOF_PINCTRL_BACKEND) {
+       if (flags & GPIO_GENERIC_PINCTRL_BACKEND) {
                chip->pinctrl = true;
                /* Currently this callback is only used for pincontrol */
                gc->free = gpiochip_generic_free;
@@ -681,17 +681,17 @@ int gpio_generic_chip_init(struct gpio_generic_chip *chip,
 
        chip->sdata = chip->read_reg(chip->reg_dat);
        if (gc->set == bgpio_set_set &&
-                       !(flags & BGPIOF_UNREADABLE_REG_SET))
+                       !(flags & GPIO_GENERIC_UNREADABLE_REG_SET))
                chip->sdata = chip->read_reg(chip->reg_set);
 
-       if (flags & BGPIOF_UNREADABLE_REG_DIR)
+       if (flags & GPIO_GENERIC_UNREADABLE_REG_DIR)
                chip->dir_unreadable = true;
 
        /*
         * Inspect hardware to find initial direction setting.
         */
        if ((chip->reg_dir_out || chip->reg_dir_in) &&
-           !(flags & BGPIOF_UNREADABLE_REG_DIR)) {
+           !(flags & GPIO_GENERIC_UNREADABLE_REG_DIR)) {
                if (chip->reg_dir_out)
                        chip->sdir = chip->read_reg(chip->reg_dir_out);
                else if (chip->reg_dir_in)
@@ -787,10 +787,10 @@ static int bgpio_pdev_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        if (device_is_big_endian(dev))
-               flags |= BGPIOF_BIG_ENDIAN_BYTE_ORDER;
+               flags |= GPIO_GENERIC_BIG_ENDIAN_BYTE_ORDER;
 
        if (device_property_read_bool(dev, "no-output"))
-               flags |= BGPIOF_NO_OUTPUT;
+               flags |= GPIO_GENERIC_NO_OUTPUT;
 
        config = (struct gpio_generic_chip_config) {
                .dev = dev,

diff --git a/drivers/gpio/gpio-mpc8xxx.c b/drivers/gpio/gpio-mpc8xxx.c
index a2a83afb41bbb92c2a1510f67de086cf3b99ff1c..bfe828734ee1bacc735e494abca9d3011f020ee9 100644 (file)
--- a/drivers/gpio/gpio-mpc8xxx.c
+++ b/drivers/gpio/gpio-mpc8xxx.c
@@ -350,13 +350,13 @@ static int mpc8xxx_probe(struct platform_device *pdev)
                .sz = 4,
                .dat = mpc8xxx_gc->regs + GPIO_DAT,
                .dirout = mpc8xxx_gc->regs + GPIO_DIR,
-               .flags = BGPIOF_BIG_ENDIAN
+               .flags = GPIO_GENERIC_BIG_ENDIAN
        };
 
        if (device_property_read_bool(dev, "little-endian")) {
                dev_dbg(dev, "GPIO registers are LITTLE endian\n");
        } else {
-               config.flags |= BGPIOF_BIG_ENDIAN_BYTE_ORDER;
+               config.flags |= GPIO_GENERIC_BIG_ENDIAN_BYTE_ORDER;
                dev_dbg(dev, "GPIO registers are BIG endian\n");
        }
 

diff --git a/drivers/gpio/gpio-mt7621.c b/drivers/gpio/gpio-mt7621.c
index e7bb9b2cd6cf32baa71b4185ea274075a7bc2d8f..91230be51587908dcfa9b411eabc2fd920056045 100644 (file)
--- a/drivers/gpio/gpio-mt7621.c
+++ b/drivers/gpio/gpio-mt7621.c
@@ -242,7 +242,7 @@ mediatek_gpio_bank_probe(struct device *dev, int bank)
                .set = set,
                .clr = ctrl,
                .dirout = diro,
-               .flags = BGPIOF_NO_SET_ON_INPUT,
+               .flags = GPIO_GENERIC_NO_SET_ON_INPUT,
        };
 
        ret = gpio_generic_chip_init(&rg->chip, &config);

diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c
index 433cbadc3a4cc67ebc89a4702280975fa8d2c9bc..52060b3ec7458a8f8b2915ccd9d64617861b2c2c 100644 (file)
--- a/drivers/gpio/gpio-mxc.c
+++ b/drivers/gpio/gpio-mxc.c
@@ -481,7 +481,7 @@ static int mxc_gpio_probe(struct platform_device *pdev)
        config.dat = port->base + GPIO_PSR;
        config.set = port->base + GPIO_DR;
        config.dirout = port->base + GPIO_GDIR;
-       config.flags = BGPIOF_READ_OUTPUT_REG_SET;
+       config.flags = GPIO_GENERIC_READ_OUTPUT_REG_SET;
 
        err = gpio_generic_chip_init(&port->gen_gc, &config);
        if (err)

diff --git a/drivers/gpio/gpio-rda.c b/drivers/gpio/gpio-rda.c
index fb479d13eb01a49218ad4229e7d4f70f096f5a2e..7bbc6f0ce4c8a78f5ac7258ae412d84930562604 100644 (file)
--- a/drivers/gpio/gpio-rda.c
+++ b/drivers/gpio/gpio-rda.c
@@ -245,7 +245,7 @@ static int rda_gpio_probe(struct platform_device *pdev)
                .clr = rda_gpio->base + RDA_GPIO_CLR,
                .dirout = rda_gpio->base + RDA_GPIO_OEN_SET_OUT,
                .dirin = rda_gpio->base + RDA_GPIO_OEN_SET_IN,
-               .flags = BGPIOF_READ_OUTPUT_REG_SET,
+               .flags = GPIO_GENERIC_READ_OUTPUT_REG_SET,
        };
 
        ret = gpio_generic_chip_init(&rda_gpio->chip, &config);

diff --git a/drivers/gpio/gpio-realtek-otto.c b/drivers/gpio/gpio-realtek-otto.c
index 37b4f73771e651e95b6127befe579ea76e03a102..de527f4fc6c2ad770015685b8b5c822afd5493f0 100644 (file)
--- a/drivers/gpio/gpio-realtek-otto.c
+++ b/drivers/gpio/gpio-realtek-otto.c
@@ -395,7 +395,7 @@ static int realtek_gpio_probe(struct platform_device *pdev)
                ctrl->bank_write = realtek_gpio_bank_write;
                ctrl->line_imr_pos = realtek_gpio_line_imr_pos;
        } else {
-               gen_gc_flags = BGPIOF_BIG_ENDIAN_BYTE_ORDER;
+               gen_gc_flags = GPIO_GENERIC_BIG_ENDIAN_BYTE_ORDER;
                ctrl->bank_read = realtek_gpio_bank_read_swapped;
                ctrl->bank_write = realtek_gpio_bank_write_swapped;
                ctrl->line_imr_pos = realtek_gpio_line_imr_pos_swapped;

diff --git a/drivers/gpio/gpio-sifive.c b/drivers/gpio/gpio-sifive.c
index 2ced87ffd3bbf219c11857391eb4ea808adc0527..94ef2efbd14f572d18b704fb391f4ed0177a4222 100644 (file)
--- a/drivers/gpio/gpio-sifive.c
+++ b/drivers/gpio/gpio-sifive.c
@@ -223,7 +223,7 @@ static int sifive_gpio_probe(struct platform_device *pdev)
                .set = chip->base + SIFIVE_GPIO_OUTPUT_VAL,
                .dirout = chip->base + SIFIVE_GPIO_OUTPUT_EN,
                .dirin = chip->base + SIFIVE_GPIO_INPUT_EN,
-               .flags = BGPIOF_READ_OUTPUT_REG_SET,
+               .flags = GPIO_GENERIC_READ_OUTPUT_REG_SET,
        };
 
        ret = gpio_generic_chip_init(&chip->gen_gc, &config);

diff --git a/drivers/gpio/gpio-spacemit-k1.c b/drivers/gpio/gpio-spacemit-k1.c
index a0af23f732819be9329af1cb62887dc6eb100ac9..eb66a15c002fc30592179a387e1bc77bd7c4a920 100644 (file)
--- a/drivers/gpio/gpio-spacemit-k1.c
+++ b/drivers/gpio/gpio-spacemit-k1.c
@@ -197,7 +197,8 @@ static int spacemit_gpio_add_bank(struct spacemit_gpio *sg,
                .clr = clr,
                .dirout = dirout,
                .dirin = dirin,
-               .flags = BGPIOF_UNREADABLE_REG_SET | BGPIOF_UNREADABLE_REG_DIR,
+               .flags = GPIO_GENERIC_UNREADABLE_REG_SET |
+                        GPIO_GENERIC_UNREADABLE_REG_DIR,
        };
 
        /* This registers 32 GPIO lines per bank */

diff --git a/drivers/gpio/gpio-vf610.c b/drivers/gpio/gpio-vf610.c
index f3590db72b141223e0a957825e94222056aa77bb..aa8586d8a787f0bc50f23d8b54afee6982a418f5 100644 (file)
--- a/drivers/gpio/gpio-vf610.c
+++ b/drivers/gpio/gpio-vf610.c
@@ -296,14 +296,14 @@ static int vf610_gpio_probe(struct platform_device *pdev)
        }
 
        gc = &port->chip.gc;
-       flags = BGPIOF_PINCTRL_BACKEND;
+       flags = GPIO_GENERIC_PINCTRL_BACKEND;
        /*
         * We only read the output register for current value on output
         * lines if the direction register is available so we can switch
         * direction.
         */
        if (port->sdata->have_paddr)
-               flags |= BGPIOF_READ_OUTPUT_REG_SET;
+               flags |= GPIO_GENERIC_READ_OUTPUT_REG_SET;
 
        config = (struct gpio_generic_chip_config) {
                .dev = dev,

diff --git a/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c b/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c
index c2ca71ebb9736d1b3043fa6626767811a67e61f2..10765f19b48b6135d2f5e958d16dd4bddd0ef998 100644 (file)
--- a/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c
+++ b/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c
@@ -1842,7 +1842,7 @@ static int npcm7xx_gpio_of(struct npcm7xx_pinctrl *pctrl)
                        .dat = pctrl->gpio_bank[id].base + NPCM7XX_GP_N_DIN,
                        .set = pctrl->gpio_bank[id].base + NPCM7XX_GP_N_DOUT,
                        .dirin = pctrl->gpio_bank[id].base + NPCM7XX_GP_N_IEM,
-                       .flags = BGPIOF_READ_OUTPUT_REG_SET,
+                       .flags = GPIO_GENERIC_READ_OUTPUT_REG_SET,
                };
 
                ret = gpio_generic_chip_init(&pctrl->gpio_bank[id].chip, &config);

diff --git a/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c b/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c
index 0f155a685bbae774129aa55b83865e546314e81c..1005b464a46964cdc66f6c0e2288df71706ae914 100644 (file)
--- a/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c
+++ b/drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c
@@ -2335,7 +2335,7 @@ static int npcm8xx_gpio_fw(struct npcm8xx_pinctrl *pctrl)
                        .dat = pctrl->gpio_bank[id].base + NPCM8XX_GP_N_DIN,
                        .set = pctrl->gpio_bank[id].base + NPCM8XX_GP_N_DOUT,
                        .dirin = pctrl->gpio_bank[id].base + NPCM8XX_GP_N_IEM,
-                       .flags = BGPIOF_READ_OUTPUT_REG_SET,
+                       .flags = GPIO_GENERIC_READ_OUTPUT_REG_SET,
                };
 
                ret = gpio_generic_chip_init(&pctrl->gpio_bank[id].chip, &config);

diff --git a/drivers/pinctrl/nuvoton/pinctrl-wpcm450.c b/drivers/pinctrl/nuvoton/pinctrl-wpcm450.c
index 4dd8a3daa83e44b0e2780fedb03ab11fa46a4b7d..c575949e42e67b1bf08067b5ec75d54de6bd26cc 100644 (file)
--- a/drivers/pinctrl/nuvoton/pinctrl-wpcm450.c
+++ b/drivers/pinctrl/nuvoton/pinctrl-wpcm450.c
@@ -1061,7 +1061,7 @@ static int wpcm450_gpio_register(struct platform_device *pdev,
                        set = pctrl->gpio_base + bank->dataout;
                        dirout = pctrl->gpio_base + bank->cfg0;
                } else {
-                       flags = BGPIOF_NO_OUTPUT;
+                       flags = GPIO_GENERIC_NO_OUTPUT;
                }
 
                config = (typeof(config)){

diff --git a/drivers/pinctrl/stm32/pinctrl-stm32-hdp.c b/drivers/pinctrl/stm32/pinctrl-stm32-hdp.c
index dea49b9aabf2aebbaaa3cb33c8add9926972ed9f..971959a75b0c29accf05720c18d1498a5a52e428 100644 (file)
--- a/drivers/pinctrl/stm32/pinctrl-stm32-hdp.c
+++ b/drivers/pinctrl/stm32/pinctrl-stm32-hdp.c
@@ -648,7 +648,7 @@ static int stm32_hdp_probe(struct platform_device *pdev)
                .dat = hdp->base + HDP_GPOVAL,
                .set = hdp->base + HDP_GPOSET,
                .clr = hdp->base + HDP_GPOCLR,
-               .flags = BGPIOF_NO_INPUT,
+               .flags = GPIO_GENERIC_NO_INPUT,
        };
 
        err = gpio_generic_chip_init(&hdp->gpio_chip, &config);

diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h
index 9b14fd20f13eee7d465e065e7ded2c92e2bbc78e..e62622e42cad378f6c0bee12fb9a0b29eff1f471 100644 (file)
--- a/include/linux/gpio/driver.h
+++ b/include/linux/gpio/driver.h
@@ -684,15 +684,15 @@ int gpiochip_populate_parent_fwspec_fourcell(struct gpio_chip *gc,
 
 #endif /* CONFIG_IRQ_DOMAIN_HIERARCHY */
 
-#define BGPIOF_BIG_ENDIAN              BIT(0)
-#define BGPIOF_UNREADABLE_REG_SET      BIT(1) /* reg_set is unreadable */
-#define BGPIOF_UNREADABLE_REG_DIR      BIT(2) /* reg_dir is unreadable */
-#define BGPIOF_BIG_ENDIAN_BYTE_ORDER   BIT(3)
-#define BGPIOF_READ_OUTPUT_REG_SET     BIT(4) /* reg_set stores output value */
-#define BGPIOF_NO_OUTPUT               BIT(5) /* only input */
-#define BGPIOF_NO_SET_ON_INPUT         BIT(6)
-#define BGPIOF_PINCTRL_BACKEND         BIT(7) /* Call pinctrl direction setters */
-#define BGPIOF_NO_INPUT                        BIT(8) /* only output */
+#define GPIO_GENERIC_BIG_ENDIAN                        BIT(0)
+#define GPIO_GENERIC_UNREADABLE_REG_SET                BIT(1) /* reg_set is unreadable */
+#define GPIO_GENERIC_UNREADABLE_REG_DIR                BIT(2) /* reg_dir is unreadable */
+#define GPIO_GENERIC_BIG_ENDIAN_BYTE_ORDER     BIT(3)
+#define GPIO_GENERIC_READ_OUTPUT_REG_SET       BIT(4) /* reg_set stores output value */
+#define GPIO_GENERIC_NO_OUTPUT                 BIT(5) /* only input */
+#define GPIO_GENERIC_NO_SET_ON_INPUT           BIT(6)
+#define GPIO_GENERIC_PINCTRL_BACKEND           BIT(7) /* Call pinctrl direction setters */
+#define GPIO_GENERIC_NO_INPUT                  BIT(8) /* only output */
 
 #ifdef CONFIG_GPIOLIB_IRQCHIP
 int gpiochip_irqchip_add_domain(struct gpio_chip *gc,