From: Mieczyslaw Nalewaj Date: Fri, 15 Mar 2024 08:08:09 +0000 (+0100) Subject: ramips: adjusted pinctrl-aw9523 for kernel 6.6 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=359a9295f2e3385afa867a6c350252d46dd39f6c;p=openwrt%2Fstaging%2Fnbd.git ramips: adjusted pinctrl-aw9523 for kernel 6.6 Compatiblity with kernel 6.6 for Awinic AW9523B i2c pin controller driver. It follows the kernel patch: i2c: Drop legacy callback .probe_new() (https://github.com/torvalds/linux/commit/5eb1e6e459cfa025f79c43014f66ff62a55542f1) and kernel patch: gpiolib: Get rid of not used of_node member (https://github.com/torvalds/linux/commit/70d0fc4288dabd65025fde7774b4f9262afa9034) Signed-off-by: Mieczyslaw Nalewaj --- diff --git a/target/linux/ramips/files/drivers/pinctrl/pinctrl-aw9523.c b/target/linux/ramips/files/drivers/pinctrl/pinctrl-aw9523.c index 65babf9946..a429bb82a3 100644 --- a/target/linux/ramips/files/drivers/pinctrl/pinctrl-aw9523.c +++ b/target/linux/ramips/files/drivers/pinctrl/pinctrl-aw9523.c @@ -810,7 +810,11 @@ static int aw9523_init_gpiochip(struct aw9523 *awi, unsigned int npins) gpiochip->set_multiple = aw9523_gpio_set_multiple; gpiochip->set_config = gpiochip_generic_config; gpiochip->parent = dev; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 6, 0) + gpiochip->fwnode = dev->fwnode; +#else gpiochip->of_node = dev->of_node; +#endif gpiochip->owner = THIS_MODULE; gpiochip->can_sleep = true; @@ -984,8 +988,12 @@ static int aw9523_hw_init(struct aw9523 *awi) return regmap_reinit_cache(awi->regmap, &aw9523_regmap); } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 6, 0) +static int aw9523_probe(struct i2c_client *client) +#else static int aw9523_probe(struct i2c_client *client, const struct i2c_device_id *id) +#endif { struct device *dev = &client->dev; struct pinctrl_desc *pdesc;