Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 634e40b0 authored by Jerome Brunet's avatar Jerome Brunet Committed by Linus Walleij
Browse files

pinctrl: meson: remove offset from pinctrl 



Offset on meson pinctrl and gpios is something that was carried from the
vendor driver, where there is a weird link between the 2
controllers. Since these 2 controllers are independent, this offset adds
an unnecessary complexity.

This patch remove this manually set offset and rely on pinctrl to figure
out the gpio base offset

Tested-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 505485a8

drivers/pinctrl/meson/pinctrl-meson-gxbb.c

+425 −429

File changed.

Preview size limit exceeded, changes collapsed.

drivers/pinctrl/meson/pinctrl-meson-gxl.c

+402 −412

File changed.

Preview size limit exceeded, changes collapsed.

drivers/pinctrl/meson/pinctrl-meson.c

+3 −15
Original line number Diff line number Diff line
@@ -410,18 +410,6 @@ static const struct pinconf_ops meson_pinconf_ops = { 
	.is_generic		= true,

};



static int meson_gpio_request(struct gpio_chip *chip, unsigned gpio)

{

	return pinctrl_request_gpio(chip->base + gpio);

}



static void meson_gpio_free(struct gpio_chip *chip, unsigned gpio)

{

	struct meson_pinctrl *pc = gpiochip_get_data(chip);



	pinctrl_free_gpio(pc->data->pin_base + gpio);

}



static int meson_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)

{

	struct meson_pinctrl *pc = gpiochip_get_data(chip);
@@ -539,13 +527,13 @@ static int meson_gpiolib_register(struct meson_pinctrl *pc) 


	pc->chip.label = pc->data->name;

	pc->chip.parent = pc->dev;

	pc->chip.request = meson_gpio_request;

	pc->chip.free = meson_gpio_free;

	pc->chip.request = gpiochip_generic_request;

	pc->chip.free = gpiochip_generic_free;

	pc->chip.direction_input = meson_gpio_direction_input;

	pc->chip.direction_output = meson_gpio_direction_output;

	pc->chip.get = meson_gpio_get;

	pc->chip.set = meson_gpio_set;

	pc->chip.base = pc->data->pin_base;

	pc->chip.base = -1;

	pc->chip.ngpio = pc->data->num_pins;

	pc->chip.can_sleep = false;

	pc->chip.of_node = pc->of_node;

drivers/pinctrl/meson/pinctrl-meson.h

+3 −5
Original line number Diff line number Diff line
@@ -124,8 +124,6 @@ struct meson_pinctrl { 
	struct device_node *of_node;

};



#define PIN(x, b)	(b + x)



#define GROUP(grp, r, b)						\

	{								\

		.name = #grp,						\
@@ -135,10 +133,10 @@ struct meson_pinctrl { 
		.bit = b,						\

	 }



#define GPIO_GROUP(gpio, b)						\

#define GPIO_GROUP(gpio)						\

	{								\

		.name = #gpio,						\

		.pins = (const unsigned int[]){ PIN(gpio, b) },		\

		.pins = (const unsigned int[]){ gpio },			\

		.num_pins = 1,						\

		.is_gpio = true,					\

	 }
@@ -166,7 +164,7 @@ struct meson_pinctrl { 
		},							\

	 }



#define MESON_PIN(x, b) PINCTRL_PIN(PIN(x, b), #x)

#define MESON_PIN(x) PINCTRL_PIN(x, #x)



extern struct meson_pinctrl_data meson8_cbus_pinctrl_data;

extern struct meson_pinctrl_data meson8_aobus_pinctrl_data;

drivers/pinctrl/meson/pinctrl-meson8.c

+476 −488

File changed.

Preview size limit exceeded, changes collapsed.