On Tue, Aug 09, 2022 at 05:04:40PM +0200, Henning Schild wrote: > So that drivers building on top can find those pins with GPIO_LOOKUP > helpers. > > Signed-off-by: Henning Schild <henning.schild@xxxxxxxxxxx> Acked-by: Simon Guinot <simon.guinot@xxxxxxxxxxxx> > --- > drivers/gpio/gpio-f7188x.c | 138 ++++++++++++++++++------------------- > 1 file changed, 69 insertions(+), 69 deletions(-) > > diff --git a/drivers/gpio/gpio-f7188x.c b/drivers/gpio/gpio-f7188x.c > index 4d8f38bc3b45..9c91832b8c71 100644 > --- a/drivers/gpio/gpio-f7188x.c > +++ b/drivers/gpio/gpio-f7188x.c > @@ -150,10 +150,10 @@ static void f7188x_gpio_set(struct gpio_chip *chip, unsigned offset, int value); > static int f7188x_gpio_set_config(struct gpio_chip *chip, unsigned offset, > unsigned long config); > > -#define F7188X_GPIO_BANK(_base, _ngpio, _regbase) \ > +#define F7188X_GPIO_BANK(_base, _ngpio, _regbase, _label) \ > { \ > .chip = { \ > - .label = DRVNAME, \ > + .label = _label, \ > .owner = THIS_MODULE, \ > .get_direction = f7188x_gpio_get_direction, \ > .direction_input = f7188x_gpio_direction_in, \ > @@ -178,98 +178,98 @@ static int f7188x_gpio_set_config(struct gpio_chip *chip, unsigned offset, > #define gpio_single_data(device) ((device) != SIO_LD_GPIO_FINTEK) > > static struct f7188x_gpio_bank f71869_gpio_bank[] = { > - F7188X_GPIO_BANK(0, 6, 0xF0), > - F7188X_GPIO_BANK(10, 8, 0xE0), > - F7188X_GPIO_BANK(20, 8, 0xD0), > - F7188X_GPIO_BANK(30, 8, 0xC0), > - F7188X_GPIO_BANK(40, 8, 0xB0), > - F7188X_GPIO_BANK(50, 5, 0xA0), > - F7188X_GPIO_BANK(60, 6, 0x90), > + F7188X_GPIO_BANK(0, 6, 0xF0, DRVNAME "-0"), > + F7188X_GPIO_BANK(10, 8, 0xE0, DRVNAME "-1"), > + F7188X_GPIO_BANK(20, 8, 0xD0, DRVNAME "-2"), > + F7188X_GPIO_BANK(30, 8, 0xC0, DRVNAME "-3"), > + F7188X_GPIO_BANK(40, 8, 0xB0, DRVNAME "-4"), > + F7188X_GPIO_BANK(50, 5, 0xA0, DRVNAME "-5"), > + F7188X_GPIO_BANK(60, 6, 0x90, DRVNAME "-6"), > }; > > static struct f7188x_gpio_bank f71869a_gpio_bank[] = { > - F7188X_GPIO_BANK(0, 6, 0xF0), > - F7188X_GPIO_BANK(10, 8, 0xE0), > - F7188X_GPIO_BANK(20, 8, 0xD0), > - F7188X_GPIO_BANK(30, 8, 0xC0), > - F7188X_GPIO_BANK(40, 8, 0xB0), > - F7188X_GPIO_BANK(50, 5, 0xA0), > - F7188X_GPIO_BANK(60, 8, 0x90), > - F7188X_GPIO_BANK(70, 8, 0x80), > + F7188X_GPIO_BANK(0, 6, 0xF0, DRVNAME "-0"), > + F7188X_GPIO_BANK(10, 8, 0xE0, DRVNAME "-1"), > + F7188X_GPIO_BANK(20, 8, 0xD0, DRVNAME "-2"), > + F7188X_GPIO_BANK(30, 8, 0xC0, DRVNAME "-3"), > + F7188X_GPIO_BANK(40, 8, 0xB0, DRVNAME "-4"), > + F7188X_GPIO_BANK(50, 5, 0xA0, DRVNAME "-5"), > + F7188X_GPIO_BANK(60, 8, 0x90, DRVNAME "-6"), > + F7188X_GPIO_BANK(70, 8, 0x80, DRVNAME "-7"), > }; > > static struct f7188x_gpio_bank f71882_gpio_bank[] = { > - F7188X_GPIO_BANK(0, 8, 0xF0), > - F7188X_GPIO_BANK(10, 8, 0xE0), > - F7188X_GPIO_BANK(20, 8, 0xD0), > - F7188X_GPIO_BANK(30, 4, 0xC0), > - F7188X_GPIO_BANK(40, 4, 0xB0), > + F7188X_GPIO_BANK(0, 8, 0xF0, DRVNAME "-0"), > + F7188X_GPIO_BANK(10, 8, 0xE0, DRVNAME "-1"), > + F7188X_GPIO_BANK(20, 8, 0xD0, DRVNAME "-2"), > + F7188X_GPIO_BANK(30, 4, 0xC0, DRVNAME "-3"), > + F7188X_GPIO_BANK(40, 4, 0xB0, DRVNAME "-4"), > }; > > static struct f7188x_gpio_bank f71889a_gpio_bank[] = { > - F7188X_GPIO_BANK(0, 7, 0xF0), > - F7188X_GPIO_BANK(10, 7, 0xE0), > - F7188X_GPIO_BANK(20, 8, 0xD0), > - F7188X_GPIO_BANK(30, 8, 0xC0), > - F7188X_GPIO_BANK(40, 8, 0xB0), > - F7188X_GPIO_BANK(50, 5, 0xA0), > - F7188X_GPIO_BANK(60, 8, 0x90), > - F7188X_GPIO_BANK(70, 8, 0x80), > + F7188X_GPIO_BANK(0, 7, 0xF0, DRVNAME "-0"), > + F7188X_GPIO_BANK(10, 7, 0xE0, DRVNAME "-1"), > + F7188X_GPIO_BANK(20, 8, 0xD0, DRVNAME "-2"), > + F7188X_GPIO_BANK(30, 8, 0xC0, DRVNAME "-3"), > + F7188X_GPIO_BANK(40, 8, 0xB0, DRVNAME "-4"), > + F7188X_GPIO_BANK(50, 5, 0xA0, DRVNAME "-5"), > + F7188X_GPIO_BANK(60, 8, 0x90, DRVNAME "-6"), > + F7188X_GPIO_BANK(70, 8, 0x80, DRVNAME "-7"), > }; > > static struct f7188x_gpio_bank f71889_gpio_bank[] = { > - F7188X_GPIO_BANK(0, 7, 0xF0), > - F7188X_GPIO_BANK(10, 7, 0xE0), > - F7188X_GPIO_BANK(20, 8, 0xD0), > - F7188X_GPIO_BANK(30, 8, 0xC0), > - F7188X_GPIO_BANK(40, 8, 0xB0), > - F7188X_GPIO_BANK(50, 5, 0xA0), > - F7188X_GPIO_BANK(60, 8, 0x90), > - F7188X_GPIO_BANK(70, 8, 0x80), > + F7188X_GPIO_BANK(0, 7, 0xF0, DRVNAME "-0"), > + F7188X_GPIO_BANK(10, 7, 0xE0, DRVNAME "-1"), > + F7188X_GPIO_BANK(20, 8, 0xD0, DRVNAME "-2"), > + F7188X_GPIO_BANK(30, 8, 0xC0, DRVNAME "-3"), > + F7188X_GPIO_BANK(40, 8, 0xB0, DRVNAME "-4"), > + F7188X_GPIO_BANK(50, 5, 0xA0, DRVNAME "-5"), > + F7188X_GPIO_BANK(60, 8, 0x90, DRVNAME "-6"), > + F7188X_GPIO_BANK(70, 8, 0x80, DRVNAME "-7"), > }; > > static struct f7188x_gpio_bank f81866_gpio_bank[] = { > - F7188X_GPIO_BANK(0, 8, 0xF0), > - F7188X_GPIO_BANK(10, 8, 0xE0), > - F7188X_GPIO_BANK(20, 8, 0xD0), > - F7188X_GPIO_BANK(30, 8, 0xC0), > - F7188X_GPIO_BANK(40, 8, 0xB0), > - F7188X_GPIO_BANK(50, 8, 0xA0), > - F7188X_GPIO_BANK(60, 8, 0x90), > - F7188X_GPIO_BANK(70, 8, 0x80), > - F7188X_GPIO_BANK(80, 8, 0x88), > + F7188X_GPIO_BANK(0, 8, 0xF0, DRVNAME "-0"), > + F7188X_GPIO_BANK(10, 8, 0xE0, DRVNAME "-1"), > + F7188X_GPIO_BANK(20, 8, 0xD0, DRVNAME "-2"), > + F7188X_GPIO_BANK(30, 8, 0xC0, DRVNAME "-3"), > + F7188X_GPIO_BANK(40, 8, 0xB0, DRVNAME "-4"), > + F7188X_GPIO_BANK(50, 8, 0xA0, DRVNAME "-5"), > + F7188X_GPIO_BANK(60, 8, 0x90, DRVNAME "-6"), > + F7188X_GPIO_BANK(70, 8, 0x80, DRVNAME "-7"), > + F7188X_GPIO_BANK(80, 8, 0x88, DRVNAME "-8"), > }; > > > static struct f7188x_gpio_bank f81804_gpio_bank[] = { > - F7188X_GPIO_BANK(0, 8, 0xF0), > - F7188X_GPIO_BANK(10, 8, 0xE0), > - F7188X_GPIO_BANK(20, 8, 0xD0), > - F7188X_GPIO_BANK(50, 8, 0xA0), > - F7188X_GPIO_BANK(60, 8, 0x90), > - F7188X_GPIO_BANK(70, 8, 0x80), > - F7188X_GPIO_BANK(90, 8, 0x98), > + F7188X_GPIO_BANK(0, 8, 0xF0, DRVNAME "-0"), > + F7188X_GPIO_BANK(10, 8, 0xE0, DRVNAME "-1"), > + F7188X_GPIO_BANK(20, 8, 0xD0, DRVNAME "-2"), > + F7188X_GPIO_BANK(50, 8, 0xA0, DRVNAME "-3"), > + F7188X_GPIO_BANK(60, 8, 0x90, DRVNAME "-4"), > + F7188X_GPIO_BANK(70, 8, 0x80, DRVNAME "-5"), > + F7188X_GPIO_BANK(90, 8, 0x98, DRVNAME "-6"), > }; > > static struct f7188x_gpio_bank f81865_gpio_bank[] = { > - F7188X_GPIO_BANK(0, 8, 0xF0), > - F7188X_GPIO_BANK(10, 8, 0xE0), > - F7188X_GPIO_BANK(20, 8, 0xD0), > - F7188X_GPIO_BANK(30, 8, 0xC0), > - F7188X_GPIO_BANK(40, 8, 0xB0), > - F7188X_GPIO_BANK(50, 8, 0xA0), > - F7188X_GPIO_BANK(60, 5, 0x90), > + F7188X_GPIO_BANK(0, 8, 0xF0, DRVNAME "-0"), > + F7188X_GPIO_BANK(10, 8, 0xE0, DRVNAME "-1"), > + F7188X_GPIO_BANK(20, 8, 0xD0, DRVNAME "-2"), > + F7188X_GPIO_BANK(30, 8, 0xC0, DRVNAME "-3"), > + F7188X_GPIO_BANK(40, 8, 0xB0, DRVNAME "-4"), > + F7188X_GPIO_BANK(50, 8, 0xA0, DRVNAME "-5"), > + F7188X_GPIO_BANK(60, 5, 0x90, DRVNAME "-6"), > }; > > static struct f7188x_gpio_bank nct6116d_gpio_bank[] = { > - F7188X_GPIO_BANK(0, 8, 0xE0), > - F7188X_GPIO_BANK(10, 8, 0xE4), > - F7188X_GPIO_BANK(20, 8, 0xE8), > - F7188X_GPIO_BANK(30, 8, 0xEC), > - F7188X_GPIO_BANK(40, 8, 0xF0), > - F7188X_GPIO_BANK(50, 8, 0xF4), > - F7188X_GPIO_BANK(60, 8, 0xF8), > - F7188X_GPIO_BANK(70, 1, 0xFC), > + F7188X_GPIO_BANK(0, 8, 0xE0, DRVNAME "-0"), > + F7188X_GPIO_BANK(10, 8, 0xE4, DRVNAME "-1"), > + F7188X_GPIO_BANK(20, 8, 0xE8, DRVNAME "-2"), > + F7188X_GPIO_BANK(30, 8, 0xEC, DRVNAME "-3"), > + F7188X_GPIO_BANK(40, 8, 0xF0, DRVNAME "-4"), > + F7188X_GPIO_BANK(50, 8, 0xF4, DRVNAME "-5"), > + F7188X_GPIO_BANK(60, 8, 0xF8, DRVNAME "-6"), > + F7188X_GPIO_BANK(70, 1, 0xFC, DRVNAME "-7"), > }; > > static int f7188x_gpio_get_direction(struct gpio_chip *chip, unsigned offset) > -- > 2.35.1
Attachment:
signature.asc
Description: PGP signature